Jelajahi Sumber

2022年9月19日18:14:49

纪新园 2 tahun lalu
induk
melakukan
3f83cd70f9

+ 13 - 3
ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditPathsServiceImpl.java

@@ -370,9 +370,9 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                     }
                     if (auditItems.getActId() >= 110 && auditItems.getActId() <= 160) {
                         if ("T".equals(at.getIffinalItem())) {
-                            if (auditItems.getFidStatus() != null && !"warehouse_status".equals(auditItems.getFidStatus())){
+                            if (auditItems.getFidStatus() != null && !"warehouse_status".equals(auditItems.getFidStatus())) {
                                 fettle = 6L;
-                            }else {
+                            } else {
                                 fettle = 4L;
                             }
 
@@ -703,8 +703,17 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
             }
         }
 
+        TWarehousebillsfees tWarehousebillsfees = new TWarehousebillsfees();
+        tWarehousebillsfees.setfPid(auditItems.getBillId());
+        List<TWarehousebillsfees> tWarehousebillsfees1 = tWarehousebillsfeesMapper.selectWarehousebillsfeesByPId(auditItems.getBillId());
+        for (TWarehousebillsfees t : tWarehousebillsfees1) {
+            t.setfReviewDate(auditItems.getAuditItem());
+            tWarehousebillsfeesMapper.updateTWarehousebillsfees(t);
+        }
+
         TWarehouseBills warehouseBills = new TWarehouseBills();
         warehouseBills.setfId(auditItems.getBillId());
+        warehouseBills.setfReviewDate(auditItems.getAuditItem());
         calculationWarehouseService.calculationFeeStatus(warehouseBills);
         tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
 
@@ -1251,6 +1260,7 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
 
         TWarehouseBills warehouseBills = new TWarehouseBills();
         warehouseBills.setfId(auditItems.getBillId());
+        warehouseBills.setfReviewDate(null);
         calculationWarehouseService.calculationFeeStatus(warehouseBills);
         tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
 
@@ -1345,7 +1355,7 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
         List<Map<String, Object>> balanceList = new ArrayList<>();
 
         for (Map<String, Object> map : mapList) {
-            if (ObjectUtils.isNotNull(map.get("fPlanqty"))){
+            if (ObjectUtils.isNotNull(map.get("fPlanqty"))) {
                 //计算出库总件数
                 fQty = Long.parseLong(map.get("fPlanqty").toString()) + fQty;
             }