[CODE]: 列表添加条件

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/AppletsController.java

@@ -8,7 +8,6 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,10 +17,10 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 仓库详情主表Controller
+ *  仓储小程序Controller
  *
  * @author ruoyi
- * @date 2020-12-11
+ * @date 2021-03-23
  */
 @RestController
 @RequestMapping("/warehouseBusiness/applets")
@@ -42,10 +41,10 @@ public class AppletsController extends BaseController {
      *  入库数量
      */
     @GetMapping("/inStockList")
-    public TableDataInfo inList(TWarehouseBills tWarehouseBills) {
+    public TableDataInfo inList(@RequestBody TWarehousebillsitems tWarehousebillsitems) {
         startPage();
-        tWarehouseBills.setfBilltype("SJRK");
-        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessInStockList(tWarehouseBills);
+        tWarehousebillsitems.setfBilltype("SJRK");
+        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessInStockList(tWarehousebillsitems);
         return getDataTable(list);
     }
 
@@ -53,15 +52,15 @@ public class AppletsController extends BaseController {
      *  出库数量
      */
     @GetMapping("/outStockList")
-    public TableDataInfo outList(TWarehouseBills tWarehouseBills) {
+    public TableDataInfo outList(@RequestBody TWarehousebillsitems tWarehousebillsitems) {
         startPage();
-        tWarehouseBills.setfBilltype("SJCK");
-        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessInStockList(tWarehouseBills);
+        tWarehousebillsitems.setfBilltype("SJCK");
+        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessInStockList(tWarehousebillsitems);
         return getDataTable(list);
     }
 
     /**
-     *   待入出库
+     *   待入出库 提交
      */
     @PostMapping(value = "/ischargeCargo")
     @RepeatSubmit

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehousebillsitems.java

@@ -294,6 +294,25 @@ public class TWarehousebillsitems extends BaseEntity {
     @Excel(name = "仓库/库区/库位")
     private String fOrgwarehouseInformation;
 
+    private String timeStartBsdate;
+    private String timeEndBsdate;
+
+    public String getTimeStartBsdate() {
+        return timeStartBsdate;
+    }
+
+    public void setTimeStartBsdate(String timeStartBsdate) {
+        this.timeStartBsdate = timeStartBsdate;
+    }
+
+    public String getTimeEndBsdate() {
+        return timeEndBsdate;
+    }
+
+    public void setTimeEndBsdate(String timeEndBsdate) {
+        this.timeEndBsdate = timeEndBsdate;
+    }
+
     public void setfId(Long fId) {
         this.fId = fId;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsitemsMapper.java

@@ -112,7 +112,7 @@ public interface TWarehousebillsitemsMapper extends BaseMapper<TWarehousebillsit
      */
     int monthOutStock(@Param("timeInterval") List<String> timeInterval);
 
-    public List<Map<String, Object>> selectWarehouseBusinesInList(TWarehouseBills tWarehousebills);
-    public List<Map<String, Object>> selectWarehouseBusinesOutList(TWarehouseBills tWarehousebills);
+    public List<Map<String, Object>> selectWarehouseBusinesInList(TWarehousebillsitems billsItem);
+    public List<Map<String, Object>> selectWarehouseBusinesOutList(TWarehousebillsitems billsItem);
 
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -193,7 +193,7 @@ public interface ITWarehouseBillsService {
 
     List<Map<String, Object>> selectWareHouseNumber();
 
-    public List<Map<String, Object>> selectWarehouseBusinessInStockList(TWarehouseBills tWarehousebills);
+    public List<Map<String, Object>> selectWarehouseBusinessInStockList(TWarehousebillsitems tWarehousebillsitems);
 
     AjaxResult waitWarehousingItems(TWarehousebillsitems tWarehousebillsitems);
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -855,11 +855,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     }
 
     @Override
-    public List<Map<String, Object>> selectWarehouseBusinessInStockList(TWarehouseBills tWarehousebills) {
-        if(tWarehousebills.getfBilltype().equals("SJRK")){
-            return tWarehousebillsitemsMapper.selectWarehouseBusinesInList(tWarehousebills);
+    public List<Map<String, Object>> selectWarehouseBusinessInStockList(TWarehousebillsitems tWarehousebillsitems) {
+        if(tWarehousebillsitems.getfBilltype().equals("SJRK")){
+            return tWarehousebillsitemsMapper.selectWarehouseBusinesInList(tWarehousebillsitems);
         }else {
-            return tWarehousebillsitemsMapper.selectWarehouseBusinesOutList(tWarehousebills);
+            return tWarehousebillsitemsMapper.selectWarehouseBusinesOutList(tWarehousebillsitems);
         }
     }
 

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsitemsMapper.xml

@@ -497,6 +497,10 @@
         WHERE
             items.f_billtype = 'SJRK'
           AND items.f_billstatus IN ( 20, 30 )
+          <if test="timeStartBsdate != null">items.f_bsdate &gt;= #{timeStartBsdate},</if>
+          <if test="timeEndBsdate != null">items.f_bsdate &lt;= #{timeEndBsdate},</if>
+          <if test="fBillstatus != null">items.f_billstatus = #{fBillstatus},</if>
+          <if test="fMblno != null">items.f_mblno = #{fMblno},</if>
     </select>
     <select id="selectWarehouseBusinesOutList" resultType="java.util.Map">
         SELECT
@@ -529,6 +533,10 @@
         WHERE
             items.f_billtype = 'SJCK'
           AND items.f_billstatus IN ( 20, 30 )
+        <if test="timeStartBsdate != null">items.f_bsdate &gt;= #{timeStartBsdate},</if>
+        <if test="timeEndBsdate != null">items.f_bsdate &lt;= #{timeEndBsdate},</if>
+        <if test="fBillstatus != null">items.f_billstatus = #{fBillstatus},</if>
+        <if test="fMblno != null">items.f_mblno = #{fMblno},</if>
     </select>