From 87e99cdcfa55ee1a3b19a19506b05e4f554a416e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 07 五月 2026 19:34:12 +0800
Subject: [PATCH] 修复订单明细中没有batchSeq
---
src/main/java/com/zy/asrs/controller/OpenController.java | 130 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 113 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index f20724b..3031070 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -524,35 +524,79 @@
}
/**
- * 7.11 鍑哄簱閫氱煡鍗曪紙浼犻�掓湁搴忔棤搴忚鍒欙級
+ * 7.11 鍑哄簱閫氱煡鍗曪紙浼犻�掓湁搴忔棤搴忚鍒欙級銆�
+ *
+ * ERP 鍑哄簱閫氱煡缁熶竴鍏堣惤鍑哄簱璁㈠崟锛屼笉鍐嶇敱鎺ュ彛绾跨▼鐩存帴鍒涘缓 WrkMast/WrkDetl銆�
+ *
+ * 鍏抽敭瑙勫垯锛�
+ * 1. orderId 浣滀负鍑哄簱璁㈠崟鍙疯惤鍒� man_order_pakout.order_no銆�
+ * 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) {
- int count = params.size();
if (Cools.isEmpty(params)) {
return R.error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
}
log.info("[outOrder] cache: {}", JSON.toJSONString(params));
request.setAttribute("cache", params);
- Map<String, List<OutTaskParam>> linesByBatchSeq = new LinkedHashMap<>();
+
+ // 缁熶竴鍋氭湁搴�/鏃犲簭鏍￠獙鐨勫垎缁勩��
+ //
+ // 娉ㄦ剰锛氳繖閲岀殑鍒嗙粍 key 涓嶆槸 ERP 鍘熷 batchSeq锛岃�屾槸鈥滄湭鏉ョ敓鎴� WrkMast.batchSeq 鐨勫�尖�濄��
+ // 杩欐牱鍙互鍦ㄦ帴鍙ｅ叆鍙ｅ氨鏍￠獙鏈�缁堜换鍔℃壒娆￠噷鐨� seq 鏄惁杩炵画锛岄伩鍏嶈鍗曞凡缁忚惤搴撳悗瀹氭椂鍣ㄦ墠澶辫触銆�
+ //
+ // 鎵规閿鍒欙細
+ // - 楂樼珯鐐规寜 orderId + entryWmsCode锛�
+ // - 浣庣珯鐐规寜 orderId + orderId銆�
+ Map<String, List<OutTaskParam>> linesByValidateKey = new LinkedHashMap<>();
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())) {
return R.error("鎵樼洏銆�" + outTaskParam.getPalletId() + "銆嶅嚭搴撳彛缂栫爜涓嶈兘涓虹┖");
}
- linesByBatchSeq.computeIfAbsent(outTaskParam.getBatchSeq(), k -> new ArrayList<>()).add(outTaskParam);
+ Integer stationId;
+ try {
+ stationId = Integer.valueOf(outTaskParam.getStationId());
+ } catch (NumberFormatException ex) {
+ return R.error("鎵樼洏銆�" + outTaskParam.getPalletId() + "銆嶅嚭搴撳彛缂栫爜鏍煎紡閿欒锛�" + outTaskParam.getStationId());
+ }
+ if (stationId > 600) {
+ // 楂樼珯鐐逛换鍔″繀椤诲甫杩涗粨缂栧彿锛涜繖鏄畾鏃剁敓鎴愪换鍔℃椂鐨勬壒娆¤竟鐣岋紝
+ // 涔熸槸 OutboundBatchSeqReleaseGuard 鍒ゆ柇鑳藉惁鏀捐涓嬩竴杩涗粨缂栧彿鐨勪緷鎹��
+ // 浣庣珯鐐逛笉鍋氳闄愬埗锛屼綆绔欑偣娌℃湁杩涗粨缂栧彿鏃朵細缁熶竴浣跨敤 orderId 浣滀负鎵规閿��
+ if (Cools.isEmpty(outTaskParam.getEntryWmsCode())) {
+ return R.error("鎵樼洏銆�" + outTaskParam.getPalletId() + "銆嶈繘浠撶紪鍙蜂笉鑳戒负绌�");
+ }
+ }
+ linesByValidateKey.computeIfAbsent(buildOutOrderValidateKey(outTaskParam), k -> new ArrayList<>()).add(outTaskParam);
}
- for (Map.Entry<String, List<OutTaskParam>> entry : linesByBatchSeq.entrySet()) {
+ // 浠嶄繚鐣欏師鎺ュ彛鐨勬湁搴�/鏃犲簭瑙勫垯锛�
+ // - 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 = head.getBatchSeq();
+ String batchSeq = resolveOutOrderTaskBatchKey(head);
boolean hasZero = false;
boolean hasPositive = false;
List<Integer> orderedSeqs = new ArrayList<>(lines.size());
@@ -583,8 +627,9 @@
}
}
+ // 閲嶆柊鎸夋牎楠屽垎缁勯『搴忓睍寮�锛屼繚璇侀噸澶嶆墭鐩樸�佸簱瀛樸�佸簱浣嶆牎楠屼笌涓婇潰鐨勬壒娆℃牎楠岀湅鍒板悓涓�鎵规暟鎹��
List<OutTaskParam> groupedParams = new ArrayList<>(params.size());
- for (List<OutTaskParam> lines : linesByBatchSeq.values()) {
+ for (List<OutTaskParam> lines : linesByValidateKey.values()) {
groupedParams.addAll(lines);
}
@@ -616,6 +661,11 @@
// }
// }
+ // 璁㈠崟鍖栧悗浠嶅繀椤荤‘璁ゆ墭鐩樻湁搴撳瓨涓斿綋鍓嶅簱浣嶄负婊″簱浣嶃��
+ //
+ // 杩欓噷鍙仛鍑嗗叆鏍￠獙锛屼笉鍦� controller 灞傛彁鍓嶉攣搴撲綅锛�
+ // - 濡傛灉杩欓噷鎻愬墠鏀� loc_sts锛屼細閫犳垚鈥滆鍗曟湭鎵ц浣嗗簱瀛樺凡琚崰鐢ㄢ�濓紱
+ // - 鐪熸閿佸簱浣嶅繀椤诲拰 WrkMast/WrkDetl 鍒涘缓鍦ㄥ悓涓�涓簨鍔￠噷瀹屾垚锛屾墍浠ヤ粛鐢� outOrderBatch 澶勭悊銆�
List<OutTaskParam> missingStock = Lists.newArrayList();
List<OutTaskParam> missingLoc = Lists.newArrayList();
for (OutTaskParam outTaskParam : groupedParams) {
@@ -645,8 +695,11 @@
}
return R.error("娌℃湁鎵惧埌鎵樼洏鐮佸搴斿簱浣嶏細" + String.join("锛�", badPalletIds)).add(missingLoc);
}
-
- return openService.outOrderBatch(linesByBatchSeq,count);
+ // ERP /outOrder 榛樿鍒涘缓鍙墽琛岃鍗曪細
+ // - status=1锛氬畾鏃跺櫒鍏佽鎵弿骞剁敓鎴愪换鍔★紱
+ // - 鐢熸垚浠诲姟鍚庢湇鍔″眰浼氱珛鍗虫妸 wrk_sts=11 鐨勪换鍔＄疆涓� pdcType=Y锛�
+ // - 鍥犳 ERP 渚т粛淇濇寔鈥滈�氱煡鍚庤嚜鍔ㄥ嚭搴撯�濈殑浣撻獙锛屽彧鏄换鍔＄敓鎴愪粠鎺ュ彛绾跨▼杞Щ鍒颁簡璁㈠崟璋冨害閾捐矾銆�
+ return openService.outOrderCreatePakoutOrder(groupedParams, true);
}
/**
@@ -694,8 +747,50 @@
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) {
+ try {
+ return Integer.valueOf(stationId) > 600;
+ } catch (Exception ignored) {
+ return false;
+ }
}
/**
@@ -736,8 +831,8 @@
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
- calendar.add(Calendar.DATE, -12);
- for(int i=0;i<12;i++) {
+ calendar.add(Calendar.DATE, -7);
+ for(int i=0;i<7;i++) {
boolean flag = true;
calendar.add(Calendar.DATE, 1);
String str = sf.format(calendar.getTime());
@@ -790,8 +885,8 @@
ArrayList<Number> data4 = new ArrayList<Number>();
SimpleDateFormat sfCube = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendarCube = Calendar.getInstance();
- calendarCube.add(Calendar.DATE, -12);
- for (int i = 0; i < 12; i++) {
+ calendarCube.add(Calendar.DATE, -7);
+ for (int i = 0; i < 7; i++) {
calendarCube.add(Calendar.DATE, 1);
String str = sfCube.format(calendarCube.getTime());
WorkCubeTotalAxis cubeAxis = cubeMap.get(str);
@@ -986,6 +1081,7 @@
Integer sum = 0;
if (ioType != null && ioType < 100) {
supp = String.valueOf(resolveInboundSupp(wrkMast));
+ map.put("supp", supp);
}else {
String[] split = wrkDetls.get(0).getSupp().split("/");
if (split != null && split.length > 0) {
@@ -994,9 +1090,9 @@
sum = Integer.valueOf(wrkDetls.get(0).getSupp());
}
List<WrkMast> userNo = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", wrkMast.getUserNo()).in("wrk_sts",11,12,21,22,25));
- suppCount = sum - userNo.size()+1;
+ suppCount = sum - userNo.size();
+ map.put("supp", suppCount + "/" + sum);
}
- map.put("supp", suppCount + "/" + sum);
//鑰楁椂
Long costTime = resolveCostTime(wrkMast);
--
Gitblit v1.9.1