2022年11月9日17:28:41

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -724,7 +724,21 @@ public class TFeeServiceImpl implements ITFeeService {
         } else {
             tWareHouseFees.setfBstimeExamine(tWareHouseFees.getTimeExamine());
         }
-        return tFeeMapper.selectFinancialLedgerList(tWareHouseFees);
+        List<FeeVO> list = tFeeMapper.selectFinancialLedgerList(tWareHouseFees);
+        for (FeeVO feeVO:list) {
+            FeeDTO feeDTO = new FeeDTO();
+            feeDTO.setFDc("D");
+            feeDTO.setFCorpId(feeVO.getfCorpid());
+            List<FeeVO> feeVOList = tFeeMapper.selectFinancialLedgerDetails(feeDTO);
+            // 应收费用
+            BigDecimal amount = feeVOList.stream().map(FeeVO::getFAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
+            // 已收费用
+            BigDecimal stlamount = feeVOList.stream().map(FeeVO::getFStlamount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
+            feeVO.setFAmount(amount);
+            feeVO.setNnfinished(amount.subtract(stlamount));
+            feeVO.setFStlamount(stlamount);
+        }
+        return list;
     }
 
     @Override

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

@@ -180,9 +180,11 @@ public interface TWarehousebillsfeesMapper extends BaseMapper<TWarehousebillsfee
      */
     List<Map<String, Object>> selectBillDetailsSubItemNew(TWarehousebillsfees tWarehousebillsfees);
 
-    List<Map<String, Object>> selectFeesBymblnoAndFname(@Param("fMblno") String fMblno,@Param("fCorpid") Long fCorpid,@Param("fDc") String fDc);
+    List<Map<String, Object>> selectFeesBymblnoAndFname(@Param("fMblno") String fMblno,@Param("fCorpid") Long fCorpid,@Param("fDc") String fDc, @Param("fBsdateList")List<String> fBsdateList,@Param("fReviewDateList")List<String> fReviewDateList);
 
     List<Long> getCorpid(@Param("fIds") List<Long> fIds);
 
     List<Map<String, Object>> selectTWarehousebillsfeesList1(TWarehousebillsfees tWarehousebillsfees);
+
+    void updateByPid(@Param("fId")Long fId, @Param("fChargedate")Date fChargedate);
 }

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

