调整禅道 bug

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

@@ -487,8 +487,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 wbDr.setfPid(fPid);
                 wbDr.setfDc("D");
                 wbDr.setfBilltype(billsType);
-                wbDr.setCreateBy(loginUser.getUser().getUserName());
                 wbDr.setCreateTime(new Date());
+                wbDr.setSrcBillNo(warehouseBills.getfBillno());
+                wbDr.setfChargedate(warehouseBills.getfChargedate());
+                wbDr.setfBillingDeadline(warehouseBills.getfChargedate());
+                wbDr.setCreateBy(loginUser.getUser().getUserName());
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
             }
         }
@@ -500,8 +503,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 wbCr.setfPid(fPid);
                 wbCr.setfDc("C");
                 wbCr.setfBilltype(billsType);
-                wbCr.setCreateBy(loginUser.getUser().getUserName());
                 wbCr.setCreateTime(new Date());
+                wbCr.setSrcBillNo(warehouseBills.getfBillno());
+                wbCr.setCreateBy(loginUser.getUser().getUserName());
+                wbCr.setfChargedate(warehouseBills.getfChargedate());
+                wbCr.setfBillingDeadline(warehouseBills.getfChargedate());
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
             }
         }
@@ -638,7 +644,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 wbCr.setfDc("C");
                 wbCr.setfBilltype(billsType);
                 wbCr.setCreateTime(new Date());
+                wbCr.setSrcBillNo(warehouseBills.getfBillno());
                 wbCr.setCreateBy(loginUser.getUser().getUserName());
+                wbCr.setfChargedate(warehouseBills.getfChargedate());
+                wbCr.setfBillingDeadline(warehouseBills.getfChargedate());
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
             }
         }
@@ -651,7 +660,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 wbDr.setfBillstatus(4L);
                 wbDr.setfBilltype(billsType);
                 wbDr.setCreateTime(new Date());
+                wbDr.setSrcBillNo(warehouseBills.getfBillno());
                 wbDr.setCreateBy(loginUser.getUser().getUserName());
+                wbDr.setfChargedate(warehouseBills.getfChargedate());
+                wbDr.setfBillingDeadline(warehouseBills.getfChargedate());
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
             }
         }
@@ -1029,7 +1041,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         updateTWhgenlegData(wbItem, tWhgenle1.getfId(), "SJRK");
                     }
                 }
-                wbItem.setfBillstatus(6L);
+                wbItem.setfWarehouselocid(warehouselocId);
+                wbItem.setfBillstatus(40L);
             } else if ("HQZY".equals(billsType)) { // 货转
                 wbItem.setfBillstatus(6L);
                 wbItem.setfChargedate(tWarehouseBills.getfChargedate());
@@ -1449,6 +1462,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         List<TWarehousebillsfees> itemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsfees.class);
         for (TWarehousebillsfees item : itemsList) {
             item.setfId(null);
+            item.setSrcBillNo(tWarehousebills.getfBillno());
             item.setfPid(fPid);
             item.setfBillstatus(tWarehousebills.getfBillstatus());
             tWarehousebillsfeesMapper.insertTWarehousebillsfees(item);
@@ -1461,6 +1475,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 fees.setfPid(fPid);
                 fees.setfDc("D");
                 fees.setfBilltype("JSCCF");
+                fees.setSrcBillNo(tWarehousebills.getfBillno());
                 fees.setfBillstatus(tWarehousebills.getfBillstatus());
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(fees);
             }

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -165,63 +165,78 @@
 
     <select id="warehouseBillsFeesList" resultType="java.util.Map">
         SELECT
