From 1b31d14e361c01fcd4e5c2dcfe0b6fb3a63c92fc Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 13 三月 2026 14:56:14 +0800
Subject: [PATCH] erp下发停止出库任务，wms取消wcs任务
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 361 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 350 insertions(+), 11 deletions(-)
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 c9f1035..58e8d31 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2,6 +2,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.zy.api.controller.params.StopOutTaskParams;
+import com.zy.api.service.WcsApiService;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.*;
import com.core.exception.CoolException;
@@ -19,6 +21,8 @@
import com.zy.common.constant.ArmConstant;
import com.zy.common.model.DetlDto;
import com.zy.common.model.LocDetlDto;
+import com.zy.common.model.LocDto;
+import com.zy.common.model.TaskDto;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
@@ -31,6 +35,7 @@
import javax.rmi.CORBA.Util;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2022/4/9
@@ -87,6 +92,12 @@
private WaitPakinService waitPakinService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WcsApiService wcsApiService;
+ @Autowired
+ private WorkService workService;
+ @Autowired
+ private BasCrnpService basCrnpService;
@Override
@Transactional
@@ -357,6 +368,328 @@
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
+ }
+ }
+
+ @Override
+ @Transactional
+ public R pakoutOrderPause(OpenOrderPakoutPauseParam param) {
+ if (param == null || Cools.isEmpty(param.getOrderId())) {
+ throw new CoolException("orderNo涓嶈兘涓虹┖");
+ }
+ if (param.getReason() == null) {
+ throw new CoolException("reason涓嶈兘涓虹┖");
+ }
+
+ List<WrkMast> activeTasks = findActiveOutboundTasks(param.getOrderId());
+ if (Objects.equals(param.getReason(), 1)) {
+ // ERP纭绔嬪嵆鎵ц锛屼粎澶勭悊寰呬笅鍙戠殑鍑哄簱浠诲姟銆�
+ List<WrkMast> pendingTasks = activeTasks.stream()
+ .filter(wrkMast -> wrkMast != null && Objects.equals(wrkMast.getWrkSts(), 11L))
+ .collect(Collectors.toList());
+ Map<String, Object> result = new HashMap<>();
+ result.put("orderNo", param.getOrderId());
+ result.put("taskCount", pendingTasks.size());
+ if (pendingTasks.isEmpty()) {
+ result.put("confirmedCount", 0);
+ return R.ok("鏃犳湁鏁堝嚭搴撲换鍔�").add(result);
+ }
+
+ Date now = new Date();
+ int confirmedCount = 0;
+ for (WrkMast wrkMast : pendingTasks) {
+ if (wrkMast == null || "Y".equalsIgnoreCase(wrkMast.getPdcType())) {
+ continue;
+ }
+ wrkMast.setPdcType("Y");
+// wrkMast.setUpdMk("ERP_CONFIRMED");
+// wrkMast.setManuType("ERP_CONFIRM_OUT");
+ wrkMast.setModiTime(now);
+ wrkMast.setModiUser(9527L);
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("纭鎵ц鍑哄簱浠诲姟澶辫触: " + wrkMast.getWrkNo());
+ }
+ confirmedCount++;
+ }
+
+ result.put("confirmedCount", confirmedCount);
+ return R.ok(confirmedCount == 0 ? "浠诲姟宸茬‘璁ゆ墽琛�" : "ERP纭鎵ц鍑哄簱鎴愬姛").add(result);
+ }
+ if (Objects.equals(param.getReason(), 2)) {
+ // ERP璇锋眰鍙栨秷浠诲姟锛氭湭涓嬪彂浠诲姟鐩存帴鏈湴鍙栨秷锛屽凡涓嬪彂浠诲姟浜ょ粰WCS鍒ゅ畾鍙彇娑堟竻鍗曘��
+ Map<String, Object> result = new HashMap<>();
+ result.put("orderNo", param.getOrderId());
+ result.put("reason", param.getReason());
+ result.put("taskCount", activeTasks.size());
+ if (activeTasks.isEmpty()) {
+ result.put("successList", Collections.emptyList());
+ result.put("failList", Collections.emptyList());
+ result.put("cancelledCount", 0);
+ return R.ok("鏃犳湁鏁堝嚭搴撲换鍔�").add(result);
+ }
+
+ Map<String, WrkMast> taskIndex = activeTasks.stream()
+ .filter(wrkMast -> wrkMast != null && wrkMast.getWrkNo() != null)
+ .collect(Collectors.toMap(
+ wrkMast -> String.valueOf(wrkMast.getWrkNo()),
+ wrkMast -> wrkMast,
+ (left, right) -> left,
+ LinkedHashMap::new
+ ));
+ List<WrkMast> directCancelTasks = activeTasks.stream()
+ .filter(wrkMast -> wrkMast != null && !needNotifyWcsStop(wrkMast))
+ .collect(Collectors.toList());
+ List<WrkMast> wcsCancelTasks = activeTasks.stream()
+ .filter(this::needNotifyWcsStop)
+ .collect(Collectors.toList());
+
+ LinkedHashSet<String> successTaskNos = new LinkedHashSet<>();
+ LinkedHashSet<String> failTaskNos = new LinkedHashSet<>();
+ cancelOutboundTasks(directCancelTasks.stream()
+ .map(WrkMast::getWrkNo)
+ .filter(Objects::nonNull)
+ .map(String::valueOf)
+ .collect(Collectors.toList()), taskIndex, successTaskNos);
+
+ List<String> wcsSuccessList = Collections.emptyList();
+ List<String> wcsFailList = Collections.emptyList();
+ if (!wcsCancelTasks.isEmpty()) {
+ R wcsResult = wcsApiService.pauseOutTasks(buildStopOutTaskParams(param, wcsCancelTasks));
+ wcsSuccessList = extractTaskNoList(wcsResult, "successList");
+ wcsFailList = extractTaskNoList(wcsResult, "failList");
+ cancelOutboundTasks(wcsSuccessList, taskIndex, successTaskNos);
+
+ LinkedHashSet<String> wcsFailTaskNos = new LinkedHashSet<>(wcsFailList);
+ if (wcsFailTaskNos.isEmpty()) {
+ for (WrkMast wrkMast : wcsCancelTasks) {
+ String taskNo = String.valueOf(wrkMast.getWrkNo());
+ if (!successTaskNos.contains(taskNo)) {
+ wcsFailTaskNos.add(taskNo);
+ }
+ }
+ }
+ failTaskNos.addAll(wcsFailTaskNos);
+ wcsFailList = new ArrayList<>(wcsFailTaskNos);
+ }
+
+ result.put("wcsTaskCount", wcsCancelTasks.size());
+ result.put("wcsSuccessList", wcsSuccessList);
+ result.put("wcsFailList", wcsFailList);
+ result.put("successList", new ArrayList<>(successTaskNos));
+ result.put("failList", new ArrayList<>(failTaskNos));
+ result.put("cancelledCount", successTaskNos.size());
+ result.put("failCount", failTaskNos.size());
+ return R.ok(successTaskNos.isEmpty() ? "娌℃湁鍙彇娑堜换鍔�" : "鍙栨秷鍑哄簱浠诲姟鎴愬姛").add(result);
+ }
+ throw new CoolException("reason浠呮敮鎸�1鎴�2");
+ }
+
+ @Override
+ @Transactional
+ public R pakoutOrderExecute(OpenOrderPakoutExecuteParam param) {
+ if (param == null || Cools.isEmpty(param.getOrderId())) {
+ throw new CoolException("orderId涓嶈兘涓虹┖");
+ }
+ if (param.getExecute() == null) {
+ throw new CoolException("execute涓嶈兘涓虹┖");
+ }
+ if (Objects.equals(param.getExecute(), 1)) {
+ return createPakoutTasks(param.getOrderId());
+ }
+ if (Objects.equals(param.getExecute(), 2)) {
+ OpenOrderPakoutPauseParam pauseParam = new OpenOrderPakoutPauseParam();
+ pauseParam.setOrderId(param.getOrderId());
+ pauseParam.setReason(2);
+ return pakoutOrderPause(pauseParam);
+ }
+ throw new CoolException("execute浠呮敮鎸�1鎴�2");
+ }
+
+ private List<WrkMast> findActiveOutboundTasks(String orderNo) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
+ if (wrkDetls == null || wrkDetls.isEmpty()) {
+ return Collections.emptyList();
+ }
+ Set<Integer> wrkNos = wrkDetls.stream()
+ .map(WrkDetl::getWrkNo)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toCollection(LinkedHashSet::new));
+ if (wrkNos.isEmpty()) {
+ return Collections.emptyList();
+ }
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .in("wrk_no", wrkNos)
+ .in("io_type", Arrays.asList(101, 103, 104, 107, 108, 110))
+ .in("wrk_sts", Arrays.asList(11L, 12L, 13L)));
+ if (wrkMasts == null || wrkMasts.isEmpty()) {
+ return Collections.emptyList();
+ }
+ wrkMasts.sort(Comparator.comparing(WrkMast::getWrkNo));
+ return wrkMasts;
+ }
+
+ private R createPakoutTasks(String orderNo) {
+ Order order = orderService.selectByNo(orderNo);
+ if (order == null) {
+ throw new CoolException("order not found: " + orderNo);
+ }
+ if (order.getSettle() != 1L && order.getSettle() != 2L) {
+ throw new CoolException("璇ヨ鍗曞凡澶勭悊");
+ }
+
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ if (Cools.isEmpty(orderDetls)) {
+ throw new CoolException("璁㈠崟鏄庣粏涓虹┖");
+ }
+
+ Set<String> exist = new HashSet<>();
+ List<LocDto> locDtos = new ArrayList<>();
+ List<String> lackDetails = new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetls) {
+ double issued = Optional.ofNullable(orderDetl.getAnfme()).orElse(0.0D) - Optional.ofNullable(orderDetl.getWorkQty()).orElse(0.0D);
+ if (issued <= 0.0D) {
+ continue;
+ }
+ List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,
+ orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2());
+ for (LocDetl locDetl : locDetls) {
+ if (issued <= 0.0D) {
+ break;
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
+ if (locMast == null) {
+ continue;
+ }
+ BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", locMast.getCrnNo()));
+ if (basCrnp == null || !"Y".equalsIgnoreCase(basCrnp.getOutEnable())) {
+ continue;
+ }
+
+ double allocateQty = issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued;
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(), allocateQty);
+ locDto.setFrozen(locDetl.getFrozen());
+ locDto.setFrozenLoc(locMast.getFrozen());
+ locDto.setBrand(orderDetl.getBrand());
+ locDto.setStandby1(orderDetl.getStandby1());
+ locDto.setStandby2(orderDetl.getStandby2());
+ locDto.setStandby3(orderDetl.getStandby3());
+ locDto.setBoxType1(orderDetl.getBoxType1());
+ locDto.setBoxType2(orderDetl.getBoxType2());
+ locDto.setBoxType3(orderDetl.getBoxType3());
+ locDto.setStaNos(staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), allocateQty >= locDetl.getAnfme() ? 101 : 103));
+ if (Cools.isEmpty(locDto.getStaNos())) {
+ continue;
+ }
+ locDtos.add(locDto);
+ exist.add(locDetl.getLocNo());
+ issued -= allocateQty;
+ }
+ if (issued > 0.0D) {
+ lackDetails.add(buildLackDetail(orderDetl, issued));
+ }
+ }
+
+ List<LocDto> availableLocDtos = new ArrayList<>();
+ for (LocDto locDto : locDtos) {
+ if (locDto.getFrozen() != 1 && locDto.getFrozenLoc() != 1) {
+ availableLocDtos.add(locDto);
+ }
+ }
+ if (Cools.isEmpty(availableLocDtos)) {
+ throw new CoolException(Cools.isEmpty(lackDetails) ? "鏈敓鎴愪换浣曞嚭搴撲换鍔�" : "搴撳瓨涓嶈冻");
+ }
+
+ List<TaskDto> taskDtos = new ArrayList<>();
+ for (LocDto locDto : availableLocDtos) {
+ TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
+ if (TaskDto.has(taskDtos, taskDto)) {
+ TaskDto dto = TaskDto.find(taskDtos, taskDto);
+ if (dto != null) {
+ dto.getLocDtos().addAll(taskDto.getLocDtos());
+ }
+ } else {
+ taskDtos.add(taskDto);
+ }
+ }
+ for (TaskDto taskDto : taskDtos) {
+ BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
+ workService.stockOut(staNo, taskDto, 9527L);
+ }
+
+ Map<String, Object> result = new LinkedHashMap<>();
+ result.put("orderId", orderNo);
+ result.put("createdTaskCount", taskDtos.size());
+ result.put("allocatedDetailCount", availableLocDtos.size());
+ result.put("lackDetailCount", lackDetails.size());
+ result.put("lackDetails", lackDetails);
+ return R.ok("execute out success").add(result);
+ }
+
+ private String buildLackDetail(OrderDetl orderDetl, double lackQty) {
+ return orderDetl.getMatnr() + "|batch=" + (orderDetl.getBatch() == null ? "" : orderDetl.getBatch()) + "|lack=" + lackQty;
+ }
+
+ private boolean needNotifyWcsStop(WrkMast wrkMast) {
+ return wrkMast != null
+ && wrkMast.getWrkSts() != null
+ && wrkMast.getWrkSts() >= 12L
+ && wrkMast.getWrkSts() < 14L;
+ }
+
+ private StopOutTaskParams buildStopOutTaskParams(OpenOrderPakoutPauseParam param, List<WrkMast> wrkMasts) {
+ StopOutTaskParams stopParams = new StopOutTaskParams();
+ // WCS鍙栨秷鎺ュ彛浠呮帴鏀� taskList.taskNo銆�
+ for (WrkMast wrkMast : wrkMasts) {
+ StopOutTaskParams.TaskItem item = new StopOutTaskParams.TaskItem();
+ item.setTaskNo(String.valueOf(wrkMast.getWrkNo()));
+ stopParams.getTasks().add(item);
+ }
+ return stopParams;
+ }
+
+ private List<String> extractTaskNoList(R result, String key) {
+ if (result == null) {
+ return Collections.emptyList();
+ }
+ List<String> taskNos = toTaskNoList(result.get(key));
+ if (!taskNos.isEmpty()) {
+ return taskNos;
+ }
+ Object data = result.get("data");
+ if (data instanceof Map) {
+ return toTaskNoList(((Map<?, ?>) data).get(key));
+ }
+ if (data instanceof JSONObject) {
+ return toTaskNoList(((JSONObject) data).get(key));
+ }
+ return Collections.emptyList();
+ }
+
+ private List<String> toTaskNoList(Object value) {
+ if (value == null) {
+ return Collections.emptyList();
+ }
+ if (value instanceof Collection) {
+ List<String> taskNos = new ArrayList<>();
+ for (Object item : (Collection<?>) value) {
+ if (item != null) {
+ taskNos.add(String.valueOf(item));
+ }
+ }
+ return taskNos;
+ }
+ return JSON.parseArray(JSON.toJSONString(value), String.class);
+ }
+
+ private void cancelOutboundTasks(List<String> taskNos, Map<String, WrkMast> taskIndex, Set<String> successTaskNos) {
+ for (String taskNo : taskNos) {
+ if (Cools.isEmpty(taskNo) || successTaskNos.contains(taskNo) || !taskIndex.containsKey(taskNo)) {
+ continue;
+ }
+ workService.cancelWrkMast(taskNo, 9527L);
+ successTaskNos.add(taskNo);
}
}
@@ -1037,19 +1370,22 @@
Mat mat = matService.selectByMatnr(param.getMatnr());
if (Cools.isEmpty(mat)) {
- if (param.getFull()==1){
- //婊℃墭鐩�
- mat = matService.selectByMatnr("1");
- }else if (param.getFull()==0){
- //绌烘墭鐩�
- mat = matService.selectByMatnr("0");
- }
+ if (param.getFull() == 1) {
+ //婊℃墭鐩�
+ mat = matService.selectByMatnr("emptyPallet");
+ } else if (param.getFull() == 0) {
+ //绌烘墭鐩�
+ mat = matService.selectByMatnr("emptyPallet");
+ }
}
+
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
+// waitPakin.setMatnr(param.getMatnr());
waitPakin.setBatch(String.valueOf(param.getBatchId()));
waitPakin.setZpallet(param.getPalletId()); // 鎵樼洏鐮�
+
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(param.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
@@ -1061,6 +1397,7 @@
waitPakin.setOrigin(String.valueOf(param.getStorageArea()));//寤鸿鍏ュ簱鍖哄煙
waitPakin.setManu(String.valueOf(param.getLocId()));//mes鍏蜂綋搴撲綅缂栧彿
waitPakin.setThreeCode(param.getBizNo());
+ waitPakin.setBeBatch(param.getPackage1());//鏄惁鏁ｈ揣锛�0 闈炴暎璐э紱1 鏁ｈ揣锛涗负浜嗙鎺у嚭璐ч�熺巼锛屾暎璐у彲浠ュ嚭鎱㈢偣銆�
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -1071,7 +1408,7 @@
public R outOrder(OutTaskParam param) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", param.getPalletId()));
if (locMast == null) {
- return R.error("娌℃湁鎵惧埌鎵樼洏鐮�="+param.getPalletId()+"瀵瑰簲鐨勫簱浣�");
+ return R.error("娌℃湁鎵惧埌鎵樼洏鐮�=" + param.getPalletId() + "瀵瑰簲鐨勫簱浣�");
}
Integer ioType = 101;
// 鑾峰彇璺緞
@@ -1096,6 +1433,7 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("N");
+ wrkMast.setPdcType("N");
wrkMast.setUserNo(param.getOrderId());//璁㈠崟鍙�
wrkMast.setPltType(param.getSeq());//鍑哄簱椤哄簭锛屼粠1寮�濮�
wrkMast.setTakeNone("0"); //0闈炶嚜鍔�
@@ -1104,11 +1442,11 @@
wrkMast.setModiUser(9995L);
wrkMast.setModiTime(now);
if (!wrkMastService.insert(wrkMast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+locMast.getLocNo());
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + locMast.getLocNo());
}
List<LocDetl> locNo = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
if (locNo == null || locNo.size() == 0) {
- throw new CoolException("鏌ヨ搴撳瓨鏄庣粏澶辫触锛屽嚭搴撳簱浣嶅彿锛�"+locMast.getLocNo());
+ throw new CoolException("鏌ヨ搴撳瓨鏄庣粏澶辫触锛屽嚭搴撳簱浣嶅彿锛�" + locMast.getLocNo());
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDetl locDetl : locNo) {
@@ -1135,7 +1473,7 @@
locMast.setModiUser(9995L);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
- throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + locMast.getLocNo());
}
} else {
log.error(locMast.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
@@ -1144,3 +1482,4 @@
return R.ok();
}
}
+
--
Gitblit v1.9.1