场地直装请核流程、箱型箱量显示完善

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInAndOutStockController.java

@@ -359,4 +359,28 @@ public class TWarehouseInAndOutStockController extends BaseController {
         return itWarehouseBillsService.addDetails(fId, billsType,loginUser);
     }
 
+    /**
+     * 根据id更新费用审核状态
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/feeReview")
+    @RepeatSubmit
+    public AjaxResult feeReviewSubmit(@RequestParam("id") Long id) {
+        return itWarehouseBillsService.feeReviewSubmit(id);
+    }
+
+    /**
+     * 根据id撤销已费用审核状态
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/revokefeeReview")
+    @RepeatSubmit
+    public AjaxResult revokefeeReview(@RequestParam("id") Long id) {
+        return itWarehouseBillsService.revokefeeReview(id);
+    }
+
 }

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

@@ -630,6 +630,17 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                             fettle = 5L;
                         }
                         //业务处理
+                    } else if (auditItems.getActId() == 190) {
+                        if ("T".equals(at.getIffinalItem())) {
+                            fettle = 6L;
+                        } else if ("F".equals(at.getIffinalItem())) {
+                            fettle = 5L;
+                        }
+                        TWarehouseBills tWarehouseBills = new TWarehouseBills();
+                        tWarehouseBills.setfId(auditItems.getBillId());
+                        tWarehouseBills.setfBillstatus(fettle);
+                        tWarehouseBillsMapper.updateKaHeOrder(tWarehouseBills);
+                        tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle, auditItems.getAuditItem());
                     } else if (Objects.equals(auditItems.getActId(), WarehouseActIdEnum.FEE_CHANGES.getActId().longValue())) {
                         // 费用变更审核通过处理
                         if ("T".equals(at.getIffinalItem())) {
@@ -824,6 +835,13 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
         } else if (auditItems.getActId() == 181) {
             fettle = 3L;
             //业务处理
+        } else if (auditItems.getActId() == 190) {
+            fettle = 3L;
+            TWarehouseBills tWarehouseBills = new TWarehouseBills();
+            tWarehouseBills.setfId(auditItems.getBillId());
+            tWarehouseBills.setfBillstatus(fettle);
+            tWarehouseBillsMapper.updateKaHeOrder(tWarehouseBills);
+            tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle, auditItems.getAuditItem());
         } else if (Objects.equals(auditItems.getActId(), WarehouseActIdEnum.FEE_CHANGES.getActId().longValue())) {
             warehousebillsModifyService.additionalFeeInformation(auditItems.getBillId(), WarehouseTypeEnum.DISMISS);
         }
@@ -1066,6 +1084,13 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
         } else if (auditItems.getActId() == 181) {
             fettle = 2L;
             //业务处理
+        } else if (auditItems.getActId() == 190) {
+            fettle = 2L;
+            TWarehouseBills tWarehouseBills = new TWarehouseBills();
+            tWarehouseBills.setfId(auditItems.getBillId());
+            tWarehouseBills.setfBillstatus(fettle);
+            tWarehouseBillsMapper.updateKaHeOrder(tWarehouseBills);
+            tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle, auditItems.getAuditItem());
         } else if (Objects.equals(auditItems.getActId(), WarehouseActIdEnum.FEE_CHANGES.getActId().longValue())) {
             warehousebillsModifyService.withdrawalApprovalById(auditItems.getBillId());
         }

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

@@ -431,25 +431,21 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             List<Map<String, Object>> billsList = tWarehouseBillsMapper.selectWarehouseBusinessList(tWarehousebills);
 
             for (Map<String, Object> billsMap : billsList) {
-                // 查询仓库明细从表数据
-                TWarehousebillsitems tWarehousebillsitems = new TWarehousebillsitems();
-                tWarehousebillsitems.setfPid(Long.parseLong(billsMap.get("fId").toString()));
-                List<Map<String, Object>> itemsList = tWarehousebillsitemsMapper.selectGoodsTransferitemsList(tWarehousebillsitems);
+                // 查询箱型、箱量表
+                TWarehousebillsCntr cntr = new TWarehousebillsCntr();
+                cntr.setfPid(Long.parseLong(billsMap.get("fId").toString()));
+                List<TWarehousebillsCntr> cntrList = tWarehousebillsCntrMapper.selectTWarehousebillsCntrList(cntr);
 
                 // 创建map统计箱型箱量
-                Map<String, Integer> countMap = new HashMap<>();
-                for (Map<String, Object> itemsMap : itemsList) {
-                    String fCntrtype = (String) itemsMap.get("fCntrtype");
-                    Integer fCntqty = (Integer) itemsMap.get("fCntqty");
-                    if (StringUtils.isNotNull(fCntrtype) && StringUtils.isNotNull(fCntqty)) {
-                        // fCntrtype是编号，根据编号查询名称
-                        TCntr tCntr = tCntrMapper.selectTCntrById(Long.parseLong(fCntrtype));
-                        String fName = tCntr.getfName();
-
-                        if (countMap.containsKey(fName)) {
-                            countMap.put(fName, countMap.get(fName) + fCntqty);
+                Map<String, Long> countMap = new HashMap<>();
+                for (TWarehousebillsCntr temp : cntrList) {
+                    String cntrName = temp.getCntrName();
+                    Long fCntrcount = temp.getfCntrcount();
+                    if (StringUtils.isNotNull(cntrName) && StringUtils.isNotNull(fCntrcount)) {
+                        if (countMap.containsKey(cntrName)) {
+                            countMap.put(cntrName, countMap.get(cntrName) + fCntrcount);
                         } else {
-                            countMap.put(fName, fCntqty);
+                            countMap.put(cntrName, fCntrcount);
                         }
                     }
                 }