From 2ce6327ec49e7fe73cc1cd3bcc2b63b28d89d38f Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 17 三月 2026 14:05:25 +0800
Subject: [PATCH] #

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java
index 20d1c94..5879f50 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java
@@ -25,7 +25,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Date;
@@ -61,7 +61,8 @@
         try {
             WkOrder order = new WkOrder();
             String orderNo = params.getString("orderNo");
-            order.setCode(orderNo).setPoCode(orderNo).setType(OrderType.ORDER_Pre.type)
+            boolean out = params.getBoolean("out");
+            order.setCode(orderNo).setPoCode(orderNo).setType(out?OrderType.ORDER_PRE.type:OrderType.ORDER_PRE_NOT_OUT.type)
 //                    .setWkType(OrderWorkType.ORDER_WORK_TYPE_MATERIAL_PREPARATION.type)
                     .setCreateBy(getLoginUserId())
                     .setUpdateBy(getLoginUserId());
@@ -86,11 +87,6 @@
                     qty = item.getDouble("anfme");
                 }
                 map.put("anfme", qty);
-//                map.put("unit", item.getString("unit"));
-//                map.put("splrCode", item.getString("splrCode"));
-//                map.put("splrName", item.getString("splrName"));
-//                map.put("splrBatch", item.getString("splrBatch"));
-//                map.put("platItemId", item.getString("platItemId"));
                 items.add(map);
             }
 
@@ -166,3 +162,4 @@
     }
 
 }
+

--
Gitblit v1.9.1