From a657efd0e2b95ea386317ac8931c5d85f4173b19 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 11 三月 2026 13:42:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java | 8 ++------
1 files changed, 2 insertions(+), 6 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..de0d155 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
@@ -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);
}
--
Gitblit v1.9.1