@@ -321,6 +321,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         List<Map<String, Object>> mapList = tWarehousebillsitemsMapper.selectGoodsTransferitemsList(tWarehousebillsitems);
         if (StringUtils.isNotEmpty(mapList)) {
             for (Map<String, Object> wb : mapList) {
+                    List<TWarehousebillsfees> tWarehousebillsfees = tWarehousebillsfeesMapper.selectWarehousebillsfeesByPId(fId);
+                    if (ObjectUtils.isNotNull(tWarehousebillsfees) && tWarehousebillsfees.size()>0){
+//                        List<Date> fAccbilldate = tWarehousebillsfees.stream().map(TWarehousebillsfees::getFInvoicingDate).distinct().collect(Collectors.toList());
+                        String invoiceNo = tWarehousebillsfees.stream().map(TWarehousebillsfees::getfInvnos).distinct().collect(Collectors.joining(","));
+//                        wb.put("fAccbilldate",String.join(",", (CharSequence) fAccbilldate));
+                        wb.put("invoiceNo",invoiceNo);
+                    }
                 /*TWhgenleg tWhgenleg = new TWhgenleg();
                 tWhgenleg.setfCorpid(tWarehousebills.getfCorpid());
                 if (StringUtils.isNotNull(wb.get("fGoodsid"))) {
@@ -5837,6 +5844,14 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             item.setSrcBillNo(tWarehousebills.getfBillno());
             item.setfPid(fPid);
             item.setfBillstatus(tWarehousebills.getfBillstatus());
+
+            //修改（同步业务时间为截止时间）   2022年11月9日16:09:52
+            if ("KCZZ".equals(item.getfBilltype()) && ObjectUtils.isNotNull(item.getfBillingDeadline())){
+                item.setfBsdate(item.getfBillingDeadline());
+            }else{
+                return AjaxResult.error("仓储费截止日期不能为空");
+            }
+
             tWarehousebillsfeesMapper.insertTWarehousebillsfees(item);
         }
         if (StringUtils.isNotNull(warehouseFees) && !"[]".equals(warehouseFees)) {
@@ -6434,6 +6449,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     return true;
                 }
                 dateChanged = warehouseBills.getfDateChanged();
+                if (ObjectUtils.isNotNull(warehouseBills.getfChargedate())){
+                    tWarehousebillsfeesMapper.updateByPid(sysCheckCode.getfId(),warehouseBills.getfChargedate());
+                }
                 break;
             case "freight":
                 // 查询运价维护业务

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

@@ -244,6 +244,9 @@ public class TWarehousebillsfeesServiceImpl implements ITWarehousebillsfeesServi
             return AjaxResult.error("无数据，导出Excel失败");
         }
 
+        List<String> fBsdateList = tWarehousebillsfees.getfBsdateList();
+        List<String> fReviewDateList = tWarehousebillsfees.getfBsdateList();
+
         int index = 1;
         for (Map<String, Object> map : list) {
             // 根据 提单号+客户id+收付状态，获取费用数据
@@ -251,7 +254,7 @@ public class TWarehousebillsfeesServiceImpl implements ITWarehousebillsfeesServi
             Long fCorpid = Long.valueOf(map.get("fCorpid").toString());
             String fDc = StringUtils.objToStr(map.get("fDc"));
             // 改为直接查询
-            List<Map<String, Object>> fees = tWarehousebillsfeesMapper.selectFeesBymblnoAndFname(fMblno, fCorpid, fDc);
+            List<Map<String, Object>> fees = tWarehousebillsfeesMapper.selectFeesBymblnoAndFname(fMblno, fCorpid, fDc,fBsdateList,fReviewDateList);
             // 初始化金额
             BigDecimal allAmount = BigDecimal.ZERO;
             Map<Integer, String> feeMap = new HashMap<>();
@@ -301,11 +304,20 @@ public class TWarehousebillsfeesServiceImpl implements ITWarehousebillsfeesServi
                     // 体积
                     cellValue = StringUtils.objToStr(map.get("fVolumn"));
                 } else if (i == 9) {
-                    // 入库时间
-                    cellValue = StringUtils.objToStr(map.get("fOriginalbilldate"));
+                    if ("入库".equals(StringUtils.objToStr(map.get("fBilltype")))){
+                        // 入库时间
+                        cellValue = StringUtils.objToStr(map.get("fBsdate"));
+                    }else{
+//                        cellValue = StringUtils.objToStr(map.get("fOriginalbilldate"));
+                        cellValue = "";
+                    }
                 } else if (i == 10) {
-                    // 出库时间
-                    cellValue = StringUtils.objToStr(map.get("fBsdate"));
+                    if ("出库".equals(StringUtils.objToStr(map.get("fBilltype")))){
+                        // 出库时间
+                        cellValue = StringUtils.objToStr(map.get("fBsdate"));
+                    }else{
+                        cellValue = "";
+                    }
                 } else if (i == 11) {
                     // 计费天数
                     cellValue = StringUtils.objToStr(map.get("fBillingdays"));

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

@@ -686,6 +686,11 @@
         </where>
     </select>
 
+
+    <!--
+    LEFT JOIN t_warehousebillsitems wt on wt.f_marks = leg.f_marks
+     AND leg.f_mblno = wt.f_mblno
+     -->
     <select id="selectInventoryList" parameterType="TWhgenleg" resultType="Map">
         select
             DISTINCT
@@ -727,7 +732,6 @@
             leg.f_cntrno AS fCntrno
         FROM
             t_whgenleg leg
-            LEFT JOIN t_warehousebillsitems wt on wt.f_marks = leg.f_marks
             left join sys_user u on leg.create_by = u.user_name
             left join sys_dept d on u.dept_id = d.dept_id
             LEFT JOIN t_corps corp ON corp.f_id = leg.f_corpid
@@ -745,7 +749,6 @@
             AND leg.f_qtyblc &gt; 0
             AND leg.f_grossweightblc &gt; 0
             AND leg.f_netweightblc &gt; 0
-            AND leg.f_mblno = wt.f_mblno
             <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>

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

@@ -572,6 +572,9 @@
         </trim>
         where f_id = #{map.tFeeDo.fSrcid}
     </update>
+    <update id="updateByPid">
+        update t_warehousebillsfees set f_chargedate = #{fChargedate} where f_pid = #{fId}
+    </update>
 
     <select id="selectFeesByPId" parameterType="Long" resultMap="TWarehousebillsfeesResult">
         SELECT
@@ -939,7 +942,7 @@
         SELECT
         tc.f_name AS corpName,
         tf.f_mblno AS fMblno,
-        IF(tf.f_billtype = 'SJRK' || tf.f_billtype = 'SJCK' || tf.f_billtype = 'CKDB' || tf.f_billtype = 'HQZY',tf.f_bsdate, null) AS fBsdate,
+        IF(tf.f_billtype = 'SJRK' || tf.f_billtype = 'SJCK' || tf.f_billtype = 'CKDB' || tf.f_billtype = 'HQZY' || tf.f_billtype = 'KCZZ',tf.f_bsdate, null) AS fBsdate,
         tf.f_review_date AS fReviewDate,
         te.f_name AS feeName,
         tf.f_dc AS fDc,
@@ -1114,6 +1117,18 @@
             <if test="fMblno != null  and fMblno != ''">and twf.f_mblno = #{fMblno}</if>
             <if test="fCorpid != null  and fCorpid != ''">and twf.f_corpid = #{fCorpid}</if>
             <if test="fDc != null  and fDc != ''">and twf.f_dc = #{fDc}</if>
+            <if test='fBsdateList != null and fBsdateList[0] != null and fBsdateList[0]!= ""'>
+                and twf.f_bsdate &gt;= #{fBsdateList[0]}
+            </if>
+            <if test='fBsdateList != null and fBsdateList[1] != null and fBsdateList[1]!= ""'>
+                and twf.f_bsdate &lt;= #{fBsdateList[1]}
+            </if>
+            <if test='fReviewDateList != null and fReviewDateList[0] != null and fReviewDateList[0]!= ""'>
+                and twf.f_review_date &gt;= #{fReviewDateList[0]}
+            </if>
+            <if test='fReviewDateList != null and fReviewDateList[1] != null and fReviewDateList[1]!= ""'>
+                and twf.f_review_date &lt;= #{fReviewDateList[1]}
+            </if>
         </where>
         GROUP BY
             feeName

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

@@ -248,9 +248,9 @@
             item.f_cartype_id AS fCartypeId,
             item.f_dc AS fDc,
             item.create_time AS createTime,
-            tf.f_invoicing_date  AS fAccbilldate,
-            tf.f_invnos AS invoiceNo,
-            tf.f_invamount AS fApplyMoney
+             null tf.f_invoicing_date  AS fAccbilldate,
+            '' AS invoiceNo,
+            sum(tf.f_invamount) AS fApplyMoney
         FROM
             t_warehousebills w
             LEFT JOIN t_warehousebillsitems item ON item.f_pid = w.f_id