修改入库列表页查询条件方法

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

@@ -7,7 +7,6 @@ import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
@@ -38,6 +37,7 @@ public class TWarehouseGoodsTransferController extends BaseController {
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:list')")
     @GetMapping("/list")
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
+        System.out.println(tWarehouseBills.toString());
         startPage();
         tWarehouseBills.setfBilltype("HQZY");
         List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessList(tWarehouseBills);
@@ -86,13 +86,8 @@ public class TWarehouseGoodsTransferController extends BaseController {
                           @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
                           @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
                           @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
-        System.out.println("主表：" + tWarehouseBills);
-        System.out.println("附件：" + tWhgenleg);
-        System.out.println("付款：" + tWarehousebillsfeesCr);
-        System.out.println("收款：" + tWarehousebillsfeesDr);
-        System.out.println("明细：" + tWarehousebillsitems);
         String billsType = "HQZY";
-        if (StringUtils.isEmpty(tWarehouseBills)) {
+        /*if (StringUtils.isEmpty(tWarehouseBills)) {
             return AjaxResult.error("提交失败：请检查主表数据");
         }
         if (tWarehousebillsitems.equals("[]")) {
@@ -106,7 +101,7 @@ public class TWarehouseGoodsTransferController extends BaseController {
         }
         if (tWarehousebillsfeesCr.equals("[]")) {
             return AjaxResult.error("提交失败：请检查付款明细数据");
-        }
+        }*/
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(tWarehouseBills, tWarehousebillsfeesCr,

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

@@ -7,7 +7,6 @@ import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
@@ -38,6 +37,7 @@ public class TWarehouseInStockController extends BaseController {
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:inStock:list')")
     @GetMapping("/list")
     public TableDataInfo list(TWarehouseBills tWarehouseBills) {
+        System.out.println(tWarehouseBills.toString());
         startPage();
         tWarehouseBills.setfBilltype("SJRK");
         List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessList(tWarehouseBills);
@@ -92,7 +92,7 @@ public class TWarehouseInStockController extends BaseController {
         System.out.println("收款：" + tWarehousebillsfeesDr);
         System.out.println("明细：" + tWarehousebillsitems);
         String billsType = "SJRK";
-        if (StringUtils.isEmpty(tWarehouseBills)) {
+        /*if (StringUtils.isEmpty(tWarehouseBills)) {
             return AjaxResult.error("提交失败：请检查主表数据");
         }
         if (tWarehousebillsitems.equals("[]")) {
@@ -106,7 +106,7 @@ public class TWarehouseInStockController extends BaseController {
         }
         if (tWarehousebillsfeesCr.equals("[]")) {
             return AjaxResult.error("提交失败：请检查付款明细数据");
-        }
+        }*/
         /*if (StringUtils.isEmpty(tWarehousebillsitems)) {
             return AjaxResult.error("提交失败：请检货物明细数据");
         }

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

@@ -7,7 +7,6 @@ import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
@@ -89,7 +88,7 @@ public class TWarehouseOutStockController extends BaseController {
                           @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
                           @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
         String billsType = "SJCK";
-        if (StringUtils.isEmpty(tWarehouseBills)) {
+        /*if (StringUtils.isEmpty(tWarehouseBills)) {
             return AjaxResult.error("提交失败：请检查主表数据");
         }
         if (tWarehousebillsitems.equals("[]")) {
@@ -103,7 +102,7 @@ public class TWarehouseOutStockController extends BaseController {
         }
         if (tWarehousebillsfeesCr.equals("[]")) {
             return AjaxResult.error("提交失败：请检查付款明细数据");
-        }
+        }*/
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(tWarehouseBills, tWarehousebillsfeesCr,

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

@@ -7,7 +7,6 @@ import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
@@ -92,7 +91,7 @@ public class TWarehouseTransferController extends BaseController {
         System.out.println("收款：" + tWarehousebillsfeesDr);
         System.out.println("明细：" + tWarehousebillsitems);
         String billsType = "CKDB";
-        if (StringUtils.isEmpty(tWarehouseBills)) {
+        /*if (StringUtils.isEmpty(tWarehouseBills)) {
             return AjaxResult.error("提交失败：请检查主表数据");
         }
         if (tWarehousebillsitems.equals("[]")) {
@@ -106,7 +105,7 @@ public class TWarehouseTransferController extends BaseController {
         }
         if (tWarehousebillsfeesCr.equals("[]")) {
             return AjaxResult.error("提交失败：请检查付款明细数据");
-        }
+        }*/
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(tWarehouseBills, tWarehousebillsfeesCr,

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/domain/TWhgenleg.java

@@ -187,6 +187,9 @@ public class TWhgenleg extends BaseEntity {
     @Excel(name = "原始入库日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fOriginalbilldate;
 
+    /**
+     * 查询时间区间
+     */
     private List<String> orgStorageDate;
     public void setorgStorageDate(List<String> orgStorageDate) {
         this.orgStorageDate = orgStorageDate;

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

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 详情主表对象 t_warehouse_details
@@ -256,6 +257,28 @@ public class TWarehouseBills extends BaseEntity {
     private String fBillstatus;
 
     /**
+     * 查询时间区间
+     */
+    private List<String> timeInterval;
+    public void settimeInterval(List<String> timeInterval) {
+        this.timeInterval = timeInterval;
+    }
+    public List<String> gettimeInterval() {
+        return timeInterval;
+    }
+
+    /**
+     * 查询货物
+     */
+    private Long fGoodsid;
+    public void setfGoodsid(Long fGoodsid) {
+        this.fGoodsid = fGoodsid;
+    }
+    public Long getfGoodsid() {
+        return fGoodsid;
+    }
+
+    /**
      * 删除状态
      */
     private String delFlag;

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

@@ -71,6 +71,12 @@
             <if test="fCorpid != null ">and f_corpid = #{fCorpid}</if>
             <if test="fTocorpid != null ">and f_tocorpid = #{fTocorpid}</if>
             <if test="fChargedate != null "> and f_chargedate = #{fChargedate}</if>
+            <if test='timeInterval != null and timeInterval[0] != null and timeInterval[0]!= ""'>
+                and f_bsdate &gt;= #{timeInterval[0]}
+            </if>
+            <if test='timeInterval != null and timeInterval[1] != null and timeInterval[1]!= ""'>
+                and f_bsdate &lt;= #{timeInterval[1]}
+            </if>
             <if test="fStltypeid != null ">and f_stltypeid = #{fStltypeid}</if>
             <if test="fBscorpno != null  and fBscorpno != ''">and f_bscorpno = #{fBscorpno}</if>
             <if test="fWarehouseid != null ">and f_warehouseid = #{fWarehouseid}</if>
@@ -120,17 +126,22 @@
             LEFT JOIN t_corps corp ON corp.f_id = bill.f_corpid
             LEFT JOIN t_corps corpSub ON corpSub.f_id = bill.f_sbu
             LEFT JOIN t_warehouse ware ON ware.f_id = bill.f_warehouseid
+            LEFT JOIN t_warehousebillsitems item ON item.f_pid = bill.f_id
+            LEFT JOIN t_goods goods ON goods.f_id = item.f_goodsid
         <where>
             <if test="fBillno != null  and fBillno != ''">and bill.f_billno = #{fBillno}</if>
-            <if test="fCustomsdeclartion != null  and fCustomsdeclartion != ''">and bill.f_customsdeclartion =
-                #{fCustomsdeclartion}
-            </if>
-            <if test="fOriginalbillno != null  and fOriginalbillno != ''">and bill.f_originalbillno =
-                #{fOriginalbillno}
-            </if>
+            <if test="fCustomsdeclartion != null  and fCustomsdeclartion != ''">and bill.f_customsdeclartion = #{fCustomsdeclartion}</if>
+            <if test="fOriginalbillno != null  and fOriginalbillno != ''">and bill.f_originalbillno = #{fOriginalbillno}</if>
             <if test="fDeptid != null ">and bill.f_deptid = #{fDeptid}</if>
             <if test="fBsdeptid != null ">and bill.f_bsdeptid = #{fBsdeptid}</if>
             <if test="fChargedate != null ">and bill.f_chargedate = #{fChargedate}</if>
+            <if test='timeInterval != null and timeInterval[0] != null and timeInterval[0]!= ""'>
+                and bill.f_bsdate &gt;= #{timeInterval[0]}
+            </if>
+            <if test='timeInterval != null and timeInterval[1] != null and timeInterval[1]!= ""'>
+                and bill.f_bsdate &lt;= #{timeInterval[1]}
+            </if>
+            <if test="fGoodsid != null  and fGoodsid != ''">and item.f_goodsid = #{fGoodsid}</if>
             <if test="fContacts != null  and fContacts != ''">and bill.f_contacts = #{fContacts}</if>
             <if test="fTel != null  and fTel != ''">and bill.f_tel = #{fTel}</if>
             <if test="fCorpid != null ">and bill.f_corpid = #{fCorpid}</if>
@@ -163,6 +174,7 @@
             <if test="fBankcorpid != null ">and bill.f_bankcorpid = #{fBankcorpid}</if>
             <if test="fBilltype != null  and fBilltype != ''">and bill.f_billtype = #{fBilltype}</if>
             <if test="fBillstatus != null  and fBillstatus != ''">and bill.f_billstatus = #{fBillstatus}</if>
+            <if test="createBy != null and createBy != ''">and bill.create_by = #{createBy}</if>
         </where>
     </select>