调整仓储费计算 结果

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

@@ -179,9 +179,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 }
                 if (StringUtils.isNotNull(wb.get("fWarehouselocid"))) {
                     Long fWarehouselocid = Long.valueOf(String.valueOf(wb.get("fWarehouselocid")));
-                    Long fTransferWarehouselocid = Long.valueOf(String.valueOf(wb.get("fTransferWarehouselocid")));
+                    if (wb.get("fTransferWarehouselocid") != null) {
+                        Long fTransferWarehouselocid = Long.valueOf(String.valueOf(wb.get("fTransferWarehouselocid")));
+                        warehouseAreaId.add(fTransferWarehouselocid);
+                    }
                     warehouseAreaId.add(fWarehouselocid);
-                    warehouseAreaId.add(fTransferWarehouselocid);
                 }
             }
             map.put("warehouseBillsItem", mapList);
@@ -749,11 +751,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         warehousebillsitems.setfPid(fPid);
         List<TWarehousebillsitems> warehousebillsitemsList = tWarehousebillsitemsMapper.selectTWarehousebillsitemsList(warehousebillsitems);
         for (TWarehousebillsitems wareItem : warehousebillsitemsList) {
-            int returnParameter = 0;
             if ("KCZZ".equals(wareItem.getfBilltype())) {
                 TWhgenleg tWhgenleg = tWhgenlegMapper.selectTWhgenlegById(wareItem.getfSrcid());
                 tWhgenleg.setfChargedate(wareItem.getfBillingDeadline());
-                returnParameter = tWhgenlegMapper.updateTWhgenleg(tWhgenleg);
+                tWhgenlegMapper.updateTWhgenleg(tWhgenleg);
             } else {
                 TWarehousebillsitems tWarehousebillsitems = tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(wareItem.getfSrcid());
                 tWarehousebillsitems.setfAmt(wareItem.getfAmt());
@@ -762,11 +763,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 tWarehousebillsitems.setfChargedate(wareItem.getfBillingDeadline());
                 tWarehousebillsitems.setfInventoryDays(wareItem.getfInventoryDays());
                 tWarehousebillsitems.setfBillingDeadline(wareItem.getfBillingDeadline());
-                returnParameter = tWarehousebillsitemsMapper.updateTWarehousebillsitems(tWarehousebillsitems);
-            }
-            if (returnParameter <= 0) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return AjaxResult.error("仓储费计算通过失败，更新明细状态失败，请联系管理员");
+                tWarehousebillsitemsMapper.updateTWarehousebillsitems(tWarehousebillsitems);
             }
         }
         int itemUpdateResult = tWarehousebillsitemsMapper.warehouseItemFollowUpdate(fPid, fettle);