From b0877a3275ed5bc96fb80f84949904e149946cf2 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 29 四月 2026 19:37:51 +0800
Subject: [PATCH] 将erp下发直接生成任务改成先生成订单再出库
---
src/main/java/com/zy/asrs/controller/OpenController.java | 121 +++++++++++++++++++++++++--------------
1 files changed, 77 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4b27f33..3031070 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -526,35 +526,43 @@
/**
* 7.11 鍑哄簱閫氱煡鍗曪紙浼犻�掓湁搴忔棤搴忚鍒欙級銆�
*
- * stationId <= 600锛氭部鐢ㄥ師瀹炴椂浠诲姟妯″紡锛屾帴鍙ｆ牎楠岄�氳繃鍚庣洿鎺ョ敓鎴� WrkMast/WrkDetl銆�
- * stationId > 600锛氳繘鍏モ�滃厛寤哄嚭搴撹鍗曘�佸悗缁畾鏃剁敓鎴愪换鍔♀�濈殑寤惰繜妯″紡銆�
+ * ERP 鍑哄簱閫氱煡缁熶竴鍏堣惤鍑哄簱璁㈠崟锛屼笉鍐嶇敱鎺ュ彛绾跨▼鐩存帴鍒涘缓 WrkMast/WrkDetl銆�
*
- * 寤惰繜妯″紡鐨勫叧閿偣锛�
+ * 鍏抽敭瑙勫垯锛�
* 1. orderId 浣滀负鍑哄簱璁㈠崟鍙疯惤鍒� man_order_pakout.order_no銆�
- * 2. entryWmsCode 浣滀负杩涗粨缂栧彿淇濆瓨鍒拌鍗曟槑缁嗭紝鍚庣画鐢熸垚浠诲姟鏃跺己鍒朵綔涓� WrkMast.batchSeq銆�
- * 3. 寤哄崟闃舵鍙牎楠屽簱瀛樺拰婊″簱浣嶏紝涓嶉攣搴撲綅銆佷笉鏀� loc_sts锛岄伩鍏嶆彁鍓嶅崰鐢ㄨ澶囦换鍔¤祫婧愩��
+ * 2. stationId > 600 鏃跺繀椤讳紶 entryWmsCode锛屽悗缁寜 entryWmsCode 浣滀负杩涗粨缂栧彿鍒嗘壒鐢熸垚浠诲姟銆�
+ * 3. stationId <= 600 鏃跺厑璁� entryWmsCode 涓虹┖锛屽悗缁敓鎴愪换鍔℃椂浣跨敤 orderId 浣滀负鎵规閿��
+ * 4. 寤哄崟闃舵鍙牎楠屽簱瀛樺拰婊″簱浣嶏紝涓嶉攣搴撲綅銆佷笉鏀� loc_sts锛岀湡姝ｅ崰搴撲粛鐢卞畾鏃剁敓鎴愪换鍔℃椂澶勭悊銆�
+ *
+ * 涓轰粈涔堣繖閲屼笉鍐嶇洿鎺ヨ皟鐢� outOrderBatch锛�
+ * - 鐩存帴寤� WrkMast 浼氶┈涓婃妸搴撲綅浠� F 鏀逛负 R锛孍RP 閲嶅彂銆佷汉宸ヤ腑姝€�乄CS 鍙栨秷鍚庣殑琛ュ伩閮藉緢闅剧粺涓�銆�
+ * - 鍏堣惤璁㈠崟鏄庣粏鍚庯紝鏈敓鎴愪换鍔＄殑鏄庣粏鍙互鍒犻櫎閲嶄笅鍙戯紱宸茬敓鎴愪换鍔＄殑鏄庣粏鐢卞彇娑堥�昏緫鍥炴粴 work_qty銆�
+ * - 浣庣珯鐐瑰拰楂樼珯鐐硅蛋鍚屼竴鏉¤鍗曢摼璺悗锛宲akoutOrderPause/execute 鎵嶈兘鍚屾椂鎺у埗鈥滄湭鐢熸垚鈥濆拰鈥滃凡鐢熸垚鈥濈殑浠诲姟銆�
*/
@PostMapping("/outOrder")
public synchronized R outOrder(@RequestBody ArrayList<OutTaskParam> params, HttpServletRequest request) {
if (Cools.isEmpty(params)) {
return R.error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
}
- int count = params.size();
log.info("[outOrder] cache: {}", JSON.toJSONString(params));
request.setAttribute("cache", params);
- // stationId <= 600 鐨勫師濮嬪疄鏃跺嚭搴撲换鍔″垎缁勶紝鍚庨潰鐩存帴浼犵粰 outOrderBatch銆�
- Map<String, List<OutTaskParam>> linesByBatchSeq = new LinkedHashMap<>();
- // 缁熶竴鍋氭湁搴�/鏃犲簭鏍￠獙鐨勫垎缁勶細
- // 浣庣珯鐐规寜 orderId + batchSeq锛涢珮绔欑偣鎸� orderId + entryWmsCode銆�
- // 楂樼珯鐐瑰悗缁細鎶� entryWmsCode 杞垚浠诲姟 batchSeq锛屽洜姝よ繖閲屽厛鎸夊悓涓�缁村害鏍￠獙 seq銆�
+
+ // 缁熶竴鍋氭湁搴�/鏃犲簭鏍￠獙鐨勫垎缁勩��
+ //
+ // 娉ㄦ剰锛氳繖閲岀殑鍒嗙粍 key 涓嶆槸 ERP 鍘熷 batchSeq锛岃�屾槸鈥滄湭鏉ョ敓鎴� WrkMast.batchSeq 鐨勫�尖�濄��
+ // 杩欐牱鍙互鍦ㄦ帴鍙ｅ叆鍙ｅ氨鏍￠獙鏈�缁堜换鍔℃壒娆￠噷鐨� seq 鏄惁杩炵画锛岄伩鍏嶈鍗曞凡缁忚惤搴撳悗瀹氭椂鍣ㄦ墠澶辫触銆�
+ //
+ // 鎵规閿鍒欙細
+ // - 楂樼珯鐐规寜 orderId + entryWmsCode锛�
+ // - 浣庣珯鐐规寜 orderId + orderId銆�
Map<String, List<OutTaskParam>> linesByValidateKey = new LinkedHashMap<>();
- // stationId > 600 鐨勫弬鏁板彧寤哄嚭搴撹鍗曪紝瀹氭椂鍣ㄥ啀鎸夎繘浠撶紪鍙烽�愭壒鐢熸垚浠诲姟銆�
- List<OutTaskParam> pendingOrderParams = new ArrayList<>();
for (OutTaskParam outTaskParam : params) {
if (Cools.isEmpty(outTaskParam) || Cools.isEmpty(outTaskParam.getOrderId())) {
return R.error("鍑哄簱鍗曞彿涓嶈兘涓虹┖");
}
if (Cools.isEmpty(outTaskParam.getBatchSeq())) {
+ // batchSeq 浠嶄繚瀛� ERP 瀛楁锛涙湭浼犳椂鐢� orderId 琛ラ綈锛屼究浜庢槑缁嗚拷婧��
+ // 浣庣珯鐐圭湡姝ｇ敓鎴愪换鍔℃椂涓嶄娇鐢ㄨ瀛楁浣滀负鎵规閿紝鑰屾槸鍥哄畾浣跨敤 orderId銆�
outTaskParam.setBatchSeq(outTaskParam.getOrderId());
}
if (Cools.isEmpty(outTaskParam.getStationId())) {
@@ -569,24 +577,26 @@
if (stationId > 600) {
// 楂樼珯鐐逛换鍔″繀椤诲甫杩涗粨缂栧彿锛涜繖鏄畾鏃剁敓鎴愪换鍔℃椂鐨勬壒娆¤竟鐣岋紝
// 涔熸槸 OutboundBatchSeqReleaseGuard 鍒ゆ柇鑳藉惁鏀捐涓嬩竴杩涗粨缂栧彿鐨勪緷鎹��
+ // 浣庣珯鐐逛笉鍋氳闄愬埗锛屼綆绔欑偣娌℃湁杩涗粨缂栧彿鏃朵細缁熶竴浣跨敤 orderId 浣滀负鎵规閿��
if (Cools.isEmpty(outTaskParam.getEntryWmsCode())) {
return R.error("鎵樼洏銆�" + outTaskParam.getPalletId() + "銆嶈繘浠撶紪鍙蜂笉鑳戒负绌�");
}
- pendingOrderParams.add(outTaskParam);
- linesByValidateKey.computeIfAbsent(outTaskParam.getOrderId() + "#" + outTaskParam.getEntryWmsCode(), k -> new ArrayList<>()).add(outTaskParam);
- } else {
- linesByBatchSeq.computeIfAbsent(outTaskParam.getBatchSeq(), k -> new ArrayList<>()).add(outTaskParam);
- linesByValidateKey.computeIfAbsent(buildOutOrderBatchKey(outTaskParam), k -> new ArrayList<>()).add(outTaskParam);
}
+ linesByValidateKey.computeIfAbsent(buildOutOrderValidateKey(outTaskParam), k -> new ArrayList<>()).add(outTaskParam);
}
- // 浠嶄繚鐣欏師鎺ュ彛鐨勬湁搴�/鏃犲簭瑙勫垯銆傞珮绔欑偣铏界劧鏆備笉鐢熸垚浠诲姟锛屼篃瑕佸湪寤哄崟鍓嶄繚璇�
- // 鍚屼竴杩涗粨缂栧彿鍐呯殑鏄庣粏椤哄簭鍚堟硶锛屽惁鍒欏悗缁畾鏃剁敓鎴愪换鍔℃椂鎵嶅け璐ヤ細鏇撮毦杩芥函銆�
+ // 浠嶄繚鐣欏師鎺ュ彛鐨勬湁搴�/鏃犲簭瑙勫垯锛�
+ // - seq=0 琛ㄧず鏃犲簭锛屽悓鎵规鎵�鏈夋槑缁嗛兘蹇呴』涓� 0锛�
+ // - seq>0 琛ㄧず鏈夊簭锛屽悓鎵规蹇呴』浠� 1 寮�濮嬭繛缁紱
+ // - seq=0 鍜� seq>0 涓嶈兘娣风敤銆�
+ //
+ // 鎵�鏈夋槑缁嗚櫧鐒舵殏涓嶇敓鎴愪换鍔★紝涔熻鍦ㄥ缓鍗曞墠淇濊瘉鍚屼竴浠诲姟鎵规鍐呯殑鏄庣粏椤哄簭鍚堟硶锛�
+ // 鍚﹀垯鍚庣画瀹氭椂鐢熸垚浠诲姟鏃舵墠澶辫触浼氭洿闅捐拷婧埌 ERP 鍘熷璇锋眰銆�
for (Map.Entry<String, List<OutTaskParam>> entry : linesByValidateKey.entrySet()) {
List<OutTaskParam> lines = entry.getValue();
OutTaskParam head = lines.get(0);
String oid = head.getOrderId();
- String batchSeq = isPendingOutOrderStation(head.getStationId()) ? head.getEntryWmsCode() : head.getBatchSeq();
+ String batchSeq = resolveOutOrderTaskBatchKey(head);
boolean hasZero = false;
boolean hasPositive = false;
List<Integer> orderedSeqs = new ArrayList<>(lines.size());
@@ -651,8 +661,11 @@
// }
// }
- // 寤惰繜寤哄崟妯″紡涔熷繀椤荤‘璁ゆ墭鐩樻湁搴撳瓨涓斿綋鍓嶅簱浣嶄负婊″簱浣嶃��
- // 杩欓噷鍙仛鍑嗗叆鏍￠獙锛屼笉鍦� controller 灞傛彁鍓嶉攣搴撲綅锛涚湡姝ｉ攣搴撲綅浠嶇敱鍚庣画 outOrderBatch 鐢熸垚浠诲姟鏃跺鐞嗐��
+ // 璁㈠崟鍖栧悗浠嶅繀椤荤‘璁ゆ墭鐩樻湁搴撳瓨涓斿綋鍓嶅簱浣嶄负婊″簱浣嶃��
+ //
+ // 杩欓噷鍙仛鍑嗗叆鏍￠獙锛屼笉鍦� controller 灞傛彁鍓嶉攣搴撲綅锛�
+ // - 濡傛灉杩欓噷鎻愬墠鏀� loc_sts锛屼細閫犳垚鈥滆鍗曟湭鎵ц浣嗗簱瀛樺凡琚崰鐢ㄢ�濓紱
+ // - 鐪熸閿佸簱浣嶅繀椤诲拰 WrkMast/WrkDetl 鍒涘缓鍦ㄥ悓涓�涓簨鍔￠噷瀹屾垚锛屾墍浠ヤ粛鐢� outOrderBatch 澶勭悊銆�
List<OutTaskParam> missingStock = Lists.newArrayList();
List<OutTaskParam> missingLoc = Lists.newArrayList();
for (OutTaskParam outTaskParam : groupedParams) {
@@ -682,25 +695,11 @@
}
return R.error("娌℃湁鎵惧埌鎵樼洏鐮佸搴斿簱浣嶏細" + String.join("锛�", badPalletIds)).add(missingLoc);
}
- // 娣峰悎璇锋眰涓嬪厛鍒涘缓楂樼珯鐐瑰嚭搴撹鍗曪紝鍐嶅垱寤轰綆绔欑偣瀹炴椂浠诲姟銆�
- // 杩欐牱鍚屼竴涓� orderId 鍚屾椂鍖呭惈楂樸�佷綆绔欑偣鏃讹紝楂樼珯鐐瑰缓鍗曚笉浼氳浣庣珯鐐瑰垰鐢熸垚鐨勪换鍔¤鍒や负鈥滃凡鏈変换鍔♀�濄��
- R orderResult = R.ok();
- if (!pendingOrderParams.isEmpty()) {
- orderResult = openService.outOrderCreatePakoutOrder(pendingOrderParams);
- }
- R directResult = R.ok();
- if (!linesByBatchSeq.isEmpty()) {
- directResult = openService.outOrderBatch(linesByBatchSeq, count - pendingOrderParams.size());
- }
- if (!linesByBatchSeq.isEmpty() && !pendingOrderParams.isEmpty()) {
- Map<String, Object> result = new LinkedHashMap<>();
- result.put("directTaskCount", count - pendingOrderParams.size());
- result.put("pendingOrderCount", pendingOrderParams.size());
- result.put("directResult", directResult);
- result.put("orderResult", orderResult);
- return R.ok().add(result);
- }
- return pendingOrderParams.isEmpty() ? directResult : orderResult;
+ // ERP /outOrder 榛樿鍒涘缓鍙墽琛岃鍗曪細
+ // - status=1锛氬畾鏃跺櫒鍏佽鎵弿骞剁敓鎴愪换鍔★紱
+ // - 鐢熸垚浠诲姟鍚庢湇鍔″眰浼氱珛鍗虫妸 wrk_sts=11 鐨勪换鍔＄疆涓� pdcType=Y锛�
+ // - 鍥犳 ERP 渚т粛淇濇寔鈥滈�氱煡鍚庤嚜鍔ㄥ嚭搴撯�濈殑浣撻獙锛屽彧鏄换鍔＄敓鎴愪粠鎺ュ彛绾跨▼杞Щ鍒颁簡璁㈠崟璋冨害閾捐矾銆�
+ return openService.outOrderCreatePakoutOrder(groupedParams, true);
}
/**
@@ -748,8 +747,42 @@
return openService.pakoutOrderPause(param);
}
- private String buildOutOrderBatchKey(OutTaskParam param) {
- return param.getOrderId() + "#" + param.getBatchSeq();
+ /**
+ * 鍏紑鎵ц鎺ュ彛銆�
+ *
+ * IoT/MQTT 绛夐潪 ERP 鍏ュ彛浼氬厛鍒涘缓 status=0 鐨勫嚭搴撹鍗曪紝鍙湁璋冪敤璇ユ帴鍙ｅ悗鎵嶅厑璁哥敓鎴愪换鍔″拰涓嬪彂銆�
+ * 璇ユ帴鍙ｅ彧鏀寔 execute=1锛涗腑姝粛璧� /order/pakout/pause/default/v1 鐨� execute=2銆�
+ */
+ @PostMapping("/order/pakout/execute/default/v1")
+ public synchronized R pakoutOrderExecute(@RequestBody OpenOrderPakoutExecuteParam param, HttpServletRequest request) {
+ if (request != null) {
+ log.info("[pakoutOrderExecute] cache: {}", param == null ? "null" : JSON.toJSONString(param));
+ request.setAttribute("cache", param);
+ }
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getOrderId())) {
+ return R.error("orderNo is empty");
+ }
+ return openService.pakoutOrderExecute(param);
+ }
+
+ private String buildOutOrderValidateKey(OutTaskParam param) {
+ return param.getOrderId() + "#" + resolveOutOrderTaskBatchKey(param);
+ }
+
+ /**
+ * 璁＄畻 /outOrder 鍏ュ彛鐨勬渶缁堜换鍔℃壒娆￠敭銆�
+ *
+ * 杩欎釜鍊煎繀椤诲拰 OpenServiceImpl.resolvePakoutTaskBatchSeq 淇濇寔涓�鑷达細
+ * - 楂樼珯鐐癸細entryWmsCode锛�
+ * - 浣庣珯鐐癸細orderId銆�
+ *
+ * 鍏ュ彛鏍￠獙鍜屽悗缁敓鎴愪换鍔′娇鐢ㄥ悓涓�鍙ｅ緞锛屾墠鑳戒繚璇� seq 鏍￠獙銆佹壒娆″畧鍗拰 WCS 涓嬪彂鎵规涓�鑷淬��
+ */
+ private String resolveOutOrderTaskBatchKey(OutTaskParam param) {
+ if (param != null && isPendingOutOrderStation(param.getStationId()) && !Cools.isEmpty(param.getEntryWmsCode())) {
+ return param.getEntryWmsCode();
+ }
+ return param == null ? null : param.getOrderId();
}
private boolean isPendingOutOrderStation(String stationId) {
--
Gitblit v1.9.1