仓库出库新增仓储费计算

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

@@ -439,7 +439,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         TWhgenleg tWhgenleg = new TWhgenleg();
         if ("SJRK".equals(warehouseBills.getfBilltype())) {
             tWhgenleg.setfOriginalbilldate(warehousebillsitems.getfBsdate());
-            tWhgenleg.setfCustomno(warehouseBills.getfCustomno());
+            if (StringUtils.isNotEmpty(warehouseBills.getfCustomno())){
+                tWhgenleg.setfCustomno(warehouseBills.getfCustomno());
+            }
             if (StringUtils.isNotEmpty(warehouseBills.getRemark())){
                 tWhgenleg.setRemark(warehouseBills.getRemark());
             }
@@ -2960,13 +2962,16 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     return AjaxResult.error("仓库明细第"+i+"行未找到箱号");
                 }
                 TWhgenleg tWhgenle = queryTWhgenleg(tWarehouseBills, item, goods.getIfCntrno());
-                if (StringUtils.isNotNull(tWhgenle)) {
-                    if ("SJRK".equals(billsType)){
+                //复制报关单号和备注
+                if ("SJRK".equals(billsType)){
+                    if (StringUtils.isNotEmpty(tWarehouseBills.getfCustomno())){
                         item.setfCustomno(tWarehouseBills.getfCustomno());
-                        if (StringUtils.isNotEmpty(tWarehouseBills.getRemark())){
-                            item.setRemark(tWarehouseBills.getRemark());
-                        }
                     }
+                    if (StringUtils.isNotEmpty(tWarehouseBills.getRemark())){
+                        item.setRemark(tWarehouseBills.getRemark());
+                    }
+                }
+                if (StringUtils.isNotNull(tWhgenle)) {
                     int i1 = updateTWhgenlegData(item, tWhgenle.getfId(), billsType);
                     if (i1 <= 0) {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -3878,7 +3883,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         if (CollectionUtils.isEmpty(tWarehouseBillsList)){
             return AjaxResult.error("请输入筛选条件,再计算仓储费");
         }
-        List<Map<String,Object>> list = new ArrayList<>();
+        List<TWarehousebillsfees> list = new ArrayList<>();
         for (TWarehouseBills tWarehouseBills : tWarehouseBillsList) {
             if (StringUtils.isNull(tWarehouseBills.getfCorpid())) {
                 return AjaxResult.error("请选择客户信息");
@@ -3909,7 +3914,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             // 计划物资明细
             List<TWarehousebillsfees> itemsList = new ArrayList<>();
             BigDecimal bigDecimal = new BigDecimal(0);
-            Map<String, Object> map = new HashMap<>();
+            /*Map<String, Object> map = new HashMap<>();*/
             // 库存总账id
             long whgenlegFeeId = 0;
             // 计费单位
@@ -3945,10 +3950,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             if (itemsList.size() <= 0) {
                 return AjaxResult.error("未找到合适的库存明细");
             }
-            map.put("feesList", feesList);
+            /*map.put("feesList", feesList);
             map.put("warehouseBills", tWarehouseBills);
-            map.put("warehouseItemList", itemsList);
-            list.add(map);
+            map.put("warehouseItemList", itemsList);*/
+            list.addAll(itemsList);
         }
         return AjaxResult.success(list);
     }

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

@@ -246,7 +246,8 @@
                 f_volumnD = f_volumnD + #{map.warehousebillsitems.fVolumn},
                 f_netweightD = f_netweightD + #{map.warehousebillsitems.fNetweight},
                 f_grossweightD = f_grossweightD + #{map.warehousebillsitems.fGrossweight},
-                f_qtyblc = f_qtyblc + #{map.warehousebillsitems.fQty}
+                f_qtyblc = f_qtyblc + #{map.warehousebillsitems.fQty},
+                f_chargedate = #{map.warehousebillsitems.fChargedate}
                 <if test="map.warehousebillsitems.fCustomno != null  and map.warehousebillsitems.fCustomno != ''">
                     ,f_customno = #{map.warehousebillsitems.fCustomno}
                 </if>

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

@@ -467,6 +467,7 @@
             and item.f_chargedate <= #{warehouse.fBillingDeadline}
             <if test="warehouse.fGoodsid != null">and item.f_goodsid = #{warehouse.fGoodsid}</if>
             <if test="warehouse.fMblno != null">and ware.f_mblno = #{warehouse.fMblno}</if>
+            <if test="warehouse.fId != null">and item.f_id = #{warehouse.fId}</if>
         </where>
     </select>
     <select id="warehousebillsitemsWarehouselocidSize" resultType="java.lang.Integer">