From ec919eee24e4f96e0a199c376d1f3991cdc2580b Mon Sep 17 00:00:00 2001
From: panxinyu-YUYwp <youremail@example.com>
Date: Thu, 23 Jul 2026 15:24:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=8A=A0=E5=B7=A5=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8D=95=E4=BF=AE=E6=94=B9=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6x/2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProductionPlanServiceImpl.java       | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/longchuang/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/xujie/sys/modules/longchuang/service/impl/ProductionPlanServiceImpl.java
index eb4a770..e9972f6 100644
--- a/src/main/java/com/xujie/sys/modules/longchuang/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/longchuang/service/impl/ProductionPlanServiceImpl.java
@@ -52,7 +52,8 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
 
     private static final String STATUS_PLAN = "已排产";
     private static final String STATUS_PROCESSING = "进行中";
-    private static final String STATUS_DONE = "已完成"; ////1
+    private static final String STATUS_DONE = "已完成";
+    /// /1
     private static final String NODE_STATUS_NOT_START = "未开始";
     private static final String NODE_STATUS_PROCESSING = "进行中";
     private static final String NODE_STATUS_DONE = "已完成";
@@ -584,10 +585,18 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
             nodeList.add(buildNode("pack", "打包", 5));
             return nodeList;
         }
-        nodeList.add(buildNode("stocking", "仓库配料", 1));
-        nodeList.add(buildNode("assy", "组装", 2));
-        nodeList.add(buildNode("inspect", "检验", 3));
-        nodeList.add(buildNode("pack", "打包", 4));
+        if (ORDER_TYPE_RENOVATION.equals(orderType)) {
+            nodeList.add(buildNode("stocking", "仓库配料", 1));
+            nodeList.add(buildNode("assy", "组装", 2));
+            nodeList.add(buildNode("inspect", "检验", 3));
+            nodeList.add(buildNode("pack", "打包", 4));
+            return nodeList;
+        }
+        if (ORDER_TYPE_MACHINING.equals(orderType)) {
+            nodeList.add(buildNode("assy", "机加工生产", 1));
+            nodeList.add(buildNode("inspect", "机加工检验", 2));
+            return nodeList;
+        }
         return nodeList;
     }
 
@@ -736,18 +745,18 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
             return null;
         }
         if (ORDER_TYPE_MACHINING.equals(orderType)) {
-            if ("stocking".equals(nodeCode)) {
-                return "LC_MACHINING_STOCKING";
-            }
+            //if ("stocking".equals(nodeCode)) {
+            //    return "LC_MACHINING_STOCKING";
+            //}
             if ("assy".equals(nodeCode)) {
                 return "LC_MACHINING_ASSY";
             }
             if ("inspect".equals(nodeCode)) {
                 return "LC_MACHINING_INSPECT";
             }
-            if ("pack".equals(nodeCode)) {
-                return "LC_MACHINING_PACK";
-            }
+            //if ("pack".equals(nodeCode)) {
+            //    return "LC_MACHINING_PACK";
+            //}
             return null;
         }
         return null;