-        w.f_id AS  fSrcid,
-        t.f_id AS  fSrcpid,
-        t.f_corpid AS fCorpid,
-        c.f_name AS fName,
-        w.fId AS fId,
-        w.fName AS fFeesName,
-        t.f_bscorpno AS fBscorpno,
-        w.f_mblno AS fMblno,
-        w.f_product_name AS fProductName,
-        t.f_bsdate AS fBsdate,
-        t.f_billtype AS fBilltype,
-        t.f_review_date AS fReviewDate,
-        w.f_feeid AS fFeeid,
-        f.f_name AS fFeeName,
-        w.f_dc AS fSrcdc,
-        ifnull(w.f_amount, 0) - ifnull(w.f_stlamount, 0) AS fAmtdr,
-        ifnull(w.f_amount, 0) - ifnull(w.f_stlamount, 0) AS fAmt
-        FROM
-        t_warehousebills t
-        LEFT JOIN t_corps c ON c.f_id = t.f_corpid
-        LEFT JOIN (
-        SELECT
-        f.f_id AS f_id,
-        f.f_pid AS f_pid,
-        f.f_lineno AS f_lineno,
-        f.f_corpid,
-        f.f_feeid,
-        f.f_feeUnitid,
-        f.f_qty,
-        f.f_unitprice,
-        f.f_amount,
-        f.f_currency,
-        f.f_exrate,
-        f.f_taxrate,
-        f.f_dc,
-        f.f_billstatus,
-        f.f_statement_no,
-        f.f_accamount,
-        f.f_accamount_date,
-        f.f_stlamount_no,
-        f.f_stlamount,
-        f.f_stlamount_date,
-        f.f_invnos,
-        f.f_invamount,
-        f.f_askamount,
-        f.f_status,
-        f.remark,
-        f.f_mblno,
-        f.f_product_name,
-        f.f_marks,
-        c.f_id AS fId,
-        c.f_name AS fName
+            w.f_id AS fSrcid,
+            t.f_id AS fSrcpid,
+            t.f_corpid AS fCorpid,
+            c.f_name AS fName,
+            w.fId AS fId,
+            w.fName AS fFeesName,
+            t.f_bscorpno AS fBscorpno,
+            w.f_mblno AS fMblno,
+            w.f_product_name AS fProductName,
+            t.f_bsdate AS fBsdate,
+            t.f_billtype AS fBilltype,
+            t.f_review_date AS fReviewDate,
+            w.f_feeid AS fFeeid,
+            w.src_bill_no AS srcBillNo,
+            w.f_mblno AS fMblno,
+            w.f_product_name AS fProductName,
+            w.f_marks AS fMarks,
+            w.f_chargedate AS fChargedate,
+            w.f_billing_days AS fBillingDays,
+            w.f_billing_deadline AS fBillingDeadline,
+            w.f_inventory_days AS fInventoryDays,
+            w.f_originalbilldate AS fOriginalbilldate,
+            f.f_name AS fFeeName,
+            w.f_dc AS fSrcdc,
+            ifnull( w.f_amount, 0 ) - ifnull( w.f_stlamount, 0 ) AS fAmtdr,
+            ifnull( w.f_amount, 0 ) - ifnull( w.f_stlamount, 0 ) AS fAmt
         FROM
-        t_warehousebillsfees AS f
-        LEFT JOIN t_corps AS c ON f.f_corpid = c.f_id
-        ) w ON w.f_pid = t.f_id
-        LEFT JOIN t_fees f ON w.f_feeid = f.f_id
+            t_warehousebills t
+            LEFT JOIN t_corps c ON c.f_id = t.f_corpid
+            LEFT JOIN (
+            SELECT
+                f.f_id AS f_id,
+                f.f_pid AS f_pid,
+                f.f_lineno AS f_lineno,
+                f.f_corpid,
+                f.f_feeid,
+                f.f_feeUnitid,
+                f.f_qty,
+                f.f_unitprice,
+                f.f_amount,
+                f.f_currency,
+                f.f_exrate,
+                f.f_taxrate,
+                f.f_dc,
+                f.f_billstatus,
+                f.f_statement_no,
+                f.f_accamount,
+                f.f_accamount_date,
+                f.f_stlamount_no,
+                f.f_stlamount,
+                f.f_stlamount_date,
+                f.f_invnos,
+                f.f_invamount,
+                f.f_askamount,
+                f.f_chargedate,
+                f.f_status,
+                f.remark,
+                f.f_mblno,
+                f.f_product_name,
+                f.src_bill_no,
+                f.f_billing_days,
+                f.f_inventory_days,
+                f.f_marks,
+                f.f_billing_deadline,
+                f.f_originalbilldate,
+                c.f_id AS fId,
+                c.f_name AS fName
+            FROM
+                t_warehousebillsfees AS f
+                LEFT JOIN t_corps AS c ON f.f_corpid = c.f_id
+            ) w ON w.f_pid = t.f_id
+            LEFT JOIN t_fees f ON w.f_feeid = f.f_id
         <where>
             <if test="map.tWareHouseFees.fCorpid != null  and map.tWareHouseFees.fCorpid != ''">and t.f_corpid = #{map.tWareHouseFees.fCorpid} </if>
             <if test="map.tWareHouseFees.fToCorpid != null  and map.tWareHouseFees.fToCorpid != ''">and w.f_corpid = #{map.tWareHouseFees.fToCorpid} </if>
@@ -272,63 +287,77 @@
 
     <select id="warehouseBillsFeesListAccamount" resultType="java.util.Map">
         SELECT
