费用表添加字段

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

@@ -51,14 +51,7 @@ public class TWarehousebillsfees extends BaseEntity {
      * 计价单位(数据字典),对应，t_unitfees f_id，如果选择为毛重，数量（f_qty）取主表的毛重，如果选择净重，取主表的净重，如果为箱量，取主表的箱量
      */
     @Excel(name = "计价单位(数据字典),对应，t_unitfees f_id，如果选择为毛重，数量", readConverterExp = "f=_qty")
-    private Long fFeeUnitid;
-
-    /**
-     * 审核日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "审核日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fReviewDate;
+    private Long fFeeunitid;
 
     /**
      * 数量
@@ -109,10 +102,17 @@ public class TWarehousebillsfees extends BaseEntity {
     private Long fBillstatus;
 
     /**
+     * 审核日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fReviewDate;
+
+    /**
      * 对账金额
      */
     @Excel(name = "对账金额")
-    private BigDecimal fAccamount;
+    private Long fAccamount;
 
     /**
      * 对账单号
@@ -124,7 +124,7 @@ public class TWarehousebillsfees extends BaseEntity {
      * 结算金额
      */
     @Excel(name = "结算金额")
-    private BigDecimal fStlamount;
+    private Long fStlamount;
 
     /**
      * 发票号
@@ -143,7 +143,7 @@ public class TWarehousebillsfees extends BaseEntity {
      * 开票金额
      */
     @Excel(name = "开票金额")
-    private BigDecimal fInvamount;
+    private Long fInvamount;
 
     /**
      * 结算单号
@@ -155,7 +155,13 @@ public class TWarehousebillsfees extends BaseEntity {
      * 申请金额
      */
     @Excel(name = "申请金额")
-    private BigDecimal fAskamount;
+    private Long fAskamount;
+
+    /**
+     * 状态
+     */
+    @Excel(name = "状态")
+    private String fStatus;
 
     /**
      * 结算日期
@@ -165,15 +171,89 @@ public class TWarehousebillsfees extends BaseEntity {
     private Date fStlamountDate;
 
     /**
-     * 状态
+     * 删除状态
      */
-    @Excel(name = "状态")
-    private String fStatus;
+    private String delFlag;
 
     /**
-     * 删除状态
+     * 来源id
      */
-    private String delFlag;
+    @Excel(name = "来源id")
+    private Long srcId;
+
+    /**
+     * 来源编号
+     */
+    @Excel(name = "来源编号")
+    private String srcBillNo;
+
+    /**
+     * 提单号
+     */
+    @Excel(name = "提单号")
+    private String fMblno;
+
+    /**
+     * 明细品名合计
+     */
+    @Excel(name = "明细品名合计")
+    private String fProductName;
+
+    /**
+     * 唛头合计
+     */
+    @Excel(name = "唛头合计")
+    private String fMarks;
+
+    /**
+     * 仓储计费日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "仓储计费日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fChargedate;
+
+    /**
+     * 仓储费计费截至日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "仓储费计费截至日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBillingDeadline;
+
+    /**
+     * 库存天数(出库日期-仓储费计费日期)
+     */
+    @Excel(name = "库存天数(出库日期-仓储费计费日期)")
+    private Long fInventoryDays;
+
+    /**
+     * 金额
+     */
+    @Excel(name = "金额")
+    private BigDecimal fAmt;
+
+    /**
+     * 计费天数
+     */
+    @Excel(name = "计费天数")
+    private Long fBillingDays;
+
+    /**
+     * 计费数量
+     */
+    @Excel(name = "计费数量")
+    private BigDecimal fBillingQty;
+
+    /**
+     * 单据类型(数据字典)SJRK（入库） SJCK（实际出库） CKDB（调拨） HQZY（货权转移）
+     */
+    @Excel(name = "单据类型(数据字典)SJRK", readConverterExp = "入=库")
+    private String fBilltype;
+
+    /**
+     * 计费方式
+     */
+    @Excel(name = "计费方式")
+    private Long fBillingway;
 
     public void setfId(Long fId) {
         this.fId = fId;
@@ -215,20 +295,12 @@ public class TWarehousebillsfees extends BaseEntity {
         return fFeeid;
     }
 
-    public void setfFeeunitid(Long fFeeUnitid) {
-        this.fFeeUnitid = fFeeUnitid;
+    public void setfFeeunitid(Long fFeeunitid) {
+        this.fFeeunitid = fFeeunitid;
     }
 
     public Long getfFeeunitid() {
-        return fFeeUnitid;
-    }
-
-    public void setfReviewDate(Date fReviewDate) {
-        this.fReviewDate = fReviewDate;
-    }
-
-    public Date getfReviewDate() {
-        return fReviewDate;
+        return fFeeunitid;
     }
 
     public void setfQty(BigDecimal fQty) {
@@ -295,11 +367,19 @@ public class TWarehousebillsfees extends BaseEntity {
         return fBillstatus;
     }
 
-    public void setfAccamount(BigDecimal fAccamount) {
+    public void setfReviewDate(Date fReviewDate) {
+        this.fReviewDate = fReviewDate;
+    }
+
+    public Date getfReviewDate() {
+        return fReviewDate;
+    }
+
+    public void setfAccamount(Long fAccamount) {
         this.fAccamount = fAccamount;
     }
 
-    public BigDecimal getfAccamount() {
+    public Long getfAccamount() {
         return fAccamount;
     }
 
@@ -311,11 +391,11 @@ public class TWarehousebillsfees extends BaseEntity {
         return fStatementNo;
     }
 
-    public void setfStlamount(BigDecimal fStlamount) {
+    public void setfStlamount(Long fStlamount) {
         this.fStlamount = fStlamount;
     }
 
-    public BigDecimal getfStlamount() {
+    public Long getfStlamount() {
         return fStlamount;
     }
 
@@ -335,11 +415,11 @@ public class TWarehousebillsfees extends BaseEntity {
         return fAccamountDate;
     }
 
-    public void setfInvamount(BigDecimal fInvamount) {
+    public void setfInvamount(Long fInvamount) {
         this.fInvamount = fInvamount;
     }
 
-    public BigDecimal getfInvamount() {
+    public Long getfInvamount() {
         return fInvamount;
     }
 
@@ -351,22 +431,14 @@ public class TWarehousebillsfees extends BaseEntity {
         return fStlamountNo;
     }
 
-    public void setfAskamount(BigDecimal fAskamount) {
+    public void setfAskamount(Long fAskamount) {
         this.fAskamount = fAskamount;
     }
 
-    public BigDecimal getfAskamount() {
+    public Long getfAskamount() {
         return fAskamount;
     }
 
-    public void setfStlamountDate(Date fStlamountDate) {
-        this.fStlamountDate = fStlamountDate;
-    }
-
-    public Date getfStlamountDate() {
-        return fStlamountDate;
-    }
-
     public void setfStatus(String fStatus) {
         this.fStatus = fStatus;
     }
@@ -375,6 +447,14 @@ public class TWarehousebillsfees extends BaseEntity {
         return fStatus;
     }
 
+    public void setfStlamountDate(Date fStlamountDate) {
+        this.fStlamountDate = fStlamountDate;
+    }
+
+    public Date getfStlamountDate() {
+        return fStlamountDate;
+    }
+
     public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
@@ -383,6 +463,110 @@ public class TWarehousebillsfees extends BaseEntity {
         return delFlag;
     }
 
+    public void setSrcId(Long srcId) {
+        this.srcId = srcId;
+    }
+
+    public Long getSrcId() {
+        return srcId;
+    }
+
+    public void setSrcBillNo(String srcBillNo) {
+        this.srcBillNo = srcBillNo;
+    }
+
+    public String getSrcBillNo() {
+        return srcBillNo;
+    }
+
+    public void setfMblno(String fMblno) {
+        this.fMblno = fMblno;
+    }
+
+    public String getfMblno() {
+        return fMblno;
+    }
+
+    public void setfProductName(String fProductName) {
+        this.fProductName = fProductName;
+    }
+
+    public String getfProductName() {
+        return fProductName;
+    }
+
+    public void setfMarks(String fMarks) {
+        this.fMarks = fMarks;
+    }
+
+    public String getfMarks() {
+        return fMarks;
+    }
+
+    public void setfChargedate(Date fChargedate) {
+        this.fChargedate = fChargedate;
+    }
+
+    public Date getfChargedate() {
+        return fChargedate;
+    }
+
+    public void setfBillingDeadline(Date fBillingDeadline) {
+        this.fBillingDeadline = fBillingDeadline;
+    }
+
+    public Date getfBillingDeadline() {
+        return fBillingDeadline;
+    }
+
+    public void setfInventoryDays(Long fInventoryDays) {
+        this.fInventoryDays = fInventoryDays;
+    }
+
+    public Long getfInventoryDays() {
+        return fInventoryDays;
+    }
+
+    public void setfAmt(BigDecimal fAmt) {
+        this.fAmt = fAmt;
+    }
+
+    public BigDecimal getfAmt() {
+        return fAmt;
+    }
+
+    public void setfBillingDays(Long fBillingDays) {
+        this.fBillingDays = fBillingDays;
+    }
+
+    public Long getfBillingDays() {
+        return fBillingDays;
+    }
+
+    public void setfBillingQty(BigDecimal fBillingQty) {
+        this.fBillingQty = fBillingQty;
+    }
+
+    public BigDecimal getfBillingQty() {
+        return fBillingQty;
+    }
+
+    public void setfBilltype(String fBilltype) {
+        this.fBilltype = fBilltype;
+    }
+
+    public String getfBilltype() {
+        return fBilltype;
+    }
+
+    public void setfBillingway(Long fBillingway) {
+        this.fBillingway = fBillingway;
+    }
+
+    public Long getfBillingway() {
+        return fBillingway;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -400,8 +584,8 @@ public class TWarehousebillsfees extends BaseEntity {
                 .append("fTaxrate", getfTaxrate())
                 .append("fDc", getfDc())
                 .append("fBillstatus", getfBillstatus())
-                .append("fAccamount", getfAccamount())
                 .append("fReviewDate", getfReviewDate())
+                .append("fAccamount", getfAccamount())
                 .append("fStatementNo", getfStatementNo())
                 .append("fStlamount", getfStlamount())
                 .append("fInvnos", getfInvnos())
@@ -409,14 +593,27 @@ public class TWarehousebillsfees extends BaseEntity {
                 .append("fInvamount", getfInvamount())
                 .append("fStlamountNo", getfStlamountNo())
                 .append("fAskamount", getfAskamount())
-                .append("fStlamountDate", getfStlamountDate())
                 .append("fStatus", getfStatus())
+                .append("fStlamountDate", getfStlamountDate())
                 .append("delFlag", getDelFlag())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
                 .append("remark", getRemark())
+                .append("srcId", getSrcId())
+                .append("srcBillNo", getSrcBillNo())
+                .append("fMblno", getfMblno())
+                .append("fProductName", getfProductName())
+                .append("fMarks", getfMarks())
+                .append("fChargedate", getfChargedate())
+                .append("fBillingDeadline", getfBillingDeadline())
+                .append("fInventoryDays", getfInventoryDays())
+                .append("fAmt", getfAmt())
+                .append("fBillingDays", getfBillingDays())
+                .append("fBillingQty", getfBillingQty())
+                .append("fBilltype", getfBilltype())
+                .append("fBillingway", getfBillingway())
                 .toString();
     }
 }

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

@@ -750,16 +750,16 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新库存明细状态失败，请联系管理员");
         }
-        TWarehousebillsitems warehousebillsitems = new TWarehousebillsitems();
-        warehousebillsitems.setfPid(fPid);
-        List<TWarehousebillsitems> warehousebillsitemsList = tWarehousebillsitemsMapper.selectTWarehousebillsitemsList(warehousebillsitems);
-        for (TWarehousebillsitems wareItem : warehousebillsitemsList) {
+        TWarehousebillsfees warehousebillsfees = new TWarehousebillsfees();
+        warehousebillsfees.setfId(fPid);
+        List<TWarehousebillsfees> warehousebillsfeesList = tWarehousebillsfeesMapper.selectTWarehousebillsfeesList(warehousebillsfees);
+        for (TWarehousebillsfees wareItem : warehousebillsfeesList) {
             if ("KCZZ".equals(wareItem.getfBilltype())) {
-                TWhgenleg tWhgenleg = tWhgenlegMapper.selectTWhgenlegById(wareItem.getfSrcid());
+                TWhgenleg tWhgenleg = tWhgenlegMapper.selectTWhgenlegById(wareItem.getSrcId());
                 tWhgenleg.setfChargedate(wareItem.getfBillingDeadline());
                 tWhgenlegMapper.updateTWhgenleg(tWhgenleg);
             } else {
-                TWarehousebillsitems tWarehousebillsitems = tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(wareItem.getfSrcid());
+                TWarehousebillsitems tWarehousebillsitems = tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(wareItem.getSrcId());
                 tWarehousebillsitems.setfAmt(wareItem.getfAmt());
                 tWarehousebillsitems.setfBillingQty(wareItem.getfBillingQty());
                 tWarehousebillsitems.setfBillingDays(wareItem.getfBillingDays());
@@ -1237,7 +1237,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         Map<String, Object> map = new HashMap<>();
         long feeId = 0L;
         BigDecimal sumAmt = new BigDecimal(0);
-        List<TWarehousebillsitems> itemsList = new ArrayList<>();
+        List<TWarehousebillsfees> itemsList = new ArrayList<>();
+        List<SysDictData> taxRate = sysDictDataMapper.selectDictDataByType("tax_rate");
         for (Map<String, Object> item : mapItem) {
             if (StringUtils.isNull(item.get("fBillingway"))) {
                 map.put("error", "单号：" + item.get("fBillno") + ",业务日期:" + item.get("fBsdate") + "未找到库存总账的计费单位，请确认");
@@ -1268,52 +1269,44 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 map.put("error", "单号：" + item.get("fBillno") + ",业务日期:" + item.get("fBsdate") + "未找到仓储费协议，请确认");
                 return map;
             }
-
             String remark = objectMap.get("remark").toString();
             feeId = Long.valueOf(String.valueOf(objectMap.get("feeId"))).longValue();
             BigDecimal amt = (BigDecimal) objectMap.get("amt");
             map.put("feeId", feeId);
             map.put("itemFeeId", objectMap.get("feeId"));
             sumAmt = sumAmt.add(amt).setScale(2, BigDecimal.ROUND_HALF_UP);
-            TWarehousebillsitems tWarehousebillsitems = new TWarehousebillsitems();
-            tWarehousebillsitems.setfAmt(amt);
-            tWarehousebillsitems.setfSrcid(fId);
-            tWarehousebillsitems.setRemark(remark);
-            tWarehousebillsitems.setfBillstatus(50L);
-            tWarehousebillsitems.setfBillingQty(fQty);
-            tWarehousebillsitems.setfBilltype(fBilltype);
-            tWarehousebillsitems.setfBillingDays(dateDay);
-            tWarehousebillsitems.setCreateTime(new Date());
-            tWarehousebillsitems.setfMarks((String) item.get("fMarks"));
-            tWarehousebillsitems.setfPid(warehouseBills.getfId());
-            tWarehousebillsitems.setfInventoryDays(fInventoryDays);
-            tWarehousebillsitems.setfBsdate((Date) item.get("fBsdate"));
-            tWarehousebillsitems.setfBillno((String) item.get("fBillno"));
-            tWarehousebillsitems.setfGoodsid(Long.valueOf(String.valueOf(item.get("fGoodsid"))).longValue());
-            tWarehousebillsitems.setCreateBy(loginUser.getUser().getUserName());
-            tWarehousebillsitems.setfBillingway(Long.valueOf(String.valueOf(item.get("fBillingway"))).longValue());
-            tWarehousebillsitems.setfChargedate((Date) item.get("fChargedate"));
-            tWarehousebillsitems.setfOriginalbilldate((Date) item.get("fOriginalbilldate"));
-            tWarehousebillsitems.setfBillingDeadline(warehouseBills.getfBillingDeadline());
-            tWarehousebillsitemsMapper.insertTWarehousebillsitems(tWarehousebillsitems);
-            itemsList.add(tWarehousebillsitems);
-        }
-        TWarehousebillsfees fees = new TWarehousebillsfees();
-        fees.setfPid(warehouseBills.getfId());
-        fees.setfFeeid(feeId);
-        fees.setfCorpid(warehouseBills.getfCorpid());
-        fees.setfFeeunitid(2L);
-        fees.setfQty(new BigDecimal(1));
-        fees.setfUnitprice(sumAmt);
-        fees.setfAmount(sumAmt);
-        fees.setfExrate(new BigDecimal(1));
-        fees.setfCurrency("RMB");
-        List<SysDictData> taxRate = sysDictDataMapper.selectDictDataByType("tax_rate");
-        fees.setfDc("D");
-        fees.setfTaxrate(new BigDecimal(taxRate.get(0).getDictValue()));
-        fees.setCreateBy(loginUser.getUser().getUserName());
-        fees.setCreateTime(new Date());
-        map.put("fees", fees);
+            TWarehousebillsfees fees = new TWarehousebillsfees();
+            fees.setfFeeid(feeId);
+            fees.setfDc("D");
+            fees.setfAmt(amt);
+            fees.setSrcId(fId);
+            fees.setRemark(remark);
+            fees.setfBillstatus(2L);
+            fees.setfFeeunitid(2L);
+            fees.setfAmount(sumAmt);
+            fees.setfCurrency("RMB");
+            fees.setfBillingQty(fQty);
+            fees.setfUnitprice(sumAmt);
+            fees.setfBilltype(fBilltype);
+            fees.setfBillingDays(dateDay);
+            fees.setCreateTime(new Date());
+            fees.setfQty(new BigDecimal(1));
+            fees.setfPid(warehouseBills.getfId());
+            fees.setfInventoryDays(fInventoryDays);
+            fees.setfExrate(new BigDecimal(1));
+            fees.setfMarks((String) item.get("fMarks"));
+            fees.setfCorpid(warehouseBills.getfCorpid());
+            fees.setSrcBillNo((String) item.get("fBillno"));
+            fees.setfProductName(item.get("fGoodsids").toString());
+            fees.setfTaxrate(new BigDecimal(taxRate.get(0).getDictValue()));
+            fees.setCreateBy(loginUser.getUser().getUserName());
+            fees.setfBillingway(Long.valueOf(String.valueOf(item.get("fBillingway"))).longValue());
+            fees.setfChargedate((Date) item.get("fChargedate"));
+//            fees.setfOriginalbilldate((Date) item.get("fOriginalbilldate"));
+            fees.setfBillingDeadline(warehouseBills.getfBillingDeadline());
+            tWarehousebillsfeesMapper.insertTWarehousebillsfees(fees);
+            itemsList.add(fees);
+        }
         map.put("sumAmt", sumAmt);
         map.put("itemsList", itemsList);
         return map;
@@ -1356,8 +1349,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
             fPid = tWarehouseBills.getfId();
         }
-        // 应收费用明细
-        List<TWarehousebillsfees> warehousebillsfeesList = new ArrayList<>();
         // 计划物资明细
         List<TWarehousebillsitems> itemsList = new ArrayList<>();
         BigDecimal bigDecimal = new BigDecimal(0);
@@ -1374,10 +1365,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error((String) mapItem.get("error"));
             }
-            TWarehousebillsfees fees = (TWarehousebillsfees) mapItem.get("fees");
-            tWarehousebillsfeesMapper.insertTWarehousebillsfees(fees);
             itemsList = (List<TWarehousebillsitems>) mapItem.get("itemsList");
-            warehousebillsfeesList.add(fees);
         }
         List<Map<String, Object>> tWhgenlegs = tWhgenlegMapper.selectStorageFeeItemList(tWarehouseBills);
         if (tWhgenlegs.size() != 0) {
@@ -1386,15 +1374,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error((String) mapItem.get("error"));
             }
-            TWarehousebillsfees fees = (TWarehousebillsfees) mapItem.get("fees");
-            tWarehousebillsfeesMapper.insertTWarehousebillsfees(fees);
             List<TWarehousebillsitems> itemList = (List<TWarehousebillsitems>) mapItem.get("itemsList");
             if (itemList.size() != 0) {
                 for (TWarehousebillsitems ite : itemList) {
                     itemsList.add(ite);
                 }
             }
-            warehousebillsfeesList.add(fees);
         }
         TGoods tGoods = new TGoods();
         tGoods.setfStatus("0");
@@ -1411,7 +1396,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         map.put("feesList", feesList);
         map.put("warehouseBills", tWarehouseBills);
         map.put("warehouseItemList", itemsList);
-        map.put("warehouseFeesList", warehousebillsfeesList);
         return AjaxResult.success(map);
     }
 
@@ -1457,15 +1441,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             tWarehouseBillsMapper.insertTWarehousebills(tWarehousebills);
             fPid = tWarehousebills.getfId();
         }
-        if (StringUtils.isNotNull(warehouseItems) && !"[]".equals(warehouseItems)) {
-            JSONArray warehouseJSON = JSONArray.parseArray(warehouseItems);
-            List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
-            for (TWarehousebillsitems item : warehousebillsitemsList) {
-                item.setfId(null);
-                item.setfPid(fPid);
-                item.setfBillstatus(tWarehousebills.getfBillstatus());
-                tWarehousebillsitemsMapper.insertTWarehousebillsitems(item);
-            }
+        JSONArray warehouseJSON = JSONArray.parseArray(warehouseItems);
+        List<TWarehousebillsfees> itemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsfees.class);
+        for (TWarehousebillsfees item : itemsList) {
+            item.setfId(null);
+            item.setfPid(fPid);
+            item.setfBillstatus(tWarehousebills.getfBillstatus());
+            tWarehousebillsfeesMapper.insertTWarehousebillsfees(item);
         }
         if (StringUtils.isNotNull(warehouseFees) && !"[]".equals(warehouseFees)) {
             JSONArray feesJSON = JSONArray.parseArray(warehouseFees);
@@ -1538,12 +1520,18 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             return AjaxResult.error("未找到信息，请刷新页面重试");
         }
         Map<String, Object> map = new HashMap<>();
-        TWarehousebillsitems tWarehousebillsitems = new TWarehousebillsitems();
-        tWarehousebillsitems.setfPid(fId);
-        List<TWarehousebillsitems> warehouseItemsList = tWarehousebillsitemsMapper.selectTWarehousebillsitemsList(tWarehousebillsitems);
+        List<TWarehousebillsfees> feesList = new ArrayList<>();
+        List<TWarehousebillsfees> itemsList = new ArrayList<>();
         TWarehousebillsfees warehousebillsfees = new TWarehousebillsfees();
         warehousebillsfees.setfPid(fId);
         List<TWarehousebillsfees> warehouseFeesList = tWarehousebillsfeesMapper.selectTWarehousebillsfeesList(warehousebillsfees);
+        for (TWarehousebillsfees fees : warehouseFeesList) {
+            if (StringUtils.isNotNull(fees.getSrcId())) {
+                itemsList.add(fees);
+            } else {
+                feesList.add(fees);
+            }
+        }
         TGoods tGoods = new TGoods();
         tGoods.setfStatus("0");
         tGoods.setDelFlag("0");
@@ -1551,7 +1539,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         TFees tFees = new TFees();
         tFees.setfStatus("2");
         tFees.setDelFlag("0");
-        List<TFees> feesList = tFeesMapper.selectTFeesList(tFees);
+        List<TFees> feesLists = tFeesMapper.selectTFeesList(tFees);
         // 查询联系人
         List<SysUser> sysUserList = new ArrayList<>();
         SysUser sysUser = sysUserMapper.selectUserByUserName(tWarehouseBills.getCreateBy());
@@ -1561,11 +1549,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         TCorps corps = tCorpsMapper.selectTCorpsById(tWarehouseBills.getfCorpid());
         map.put("corps", corps);
         map.put("goodsList", goods);
-        map.put("feesList", feesList);
+        map.put("feesList", feesLists);
         map.put("sysUser", sysUserList);
         map.put("warehouse", tWarehouseBills);
-        map.put("warehouseFeesList", warehouseFeesList);
-        map.put("warehouseItemsList", warehouseItemsList);
+        map.put("warehouseFeesList", feesList);
+        map.put("warehouseItemsList", itemsList);
         return AjaxResult.success(map);
     }
 

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -106,6 +106,7 @@
             leg.f_chargedate AS fChargedate,
             leg.f_grossweightblc AS fGrossweightblc,
             leg.f_netweightblc AS fNetweightblc,
+            dict.dict_label AS fBusinessTypes,
             leg.f_marks AS fMarks,
             DATE_FORMAT( leg.create_time, '%Y-%m-%d' ) AS createTime,
             DATE_FORMAT( leg.f_originalbilldate, '%Y-%m-%d' ) AS fOriginalbilldate,
@@ -115,11 +116,12 @@
             LEFT JOIN t_corps corp ON corp.f_id = leg.f_corpid
             LEFT JOIN t_goods goods ON goods.f_id = leg.f_goodsid
             LEFT JOIN t_warehouse ware ON ware.f_id = leg.f_warehouseid
+            LEFT JOIN sys_dict_data dict ON dict.dict_value = leg.f_business_type
             LEFT JOIN t_warehouse_area area ON area.f_id = leg.f_warehouse_locationid
         <where>
-            <if test="fOriginalbillno != null  and fOriginalbillno != ''">and leg.f_originalbillno =
-                #{fOriginalbillno}
-            </if>
+            dict.status = '0'
+            AND dict.dict_type = 'storage_type'
+            <if test="fOriginalbillno != null  and fOriginalbillno != ''">and leg.f_originalbillno = #{fOriginalbillno}</if>
             <if test="fPreqty != null ">and leg.f_preqty = #{fPreqty}</if>
             <if test="fCorpid != null ">and leg.f_corpid = #{fCorpid}</if>
             <if test="fMblno != null ">and leg.f_mblno = #{fMblno}</if>
@@ -361,6 +363,7 @@
                 f_goodsid
             ) t ON g.f_id = t.f_goodsid
     </select>
+
     <select id="selectGoodsListWhouse"  resultType="Map">
         SELECT
             t.f_goodsid AS fGoodsid,
@@ -409,6 +412,7 @@
                 sum( f_grossweightD ) DESC
             ) t ON w.f_id = t.f_warehouseid
     </select>
+
     <select id="selectWareHouseListWhouse"  resultType="Map">
         SELECT
             t.f_warehouseid AS fWarehouseid,
@@ -448,6 +452,7 @@
                 f_corpid
             ) t ON c.f_id = t.f_corpid
     </select>
+
     <select id="selectCorpsListWhouse"  resultType="Map">
         SELECT
             t.f_corpid AS fCorpid,
@@ -506,7 +511,8 @@
             wh.f_grossweightblc AS fGrossweight,
             wh.f_netweightblc AS fNetweight,
             "KCZZ" AS fBilltype,
-            goods.f_typeid AS fTypeid
+            goods.f_typeid AS fTypeid,
+            goods.f_name AS fGoodsids
         FROM
             t_whgenleg wh
             LEFT JOIN t_goods goods ON goods.f_id = wh.f_goodsid

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

@@ -13,13 +13,13 @@
         <result property="fFeeunitid" column="f_feeUnitid"/>
         <result property="fQty" column="f_qty"/>
         <result property="fUnitprice" column="f_unitprice"/>
-        <result property="fReviewDate" column="f_review_date"/>
         <result property="fAmount" column="f_amount"/>
         <result property="fCurrency" column="f_currency"/>
         <result property="fExrate" column="f_exrate"/>
         <result property="fTaxrate" column="f_taxrate"/>
         <result property="fDc" column="f_dc"/>
         <result property="fBillstatus" column="f_billstatus"/>
+        <result property="fReviewDate" column="f_review_date"/>
         <result property="fAccamount" column="f_accamount"/>
         <result property="fStatementNo" column="f_statement_no"/>
         <result property="fStlamount" column="f_stlamount"/>
@@ -28,48 +28,73 @@
         <result property="fInvamount" column="f_invamount"/>
         <result property="fStlamountNo" column="f_stlamount_no"/>
         <result property="fAskamount" column="f_askamount"/>
-        <result property="fStlamountDate" column="f_stlamount_date"/>
         <result property="fStatus" column="f_status"/>
+        <result property="fStlamountDate" column="f_stlamount_date"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="srcId" column="src_id"/>
+        <result property="srcBillNo" column="src_bill_no"/>
+        <result property="fMblno" column="f_mblno"/>
+        <result property="fProductName" column="f_product_name"/>
+        <result property="fMarks" column="f_marks"/>
+        <result property="fChargedate" column="f_chargedate"/>
+        <result property="fBillingDeadline" column="f_billing_deadline"/>
+        <result property="fInventoryDays" column="f_inventory_days"/>
+        <result property="fAmt" column="f_amt"/>
+        <result property="fBillingDays" column="f_billing_days"/>
+        <result property="fBillingQty" column="f_billing_qty"/>
+        <result property="fBilltype" column="f_billtype"/>
+        <result property="fBillingway" column="f_billingway"/>
     </resultMap>
 
     <sql id="selectTWarehousebillsfeesVo">
-        select f_id, f_pid, f_lineno, f_corpid, f_feeid, f_feeUnitid, f_qty, f_unitprice, f_amount, f_currency, f_review_date, f_exrate, f_taxrate, f_dc, f_billstatus, f_accamount, f_statement_no, f_stlamount, f_invnos, f_accamount_date, f_invamount, f_stlamount_no, f_askamount, f_stlamount_date, f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_warehousebillsfees
+        select f_id, f_pid, f_lineno, f_corpid, f_feeid, f_feeUnitid, f_qty, f_unitprice, f_amount, f_currency, f_exrate, f_taxrate, f_dc, f_billstatus, f_review_date, f_accamount, f_statement_no, f_stlamount, f_invnos, f_accamount_date, f_invamount, f_stlamount_no, f_askamount, f_status, f_stlamount_date, del_flag, create_by, create_time, update_by, update_time, remark, src_id, src_bill_no, f_mblno, f_product_name, f_marks, f_chargedate, f_billing_deadline, f_inventory_days, f_amt, f_billing_days, f_billing_qty, f_billtype, f_billingway from t_warehousebillsfees
     </sql>
 
-    <select id="selectTWarehousebillsfeesList" parameterType="TWarehousebillsfees"
-            resultMap="TWarehousebillsfeesResult">
+    <select id="selectTWarehousebillsfeesList" parameterType="TWarehousebillsfees" resultMap="TWarehousebillsfeesResult">
         <include refid="selectTWarehousebillsfeesVo"/>
         <where>
-            <if test="fPid != null ">and f_pid = #{fPid}</if>
-            <if test="fLineno != null ">and f_lineno = #{fLineno}</if>
-            <if test="fCorpid != null ">and f_corpid = #{fCorpid}</if>
-            <if test="fFeeid != null ">and f_feeid = #{fFeeid}</if>
-            <if test="fFeeunitid != null ">and f_feeUnitid = #{fFeeunitid}</if>
-            <if test="fQty != null ">and f_qty = #{fQty}</if>
-            <if test="fUnitprice != null ">and f_unitprice = #{fUnitprice}</if>
-            <if test="fAmount != null ">and f_amount = #{fAmount}</if>
-            <if test="fCurrency != null  and fCurrency != ''">and f_currency = #{fCurrency}</if>
-            <if test="fExrate != null ">and f_exrate = #{fExrate}</if>
-            <if test="fReviewDate != null ">and f_review_date = #{fReviewDate}</if>
-            <if test="fTaxrate != null ">and f_taxrate = #{fTaxrate}</if>
-            <if test="fDc != null  and fDc != ''">and f_dc = #{fDc}</if>
-            <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
-            <if test="fAccamount != null ">and f_accamount = #{fAccamount}</if>
-            <if test="fStatementNo != null  and fStatementNo != ''">and f_statement_no = #{fStatementNo}</if>
-            <if test="fStlamount != null ">and f_stlamount = #{fStlamount}</if>
-            <if test="fInvnos != null  and fInvnos != ''">and f_invnos = #{fInvnos}</if>
-            <if test="fAccamountDate != null ">and f_accamount_date = #{fAccamountDate}</if>
-            <if test="fInvamount != null ">and f_invamount = #{fInvamount}</if>
-            <if test="fStlamountNo != null  and fStlamountNo != ''">and f_stlamount_no = #{fStlamountNo}</if>
-            <if test="fAskamount != null ">and f_askamount = #{fAskamount}</if>
-            <if test="fStlamountDate != null ">and f_stlamount_date = #{fStlamountDate}</if>
-            <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
+            <if test="fPid != null "> and f_pid = #{fPid}</if>
+            <if test="fLineno != null "> and f_lineno = #{fLineno}</if>
+            <if test="fCorpid != null "> and f_corpid = #{fCorpid}</if>
+            <if test="fFeeid != null "> and f_feeid = #{fFeeid}</if>
+            <if test="fFeeunitid != null "> and f_feeUnitid = #{fFeeunitid}</if>
+            <if test="fQty != null "> and f_qty = #{fQty}</if>
+            <if test="fUnitprice != null "> and f_unitprice = #{fUnitprice}</if>
+            <if test="fAmount != null "> and f_amount = #{fAmount}</if>
+            <if test="fCurrency != null  and fCurrency != ''"> and f_currency = #{fCurrency}</if>
+            <if test="fExrate != null "> and f_exrate = #{fExrate}</if>
+            <if test="fTaxrate != null "> and f_taxrate = #{fTaxrate}</if>
+            <if test="fDc != null  and fDc != ''"> and f_dc = #{fDc}</if>
+            <if test="fBillstatus != null  and fBillstatus != ''"> and f_billstatus = #{fBillstatus}</if>
+            <if test="fReviewDate != null "> and f_review_date = #{fReviewDate}</if>
+            <if test="fAccamount != null "> and f_accamount = #{fAccamount}</if>
+            <if test="fStatementNo != null  and fStatementNo != ''"> and f_statement_no = #{fStatementNo}</if>
+            <if test="fStlamount != null "> and f_stlamount = #{fStlamount}</if>
+            <if test="fInvnos != null  and fInvnos != ''"> and f_invnos = #{fInvnos}</if>
+            <if test="fAccamountDate != null "> and f_accamount_date = #{fAccamountDate}</if>
+            <if test="fInvamount != null "> and f_invamount = #{fInvamount}</if>
+            <if test="fStlamountNo != null  and fStlamountNo != ''"> and f_stlamount_no = #{fStlamountNo}</if>
+            <if test="fAskamount != null "> and f_askamount = #{fAskamount}</if>
+            <if test="fStatus != null  and fStatus != ''"> and f_status = #{fStatus}</if>
+            <if test="fStlamountDate != null "> and f_stlamount_date = #{fStlamountDate}</if>
+            <if test="srcId != null "> and src_id = #{srcId}</if>
+            <if test="srcBillNo != null  and srcBillNo != ''"> and src_bill_no = #{srcBillNo}</if>
+            <if test="fMblno != null  and fMblno != ''"> and f_mblno = #{fMblno}</if>
+            <if test="fProductName != null  and fProductName != ''"> and f_product_name like concat('%', #{fProductName}, '%')</if>
+            <if test="fMarks != null  and fMarks != ''"> and f_marks = #{fMarks}</if>
+            <if test="fChargedate != null "> and f_chargedate = #{fChargedate}</if>
+            <if test="fBillingDeadline != null "> and f_billing_deadline = #{fBillingDeadline}</if>
+            <if test="fInventoryDays != null "> and f_inventory_days = #{fInventoryDays}</if>
+            <if test="fAmt != null "> and f_amt = #{fAmt}</if>
+            <if test="fBillingDays != null "> and f_billing_days = #{fBillingDays}</if>
+            <if test="fBillingQty != null "> and f_billing_qty = #{fBillingQty}</if>
+            <if test="fBilltype != null  and fBilltype != ''"> and f_billtype = #{fBilltype}</if>
+            <if test="fBillingway != null "> and f_billingway = #{fBillingway}</if>
         </where>
     </select>
 
@@ -94,16 +119,16 @@
             <if test="fExrate != null">f_exrate,</if>
             <if test="fTaxrate != null">f_taxrate,</if>
             <if test="fDc != null">f_dc,</if>
-            <if test="fReviewDate != null">f_review_date,</if>
             <if test="fBillstatus != null">f_billstatus,</if>
+            <if test="fReviewDate != null">f_review_date,</if>
             <if test="fAccamount != null">f_accamount,</if>
             <if test="fStatementNo != null">f_statement_no,</if>
             <if test="fStlamount != null">f_stlamount,</if>
             <if test="fInvnos != null">f_invnos,</if>
-            <if test="fInvamount != null">f_invamount,</if>
             <if test="fAccamountDate != null">f_accamount_date,</if>
-            <if test="fAskamount != null">f_askamount,</if>
+            <if test="fInvamount != null">f_invamount,</if>
             <if test="fStlamountNo != null">f_stlamount_no,</if>
+            <if test="fAskamount != null">f_askamount,</if>
             <if test="fStatus != null">f_status,</if>
             <if test="fStlamountDate != null">f_stlamount_date,</if>
             <if test="delFlag != null">del_flag,</if>
@@ -112,6 +137,19 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="srcId != null">src_id,</if>
+            <if test="srcBillNo != null">src_bill_no,</if>
+            <if test="fMblno != null">f_mblno,</if>
+            <if test="fProductName != null">f_product_name,</if>
+            <if test="fMarks != null">f_marks,</if>
+            <if test="fChargedate != null">f_chargedate,</if>
+            <if test="fBillingDeadline != null">f_billing_deadline,</if>
+            <if test="fInventoryDays != null">f_inventory_days,</if>
+            <if test="fAmt != null">f_amt,</if>
+            <if test="fBillingDays != null">f_billing_days,</if>
+            <if test="fBillingQty != null">f_billing_qty,</if>
+            <if test="fBilltype != null">f_billtype,</if>
+            <if test="fBillingway != null">f_billingway,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fPid != null">#{fPid},</if>
@@ -126,16 +164,16 @@
             <if test="fExrate != null">#{fExrate},</if>
             <if test="fTaxrate != null">#{fTaxrate},</if>
             <if test="fDc != null">#{fDc},</if>
-            <if test="fReviewDate != null">#{fReviewDate},</if>
             <if test="fBillstatus != null">#{fBillstatus},</if>
+            <if test="fReviewDate != null">#{fReviewDate},</if>
             <if test="fAccamount != null">#{fAccamount},</if>
             <if test="fStatementNo != null">#{fStatementNo},</if>
             <if test="fStlamount != null">#{fStlamount},</if>
             <if test="fInvnos != null">#{fInvnos},</if>
-            <if test="fInvamount != null">#{fInvamount},</if>
             <if test="fAccamountDate != null">#{fAccamountDate},</if>
-            <if test="fAskamount != null">#{fAskamount},</if>
+            <if test="fInvamount != null">#{fInvamount},</if>
             <if test="fStlamountNo != null">#{fStlamountNo},</if>
+            <if test="fAskamount != null">#{fAskamount},</if>
             <if test="fStatus != null">#{fStatus},</if>
             <if test="fStlamountDate != null">#{fStlamountDate},</if>
             <if test="delFlag != null">#{delFlag},</if>
@@ -144,6 +182,19 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="srcId != null">#{srcId},</if>
+            <if test="srcBillNo != null">#{srcBillNo},</if>
+            <if test="fMblno != null">#{fMblno},</if>
+            <if test="fProductName != null">#{fProductName},</if>
+            <if test="fMarks != null">#{fMarks},</if>
+            <if test="fChargedate != null">#{fChargedate},</if>
+            <if test="fBillingDeadline != null">#{fBillingDeadline},</if>
+            <if test="fInventoryDays != null">#{fInventoryDays},</if>
+            <if test="fAmt != null">#{fAmt},</if>
+            <if test="fBillingDays != null">#{fBillingDays},</if>
+            <if test="fBillingQty != null">#{fBillingQty},</if>
+            <if test="fBilltype != null">#{fBilltype},</if>
+            <if test="fBillingway != null">#{fBillingway},</if>
         </trim>
     </insert>
 
@@ -154,7 +205,7 @@
             <if test="fLineno != null">f_lineno = #{fLineno},</if>
             <if test="fCorpid != null">f_corpid = #{fCorpid},</if>
             <if test="fFeeid != null">f_feeid = #{fFeeid},</if>
-            <if test="fFeeUnitid != null">f_feeUnitid = #{fFeeUnitid},</if>
+            <if test="fFeeunitid != null">f_feeUnitid = #{fFeeunitid},</if>
             <if test="fQty != null">f_qty = #{fQty},</if>
             <if test="fUnitprice != null">f_unitprice = #{fUnitprice},</if>
             <if test="fAmount != null">f_amount = #{fAmount},</if>
@@ -172,14 +223,27 @@
             <if test="fInvamount != null">f_invamount = #{fInvamount},</if>
             <if test="fStlamountNo != null">f_stlamount_no = #{fStlamountNo},</if>
             <if test="fAskamount != null">f_askamount = #{fAskamount},</if>
-            <if test="fStlamountDate != null">f_stlamount_date = #{fStlamountDate},</if>
             <if test="fStatus != null">f_status = #{fStatus},</if>
+            <if test="fStlamountDate != null">f_stlamount_date = #{fStlamountDate},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="srcId != null">src_id = #{srcId},</if>
+            <if test="srcBillNo != null">src_bill_no = #{srcBillNo},</if>
+            <if test="fMblno != null">f_mblno = #{fMblno},</if>
+            <if test="fProductName != null">f_product_name = #{fProductName},</if>
+            <if test="fMarks != null">f_marks = #{fMarks},</if>
+            <if test="fChargedate != null">f_chargedate = #{fChargedate},</if>
+            <if test="fBillingDeadline != null">f_billing_deadline = #{fBillingDeadline},</if>
+            <if test="fInventoryDays != null">f_inventory_days = #{fInventoryDays},</if>
+            <if test="fAmt != null">f_amt = #{fAmt},</if>
+            <if test="fBillingDays != null">f_billing_days = #{fBillingDays},</if>
+            <if test="fBillingQty != null">f_billing_qty = #{fBillingQty},</if>
+            <if test="fBilltype != null">f_billtype = #{fBilltype},</if>
+            <if test="fBillingway != null">f_billingway = #{fBillingway},</if>
         </trim>
         where f_id = #{fId}
     </update>

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

@@ -369,7 +369,8 @@
             item.f_grossweight AS fGrossweight,
             item.f_netweight AS fNetweight,
             item.f_billtype AS fBilltype,
-            goods.f_typeid AS fTypeid
+            goods.f_typeid AS fTypeid,
+            goods.f_name AS fGoodsids
         FROM
             t_warehousebills ware
             LEFT JOIN t_warehousebillsitems item ON item.f_pid = ware.f_id