From 3971255dadf007563d83d887e8c2ef465242fc87 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 28 四月 2026 22:03:31 +0800
Subject: [PATCH] 双伸出库改成订单出库
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 5 +
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 60 ++++++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 179 ++++++++++++++++++++++++++++-------
3 files changed, 207 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 818b2be..1614a15 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -687,6 +687,11 @@
}
WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getSuperTaskNo()));
if (Objects.isNull(mast)) {
+ // pakoutOrderPause 涓鏃讹紝WMS 鍦� WCS 纭鍙栨秷鍚庝細绔嬪嵆鏈湴鍙栨秷骞跺綊妗ｄ换鍔°��
+ // 濡傛灉 WCS 鍚庣画鍙堣ˉ鍙� task_cancel 鍥炶皟锛屾鏃跺綋鍓嶅伐浣滄。宸蹭笉瀛樺湪锛屾寜骞傜瓑鎴愬姛澶勭悊銆�
+ if ("task".equalsIgnoreCase(params.getNotifyType()) && "task_cancel".equalsIgnoreCase(params.getMsgType())) {
+ return R.ok();
+ }
throw new CoolException("浠诲姟妗ｄ笉瀛樺湪锛侊紒");
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 9a001d8..9b92f1f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -465,7 +465,7 @@
}
if (Objects.equals(param.getExecute(), 2)) {
// execute=2 鍏堝叧闂鍗曞紑鍏筹紝闃绘瀹氭椂鍣ㄧ户缁负鏈敓鎴愪换鍔＄殑鏄庣粏寤� WrkMast銆�
- // 宸茬粡鐢熸垚鐨勪换鍔℃寜鐘舵�佸垎娴侊細11 灏氭湭涓嬪彂锛岃蛋鏈湴鍙栨秷锛�12/13 宸蹭笅鍙戞垨鎵ц涓紝闇�瑕侀�氱煡 WCS 鏆傚仠銆�
+ // 宸茬粡鐢熸垚鐨勪换鍔℃寜鐘舵�佸垎娴侊細11 灏氭湭涓嬪彂锛岃蛋鏈湴鍙栨秷锛�12/13 宸蹭笅鍙戞垨鎵ц涓紝闇�瑕侀�氱煡 WCS 鍙栨秷銆�
Map<String, Object> result = new HashMap<>();
result.put("orderNo", param.getOrderId());
result.put("execute", param.getExecute());
@@ -487,6 +487,7 @@
return R.ok("鍑哄簱璁㈠崟宸蹭腑姝�").add(result);
}
List<HashMap<String,Object>> taskList = new ArrayList<>();
+ List<WrkMast> wcsCancelTasks = new ArrayList<>();
int cancelledLocalTaskCount = 0;
for (WrkMast wrkMast : activeTasks) {
HashMap<String,Object> hashMap = new HashMap<>();
@@ -498,14 +499,23 @@
continue;
}
taskList.add(hashMap);
+ wcsCancelTasks.add(wrkMast);
}
+ int cancelledWcsTaskCount = 0;
if (!taskList.isEmpty()) {
- // wrk_sts=12/13 绛夊凡杩涘叆 WCS 渚х殑浠诲姟蹇呴』鏍￠獙 WCS 杩斿洖锛屽け璐ュ垯浜嬪姟鍥炴粴锛岄伩鍏嶆湰鍦拌鎶ュ凡鏆傚仠銆�
+ // wrk_sts=12/13 绛夊凡杩涘叆 WCS 渚х殑浠诲姟蹇呴』鏍￠獙 WCS 杩斿洖锛屽け璐ュ垯浜嬪姟鍥炴粴锛岄伩鍏嶆湰鍦拌鎶ュ凡鍙栨秷銆�
R wcsR = wcsApiService.pauseOutTasks(taskList);
requireWcsPauseOk(wcsR);
+ // WCS 宸茬‘璁ゅ彇娑堝悗锛屾湰鍦颁篃瑕佸彇娑堜换鍔″苟鍥炴粴璁㈠崟鏄庣粏 work_qty銆�
+ // 鍥炴粴閫昏緫鍦� WorkService.cancelWrkMast 涓粺涓�澶勭悊锛岀‘淇� WCS 鍥炶皟 task_cancel 璧板悓涓�濂楀彛寰勩��
+ for (WrkMast wrkMast : wcsCancelTasks) {
+ workService.cancelWrkMast(wrkMast.getWrkNo()+"", 9955L);
+ cancelledWcsTaskCount++;
+ }
}
result.put("cancelledLocalTaskCount", cancelledLocalTaskCount);
result.put("pausedWcsTaskCount", taskList.size());
+ result.put("cancelledWcsTaskCount", cancelledWcsTaskCount);
return R.ok("鍑哄簱璁㈠崟宸蹭腑姝�").add(result);
}
throw new CoolException("reason浠呮敮鎸�1鎴�2");
@@ -1737,38 +1747,21 @@
Date now = new Date();
int orderCount = 0;
int detailCount = 0;
+ int removedUndispatchedDetailCount = 0;
List<String> orderNos = new ArrayList<>();
for (Map.Entry<String, List<OutTaskParam>> entry : paramsByOrderNo.entrySet()) {
String orderNo = entry.getKey();
- // 寤惰繜寤哄崟鍏佽瑕嗙洊鈥滃皻鏈敓鎴愪换鍔°�佹湭杩涘叆鎵ц鈥濈殑鏃ц鍗曪紱
- // 涓�鏃﹀凡鏈夋椿鍔ㄤ换鍔℃垨鍘嗗彶浠诲姟锛屽垯绂佹瑕嗙洊锛岄伩鍏嶉噸澶嶅嚭搴撳悓涓�璁㈠崟銆�
+ // 寤惰繜寤哄崟鍏佽鍚屼竴涓� orderNo 鍐嶆涓嬪彂锛�
+ // 宸蹭笅鍙�/宸插畬鎴愭槑缁嗕繚鐣欒拷婧紱鏈笅鍙戞槑缁嗗垹闄ゅ悗锛屼娇鐢ㄦ湰娆℃帴鍙ｅ弬鏁伴噸鏂版彃鍏ャ��
assertPendingPakoutOrderCanReplace(orderNo);
OrderPakout order = orderPakoutService.selectByNo(orderNo);
- if (order != null) {
- orderPakoutService.remove(order.getId());
- }
-
- DocType docType = docTypeService.selectOrAdd(OUT_ORDER_PENDING_DOC_TYPE, Boolean.FALSE);
- order = new OrderPakout();
- order.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
- order.setOrderNo(orderNo);
- order.setOrderTime(DateUtils.convert(now));
- order.setDocType(docType.getDocId());
- // settle=1 琛ㄧず寰呯敓鎴愪换鍔★紱鐢熸垚杩囪嚦灏戜竴涓繘浠撶紪鍙锋壒娆″悗缃负 2銆�
- // status=1 鏄惎鍔ㄥ紑鍏筹紝pakoutOrderPause(execute=2) 浼氱疆 0 闃绘瀹氭椂鍣ㄧ户缁敓鎴愩��
- order.setSettle(1L);
- order.setStatus(1);
- order.setCreateBy(9527L);
- order.setCreateTime(now);
- order.setUpdateBy(9527L);
- order.setUpdateTime(now);
- // moveStatus 淇濈暀鐜版湁鈥滃璐�/绉诲簱鈥濊涔夛紝杩欓噷涓嶅鐢ㄥ畠鍋氭殏鍋滃紑鍏炽��
- order.setMoveStatus(0);
- // 2 琛ㄧず鍑哄簱鏂瑰悜锛屽拰 man_order_detl_pakout 鏄庣粏淇濇寔涓�鑷淬��
- order.setPakinPakoutStatus(2);
- if (!orderPakoutService.insert(order)) {
- throw new CoolException("鐢熸垚鍑哄簱璁㈠崟澶辫触锛�" + orderNo);
+ if (order == null) {
+ order = createPendingPakoutOrderHeader(orderNo, now);
+ } else {
+ assertNoNonReplaceablePendingDetailConflict(order, entry.getValue());
+ removedUndispatchedDetailCount += removeUndispatchedPendingDetails(order.getId());
+ refreshPendingPakoutOrderForResubmit(order, now);
}
for (OutTaskParam param : entry.getValue()) {
@@ -1786,6 +1779,7 @@
Map<String, Object> result = new LinkedHashMap<>();
result.put("orderCount", orderCount);
result.put("detailCount", detailCount);
+ result.put("removedUndispatchedDetailCount", removedUndispatchedDetailCount);
result.put("orderNos", orderNos);
return R.ok("鍑哄簱璁㈠崟鐢熸垚鎴愬姛").add(result);
}
@@ -1946,12 +1940,126 @@
}
}
+ private OrderPakout createPendingPakoutOrderHeader(String orderNo, Date now) {
+ DocType docType = docTypeService.selectOrAdd(OUT_ORDER_PENDING_DOC_TYPE, Boolean.FALSE);
+ OrderPakout order = new OrderPakout();
+ order.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
+ order.setOrderNo(orderNo);
+ order.setOrderTime(DateUtils.convert(now));
+ order.setDocType(docType.getDocId());
+ // settle=1 琛ㄧず寰呯敓鎴愪换鍔★紱鐢熸垚杩囪嚦灏戜竴涓繘浠撶紪鍙锋壒娆″悗缃负 2銆�
+ // status=1 鏄惎鍔ㄥ紑鍏筹紝pakoutOrderPause(execute=2) 浼氱疆 0 闃绘瀹氭椂鍣ㄧ户缁敓鎴愩��
+ order.setSettle(1L);
+ order.setStatus(1);
+ order.setCreateBy(9527L);
+ order.setCreateTime(now);
+ order.setUpdateBy(9527L);
+ order.setUpdateTime(now);
+ // moveStatus 淇濈暀鐜版湁鈥滃璐�/绉诲簱鈥濊涔夛紝杩欓噷涓嶅鐢ㄥ畠鍋氭殏鍋滃紑鍏炽��
+ order.setMoveStatus(0);
+ // 2 琛ㄧず鍑哄簱鏂瑰悜锛屽拰 man_order_detl_pakout 鏄庣粏淇濇寔涓�鑷淬��
+ order.setPakinPakoutStatus(2);
+ if (!orderPakoutService.insert(order)) {
+ throw new CoolException("鐢熸垚鍑哄簱璁㈠崟澶辫触锛�" + orderNo);
+ }
+ return order;
+ }
+
+ private void refreshPendingPakoutOrderForResubmit(OrderPakout order, Date now) {
+ if (order == null) {
+ return;
+ }
+ boolean hasDispatchedDetail = hasDispatchedPendingDetail(order.getId());
+ order.setStatus(1);
+ order.setSettle(hasDispatchedDetail ? 2L : 1L);
+ order.setUpdateBy(9527L);
+ order.setUpdateTime(now);
+ order.setPakinPakoutStatus(2);
+ if (!orderPakoutService.updateById(order)) {
+ throw new CoolException("鏇存柊鍑哄簱璁㈠崟澶辫触锛�" + order.getOrderNo());
+ }
+ }
+
+ private boolean hasDispatchedPendingDetail(Long orderId) {
+ List<OrderDetlPakout> details = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>()
+ .eq("order_id", orderId)
+ .eq("status", 1));
+ if (Cools.isEmpty(details)) {
+ return false;
+ }
+ for (OrderDetlPakout detail : details) {
+ if (!isUndispatchedPendingDetail(detail)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 鍒犻櫎鍚岃鍗曚腑灏氭湭涓嬪彂鐨勬槑缁嗐��
+ *
+ * 鍒ゆ柇鍙ｅ緞锛�
+ * - work_qty <= 0锛氬皻鏈敓鎴愭湁鏁堜换鍔★紝鎴栦腑姝㈠悗浠诲姟宸茶鍙栨秷骞跺畬鎴愬洖婊氥��
+ * - qty <= 0锛氭病鏈変笟鍔″畬鎴愰噺锛屽垹闄ゅ悗涓嶄細涓㈠け宸插畬鎴愬嚭搴撹褰曘��
+ */
+ private int removeUndispatchedPendingDetails(Long orderId) {
+ List<OrderDetlPakout> details = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>()
+ .eq("order_id", orderId)
+ .eq("status", 1));
+ if (Cools.isEmpty(details)) {
+ return 0;
+ }
+ int removed = 0;
+ for (OrderDetlPakout detail : details) {
+ if (!isUndispatchedPendingDetail(detail)) {
+ continue;
+ }
+ if (!orderDetlPakoutService.deleteById(detail.getId())) {
+ throw new CoolException("鍒犻櫎鏈笅鍙戝嚭搴撹鍗曟槑缁嗗け璐ワ細" + detail.getOrderNo());
+ }
+ removed++;
+ }
+ return removed;
+ }
+
+ private void assertNoNonReplaceablePendingDetailConflict(OrderPakout order, List<OutTaskParam> params) {
+ if (order == null || Cools.isEmpty(params)) {
+ return;
+ }
+ Set<String> newPalletIds = params.stream()
+ .filter(Objects::nonNull)
+ .map(OutTaskParam::getPalletId)
+ .filter(palletId -> !Cools.isEmpty(palletId))
+ .collect(Collectors.toCollection(LinkedHashSet::new));
+ if (newPalletIds.isEmpty()) {
+ return;
+ }
+ List<OrderDetlPakout> details = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>()
+ .eq("order_id", order.getId())
+ .eq("status", 1));
+ if (Cools.isEmpty(details)) {
+ return;
+ }
+ for (OrderDetlPakout detail : details) {
+ if (detail == null || !newPalletIds.contains(detail.getPalletId()) || isUndispatchedPendingDetail(detail)) {
+ continue;
+ }
+ throw new CoolException("鎵樼洏銆�" + detail.getPalletId() + "銆嶅凡瀛樺湪宸蹭笅鍙戞垨宸插畬鎴愬嚭搴撴槑缁嗭紝鏃犳硶瑕嗙洊");
+ }
+ }
+
+ private boolean isUndispatchedPendingDetail(OrderDetlPakout detail) {
+ return detail != null
+ && safeDouble(detail.getWorkQty()) <= 0.0D
+ && safeDouble(detail.getQty()) <= 0.0D;
+ }
+
/**
* 鍒ゆ柇寤惰繜鍑哄簱璁㈠崟鏄惁杩樿兘琚綋鍓嶆帴鍙ｈ姹傝鐩栥��
*
- * 鍏佽瑕嗙洊鐨勮竟鐣屽彧闄愪簬鈥滃凡寤鸿鍗曚絾灏氭湭鐢熸垚浠讳綍浠诲姟鈥濈殑鎯呭喌銆�
- * 鍙 WrkMast 鎴� WrkMastLog 宸插瓨鍦紝灏辫鏄庤鍗曞凡缁忚繘鍏ユ墽琛岄摼璺垨鍘嗗彶閾捐矾锛�
- * 鍐嶈鐩栦細鐮村潖浠诲姟銆佸簱瀛樺拰 ERP 鍥炰紶涔嬮棿鐨勫彲杩芥函鍏崇郴銆�
+ * 娲诲姩浠诲姟浠嶇劧瀛樺湪鏃朵笉鍏佽瑕嗙洊锛屽洜涓轰换鍔°�佸簱浣嶃�乄CS 鎸囦护杩樺湪鎵ц閾捐矾涓娿��
+ * 宸茬粡鍙栨秷骞跺綊妗ｅ埌 WrkMastLog 鐨勪换鍔″厑璁搁噸涓嬪彂锛涘叾璁㈠崟鏄庣粏 work_qty 宸插湪鍙栨秷鏃跺洖婊氾紝
+ * 鏈鎺ュ彛浼氬垹闄ゆ湭涓嬪彂鏄庣粏骞舵彃鍏ユ柊鏄庣粏銆�
*/
private void assertPendingPakoutOrderCanReplace(String orderNo) {
List<WrkMast> activeTasks = findActiveOutboundTasks(orderNo);
@@ -1961,14 +2069,11 @@
int activeWrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
.eq("io_type", 101)
.eq("user_no", orderNo));
- int historyWrkCount = wrkMastLogService.selectCount(new EntityWrapper<WrkMastLog>()
- .eq("io_type", 101)
- .eq("user_no", orderNo));
- if (activeWrkCount > 0 || historyWrkCount > 0) {
- throw new CoolException("鍑哄簱璁㈠崟宸插瓨鍦ㄤ换鍔℃。鎴栦换鍔″巻鍙叉。锛屾棤娉曡鐩栵細" + orderNo);
+ if (activeWrkCount > 0) {
+ throw new CoolException("鍑哄簱璁㈠崟宸插瓨鍦ㄤ换鍔℃。锛屾棤娉曡鐩栵細" + orderNo);
}
OrderPakout order = orderPakoutService.selectByNo(orderNo);
- if (order != null && order.getSettle() != null && order.getSettle() > 1L) {
+ if (order != null && order.getSettle() != null && order.getSettle() > 2L) {
throw new CoolException(orderNo + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 90753e5..9322455 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -76,6 +76,8 @@
@Autowired
private OrderDetlService orderDetlService;
@Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+ @Autowired
private ConfigService configService;
@Autowired
private WcsController wcsController;
@@ -1534,6 +1536,7 @@
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
}
+ rollbackPakoutOrderWorkQty(wrkMast, wrkDetls, userId, now);
for (WrkDetl wrkDetl : wrkDetls) {
// if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
//// if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
@@ -1621,6 +1624,63 @@
}
}
+ /**
+ * 鍑哄簱浠诲姟鍙栨秷鏃跺洖婊氬嚭搴撹鍗曟槑缁嗙殑浠诲姟鐢熸垚鏁伴噺銆�
+ *
+ * 寤惰繜鍑哄簱璁㈠崟涓細
+ * - work_qty 琛ㄧず宸茬粡鐢熸垚浠诲姟鐨勬暟閲忥紱
+ * - qty 琛ㄧず宸茬粡瀹屾垚鍑哄簱鐨勬暟閲忋��
+ *
+ * WCS 鍙栨秷鎴栨湰鍦板彇娑堜换鍔″悗锛屼换鍔′細琚Щ鍏ュ巻鍙叉。骞跺垹闄ゅ綋鍓嶅伐浣滄。銆�
+ * 濡傛灉涓嶅洖婊� work_qty锛屽悗缁悓涓�璁㈠崟鍐嶆涓嬪彂鏃剁郴缁熶細璇涓鸿繖浜涙槑缁嗕粛宸茬敓鎴愪换鍔°��
+ */
+ private void rollbackPakoutOrderWorkQty(WrkMast wrkMast, List<WrkDetl> wrkDetls, Long userId, Date now) {
+ if (wrkMast == null || Cools.isEmpty(wrkDetls)) {
+ return;
+ }
+ for (WrkDetl wrkDetl : wrkDetls) {
+ if (wrkDetl == null || Cools.isEmpty(wrkDetl.getOrderNo())) {
+ continue;
+ }
+ OrderDetlPakout orderDetl = findPakoutOrderDetlForRollback(wrkMast, wrkDetl);
+ if (orderDetl == null) {
+ continue;
+ }
+ double oldWorkQty = safeDouble(orderDetl.getWorkQty());
+ double rollbackQty = safeDouble(wrkDetl.getAnfme());
+ double completedQty = safeDouble(orderDetl.getQty());
+ double newWorkQty = Math.max(completedQty, oldWorkQty - rollbackQty);
+ orderDetl.setWorkQty(newWorkQty);
+ orderDetl.setUpdateBy(userId);
+ orderDetl.setUpdateTime(now);
+ if (!orderDetlPakoutService.updateById(orderDetl)) {
+ throw new CoolException("鍑哄簱浠诲姟鍙栨秷鍥炴粴璁㈠崟鏄庣粏浣滀笟鏁伴噺澶辫触锛�" + wrkDetl.getOrderNo());
+ }
+ }
+ }
+
+ private OrderDetlPakout findPakoutOrderDetlForRollback(WrkMast wrkMast, WrkDetl wrkDetl) {
+ String palletId = null;
+ if (wrkDetl != null && !Cools.isEmpty(wrkDetl.getZpallet())) {
+ palletId = wrkDetl.getZpallet();
+ } else if (wrkMast != null) {
+ palletId = wrkMast.getBarcode();
+ }
+ if (!Cools.isEmpty(palletId)) {
+ OrderDetlPakout orderDetl = orderDetlPakoutService.selectItemByOrderNoAndPallet(wrkDetl.getOrderNo(), palletId);
+ if (orderDetl != null) {
+ return orderDetl;
+ }
+ }
+ return orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(),
+ wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+ }
+
+ private double safeDouble(Double value) {
+ return value == null ? 0.0D : value;
+ }
+
@Override
@Transactional
public void pickWrkMast(String workNo, Long userId) {
--
Gitblit v1.9.1