-        w.f_id AS  fSrcid,
-        t.f_id AS  fSrcpid,
-        t.f_corpid AS fCorpid,
-        c.f_name AS fName,
-        w.fId AS fId,
-        w.fName AS fFeesName,
-        t.f_bscorpno AS fBscorpno,
-        w.f_mblno AS fMblno,
-        w.f_product_name AS fProductName,
-        t.f_bsdate AS fBsdate,
-        t.f_billtype AS fBilltype,
-        t.f_review_date AS fReviewDate,
-        w.f_feeid AS fFeeid,
-        f.f_name AS fFeeName,
-        w.f_dc AS fSrcdc,
-        ifnull(w.f_amount, 0) - ifnull(w.f_accamount, 0) AS fAmtdr,
-        ifnull(w.f_amount, 0) - ifnull(w.f_accamount, 0) AS fAmt
-        FROM
-        t_warehousebills t
-        LEFT JOIN t_corps c ON c.f_id = t.f_corpid
-        LEFT JOIN (
-        SELECT
-        f.f_id AS f_id,
-        f.f_pid AS f_pid,
-        f.f_lineno AS f_lineno,
-        f.f_corpid,
-        f.f_feeid,
-        f.f_feeUnitid,
-        f.f_qty,
-        f.f_unitprice,
-        f.f_amount,
-        f.f_currency,
-        f.f_exrate,
-        f.f_taxrate,
-        f.f_dc,
-        f.f_billstatus,
-        f.f_statement_no,
-        f.f_accamount,
-        f.f_accamount_date,
-        f.f_stlamount_no,
-        f.f_stlamount,
-        f.f_stlamount_date,
-        f.f_invnos,
-        f.f_invamount,
-        f.f_askamount,
-        f.f_status,
-        f.remark,
-        f.f_mblno,
-        f.f_product_name,
-        f.f_marks,
-        c.f_id AS fId,
-        c.f_name AS fName
+            w.f_id AS fSrcid,
+            t.f_id AS fSrcpid,
+            t.f_corpid AS fCorpid,
+            c.f_name AS fName,
+            w.fId AS fId,
+            w.fName AS fFeesName,
+            t.f_bscorpno AS fBscorpno,
+            w.f_mblno AS fMblno,
+            w.f_product_name AS fProductName,
+            t.f_bsdate AS fBsdate,
+            t.f_billtype AS fBilltype,
+            t.f_review_date AS fReviewDate,
+            w.f_marks AS fMarks,
+            w.f_feeid AS fFeeid,
+            w.f_billtype AS fBilltype,
+            w.f_chargedate AS fChargedate,
+            w.f_originalbilldate AS fOriginalbilldate,
+            w.f_billing_deadline AS fBillingDeadline,
+            w.f_billing_days AS fBillingDays,
+            w.f_inventory_days AS fInventoryDays,
+            f.f_name AS fFeeName,
+            w.f_dc AS fSrcdc,
+            ifnull( w.f_amount, 0 ) - ifnull( w.f_accamount, 0 ) AS fAmtdr,
+            ifnull( w.f_amount, 0 ) - ifnull( w.f_accamount, 0 ) AS fAmt
         FROM
-        t_warehousebillsfees AS f
-        LEFT JOIN t_corps AS c ON f.f_corpid = c.f_id
-        ) w ON w.f_pid = t.f_id
-        LEFT JOIN t_fees f ON w.f_feeid = f.f_id
+            t_warehousebills t
+            LEFT JOIN t_corps c ON c.f_id = t.f_corpid
+            LEFT JOIN (
+                SELECT
+                    f.f_id AS f_id,
+                    f.f_pid AS f_pid,
+                    f.f_lineno AS f_lineno,
+                    f.f_corpid,
+                    f.f_feeid,
+                    f.f_feeUnitid,
+                    f.f_qty,
+                    f.f_unitprice,
+                    f.f_amount,
+                    f.f_currency,
+                    f.f_exrate,
+                    f.f_taxrate,
+                    f.f_dc,
+                    f.f_billstatus,
+                    f.f_statement_no,
+                    f.f_accamount,
+                    f.f_accamount_date,
+                    f.f_stlamount_no,
+                    f.f_stlamount,
+                    f.f_stlamount_date,
+                    f.f_invnos,
+                    f.f_invamount,
+                    f.f_askamount,
+                    f.f_status,
+                    f.remark,
+                    f.f_inventory_days,
+                    f.f_billing_days,
+                    f.f_billing_deadline,
+                    f.f_originalbilldate,
+                    f.f_mblno,
+                    f.f_product_name,
+                    f.f_chargedate,
+                    f.src_bill_no,
+                    f.f_billtype,
+                    f.f_marks,
+                    c.f_id AS fId,
+                    c.f_name AS fName
+                FROM
+                    t_warehousebillsfees AS f
+                    LEFT JOIN t_corps AS c ON f.f_corpid = c.f_id
+                ) w ON w.f_pid = t.f_id
+            LEFT JOIN t_fees f ON w.f_feeid = f.f_id
         <where>
             <if test="map.tWareHouseFees.fCorpid != null  and map.tWareHouseFees.fCorpid != ''">and t.f_corpid = #{map.tWareHouseFees.fCorpid} </if>
             <if test="map.tWareHouseFees.fToCorpid != null  and map.tWareHouseFees.fToCorpid != ''">and w.f_corpid = #{map.tWareHouseFees.fToCorpid} </if>