From a080d67b9964cd632f52c481c0f20ef2e3e7073a Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 10:19:07 +0800
Subject: [PATCH] 放开权限

---
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
index 60ed594..4722333 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
@@ -166,7 +166,7 @@
         /*瀹氫箟宸ュ巶涓哄崡閫� */
         String plantCode="FORTUNA";
         /*瀹氫箟涓诲崟绫诲瀷涓洪挘閲戜富鍗�*/
-        String mainOrderType = "閽i噾涓讳欢";
+        String mainOrderType = "0";
         /*鐢熸垚鏂版壒娆″彿*/
         String batchNum= requireBatchService.getNewBatchNumber();
         /*鑾峰彇閽i噾涓诲崟淇℃伅*/
@@ -203,7 +203,7 @@
         /*鏋勫缓闇�姹備俊鎭�*/
         ApsPlateStandardRequire require = new ApsPlateStandardRequire();
         require.setId(IdUtil.getSnowflakeNextId());
-        require.setRequireId(plan.getId());
+        require.setRequireTrackId(plan.getId());
         require.setBatchNumber(batchNum);
         require.setDocNum(plan.getDocumentNumber());
         require.setOrgCode(plant);
@@ -246,7 +246,7 @@
                     afterStockAmount = remainderStock.subtract(deductionAmount);
                     require.setNetRequirement(BigDecimal.ZERO);
                 }
-                bomStockDetailService.saveStorageAndDetail(storage, plan, bomLine, batchNum, deductionAmount, afterStockAmount,require.getId().toString());
+                bomStockDetailService.saveStorageAndDetail(storage, plan, bomLine, batchNum, deductionAmount, afterStockAmount,require.getId());
             }
         }
 
@@ -277,10 +277,10 @@
         require.setStartDate(startDay);
 
         /*璁$畻鏄惁鏈夐闄�*/
-        require.setHasDelayRisk("鏃犻闄�");
+        require.setHasDelayRisk("0");
         Date dateZero = getDateZero(DateUtils.getNowDate());
         if (startDay.before(dateZero)) {
-            require.setHasDelayRisk("鏈夐闄�");
+            require.setHasDelayRisk("1");
         }
 
         /*鐢熶骇鍩哄湴*/
@@ -291,17 +291,18 @@
         if (require.getNetRequirement().compareTo(BigDecimal.ZERO) > 0) {
             require.setMatchState("寰呭尮閰�");
             require.setMatchMode("宸ュ崟鍖归厤");
+            /*浣跨敤瀛愪欢宸ュ崟杩涜闇�姹傚尮閰�*/
+            matchRequireAndSubPlan(require);
         }
-        /*浣跨敤瀛愪欢宸ュ崟杩涜闇�姹傚尮閰�*/
-        matchRequireAndSubPlan(require);
-
         allRequires.add(require);
-        /*褰撳墠Bom鑺傜偣澶勭悊瀹屾垚鍚庯紝澶勭悊涓嬬骇BOM*/
-        List<ApsBom> bomLineList = bomLineService.selectApsBomLineList(plant, itemNumber);
-        if (!bomLineList.isEmpty()) {
-            bomLineList.forEach(line -> {
-                getBomRequires(plant, line, batchNum, require.getStartDate(), plan, allRequires, level + 1);
-            });
+        if (require.getNetRequirement().compareTo(BigDecimal.ZERO) > 0) {
+            /*褰撳墠Bom鑺傜偣澶勭悊瀹屾垚鍚庯紝澶勭悊涓嬬骇BOM*/
+            List<ApsBom> bomLineList = bomLineService.selectApsBomLineList(plant, itemNumber);
+            if (!bomLineList.isEmpty()) {
+                bomLineList.forEach(line -> {
+                    getBomRequires(plant, line, batchNum, require.getStartDate(), plan, allRequires, level + 1);
+                });
+            }
         }
     }
     /**

--
Gitblit v1.9.3