From aa2079db3fd0fa968210980f7c0fda7c9acb83e4 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 11 三月 2026 13:26:33 +0800
Subject: [PATCH] #备货单是否需要出库
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java | 14 --------------
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java | 19 -------------------
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java | 8 ++------
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrder.java | 5 +++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java | 3 ++-
5 files changed, 9 insertions(+), 40 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java
index 325814a..7ed83fc 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java
@@ -46,20 +46,6 @@
if (Objects.isNull(objParams)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
-// // 杩斿洖妯℃嫙鏁版嵁
-// if (SIMULATED_DATA_ENABLE.equals("1")) {
-// JSONArray params = paramsFormat(objParams);
-// List<MatPreparationOrder> orders = JSON.parseArray(params.toJSONString(), MatPreparationOrder.class);
-// JSONArray array = ERPController.map;
-// for (int i = 0; i < ERPController.map.size(); i++) {
-// JSONObject obj = array.getJSONObject(i);
-// obj.put("orderNo", orders.get(0).getOrderNo());
-// obj.put("matNr", orders.get(0).getOrderItems().get(0).getMatNr());
-// }
-// ERPController.map = array;
-//
-// return CommonResponse.ok();
-// }
JSONArray params = paramsFormat(objParams);
List<MatPreparationOrder> orders = JSON.parseArray(params.toJSONString(), MatPreparationOrder.class);
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrder.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrder.java
index f99e288..d857df2 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrder.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrder.java
@@ -25,6 +25,11 @@
// 澶囨枡绫诲瀷锛屼负澶囨枡鍗曟椂鏈夛紝1 姝ｅ父棰嗘枡锛�2 鐢熶骇琛ユ枡锛�
@JsonProperty("prepareType")
private Integer prepareType;
+
+ // 鏄惁闇�瑕佸嚭搴�
+ @JsonProperty("out")
+ private Boolean out;
+
// 澶囨枡璇︽儏
private List<MatPreparationOrderItem> orderItems;
}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java
index 66e82c7..ab1644b 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java
@@ -310,25 +310,6 @@
headers.add("Content-Type", "application/json");
headers.add("api-version", "v2.0");
-// List<Map<String, Object>> maps = new ArrayList<>();
-// Map<String, Object> mapParams = new HashMap<>();
-////// mapParams.put("orderNo", params.getOrderNo());
-////// mapParams.put("anfme", params.getAnfme());
-////// mapParams.put("type", params.getType());
-////// mapParams.put("wkType", params.getWkType());
-////// mapParams.put("exceStatus", params.getExceStatus());
-////// mapParams.put("orderItems", params.getOrderItems());
-////// maps.add(mapParams);
-////
-//// JSONObject params = JSONObject.parseObject(JSON.toJSONString(order));
-//// JSONObject mappedData = ParamsMapUtils.apiMaps("mes", "orderId", params);
-//// mappedData.put("updateBy", "mes");
-//// mapParams = objectToMap(mappedData);
-//// maps.add(mapParams);
-// log.info("淇敼璁㈠崟淇℃伅鍙婄姸鎬侊細 {}锛� 璇锋眰鍙傛暟锛� {}", wmsUrl, JSONArray.toJSONString(order));
-// HttpEntity<List<Map<String, Object>>> httpEntity = new HttpEntity<>(maps, headers);
-//// ArrayList<Order> orders = new ArrayList<>();
-//// orders.add(order);
HttpEntity httpEntity = new HttpEntity<>(order, headers);
// mes/callMaterial
ResponseEntity<String> exchange = restTemplate.exchange(wmsUrl, HttpMethod.POST, httpEntity, String.class);//cs
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);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java
index f72e9c7..2a76053 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java
@@ -14,7 +14,8 @@
ORDER_TRANSFER("transfer", "璋冩嫈鍗�"),
ORDER_REVISE("revise", "搴撳瓨璋冩暣"),
ORDER_CHECK("check", "鐩樼偣鍗�"),
- ORDER_Pre("pre","澶囪揣鍗�");
+ ORDER_PRE("pre","澶囪揣鍗�,鍑哄簱"),
+ ORDER_PRE_NOT_OUT("preNot","澶囪揣鍗曪紝涓嶅嚭");
OrderType(String type, String desc) {
--
Gitblit v1.9.1