From 1104f7c6dbf4a1c6c9d47abf75f9b39ce1f3a5f7 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 06 四月 2026 17:00:39 +0800
Subject: [PATCH] erp-创建出库单失败不保存处理
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 220 ++++++++++++++++++++----------------------------------
1 files changed, 83 insertions(+), 137 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 58e8d31..2e13cd7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -33,7 +33,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.rmi.CORBA.Util;
import java.util.*;
import java.util.stream.Collectors;
@@ -98,6 +97,8 @@
private WorkService workService;
@Autowired
private BasCrnpService basCrnpService;
+ @Autowired
+ private ApiLogService apiLogService;
@Override
@Transactional
@@ -377,12 +378,12 @@
if (param == null || Cools.isEmpty(param.getOrderId())) {
throw new CoolException("orderNo涓嶈兘涓虹┖");
}
- if (param.getReason() == null) {
- throw new CoolException("reason涓嶈兘涓虹┖");
+ if (param.getExecute() == null) {
+ throw new CoolException("execute涓嶈兘涓虹┖");
}
List<WrkMast> activeTasks = findActiveOutboundTasks(param.getOrderId());
- if (Objects.equals(param.getReason(), 1)) {
+ if (Objects.equals(param.getExecute(), 1)) {
// ERP纭绔嬪嵆鎵ц锛屼粎澶勭悊寰呬笅鍙戠殑鍑哄簱浠诲姟銆�
List<WrkMast> pendingTasks = activeTasks.stream()
.filter(wrkMast -> wrkMast != null && Objects.equals(wrkMast.getWrkSts(), 11L))
@@ -415,94 +416,34 @@
result.put("confirmedCount", confirmedCount);
return R.ok(confirmedCount == 0 ? "浠诲姟宸茬‘璁ゆ墽琛�" : "ERP纭鎵ц鍑哄簱鎴愬姛").add(result);
}
- if (Objects.equals(param.getReason(), 2)) {
- // ERP璇锋眰鍙栨秷浠诲姟锛氭湭涓嬪彂浠诲姟鐩存帴鏈湴鍙栨秷锛屽凡涓嬪彂浠诲姟浜ょ粰WCS鍒ゅ畾鍙彇娑堟竻鍗曘��
+ if (Objects.equals(param.getExecute(), 2)) {
+ // ERP璇锋眰鍙栨秷浠诲姟锛氱洿鎺ユ敹闆嗕换鍔″彿锛屾寜 taskList 鏍煎紡鍙戦�佺粰 WCS銆�
Map<String, Object> result = new HashMap<>();
result.put("orderNo", param.getOrderId());
- result.put("reason", param.getReason());
+ result.put("execute", param.getExecute());
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);
- }
- }
+ List<HashMap<String,Object>> taskList = new ArrayList<>();
+ for (WrkMast wrkMast : activeTasks) {
+ HashMap<String,Object> hashMap = new HashMap<>();
+ hashMap.put("taskNo", wrkMast.getWrkNo());
+ if (!Cools.isEmpty(wrkMast) && wrkMast.getWrkSts() ==11L) {
+ workService.cancelWrkMast(wrkMast.getWrkNo()+"", 9955L);
+ continue;
}
- failTaskNos.addAll(wcsFailTaskNos);
- wcsFailList = new ArrayList<>(wcsFailTaskNos);
+ taskList.add(hashMap);
}
-
- 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);
+ wcsApiService.pauseOutTasks(taskList);
+ return R.ok("鍙栨秷浠诲姟宸插彂閫佽嚦WCS").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");
+ return null;
}
private List<WrkMast> findActiveOutboundTasks(String orderNo) {
@@ -631,14 +572,7 @@
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) {
+ private StopOutTaskParams buildStopOutTaskParams(List<WrkMast> wrkMasts) {
StopOutTaskParams stopParams = new StopOutTaskParams();
// WCS鍙栨秷鎺ュ彛浠呮帴鏀� taskList.taskNo銆�
for (WrkMast wrkMast : wrkMasts) {
@@ -647,50 +581,6 @@
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);
- }
}
@Override
@@ -1336,7 +1226,10 @@
stationParams.add(stationParam);
}
}
+ String requestJson = JSON.toJSONString(stationParams);
String response = "";
+ boolean pushOk = false;
+ String pushUrl = buildMesStationRequestUrl();
try {
//鑾峰彇Cookie鍊�
HashMap<String, Object> headers = new HashMap<>();
@@ -1346,19 +1239,50 @@
.setHeaders(headers)
.setUri(mesUrl)
.setPath(stationAddress)
- .setJson(JSON.toJSONString(stationParams))
+ .setJson(requestJson)
.build()
.doPost();
JSONObject jsonResponse = JSON.parseObject(response);
- if (jsonResponse.getInteger("code") == 200) {
-
+ if (jsonResponse != null && Integer.valueOf(200).equals(jsonResponse.getInteger("code"))) {
+ pushOk = true;
} else {
return R.error();
}
} catch (Exception e) {
e.printStackTrace();
+ } finally {
+ try {
+ apiLogService.save(
+ "鎺‥RP-绔欑偣鍚屾",
+ pushUrl,
+ null,
+ "127.0.0.1",
+ requestJson,
+ response,
+ pushOk,
+ "绔欑偣鍚屾鎺ㄥ鏂�"
+ );
+ } catch (Exception logEx) {
+ log.error("save station sync api log failed", logEx);
+ }
}
return R.ok();
+ }
+
+ private String buildMesStationRequestUrl() {
+ if (Cools.isEmpty(mesUrl)) {
+ return stationAddress;
+ }
+ if (stationAddress == null) {
+ return mesUrl;
+ }
+ if (mesUrl.endsWith("/") && stationAddress.startsWith("/")) {
+ return mesUrl + stationAddress.substring(1);
+ }
+ if (!mesUrl.endsWith("/") && !stationAddress.startsWith("/")) {
+ return mesUrl + "/" + stationAddress;
+ }
+ return mesUrl + stationAddress;
}
@Override
@@ -1373,7 +1297,12 @@
if (param.getFull() == 1) {
//婊℃墭鐩�
- mat = matService.selectByMatnr("emptyPallet");
+ if(param.getBoxType1().equals("aws")){
+ mat = matService.selectByMatnr("amazon");
+ }else {
+ mat = matService.selectByMatnr("cloudWarehouse");
+ }
+
} else if (param.getFull() == 0) {
//绌烘墭鐩�
mat = matService.selectByMatnr("emptyPallet");
@@ -1398,17 +1327,19 @@
waitPakin.setManu(String.valueOf(param.getLocId()));//mes鍏蜂綋搴撲綅缂栧彿
waitPakin.setThreeCode(param.getBizNo());
waitPakin.setBeBatch(param.getPackage1());//鏄惁鏁ｈ揣锛�0 闈炴暎璐э紱1 鏁ｈ揣锛涗负浜嗙鎺у嚭璐ч�熺巼锛屾暎璐у彲浠ュ嚭鎱㈢偣銆�
+ // ERP 鍏ュ彛榛樿鎵� erp锛孧QTT 缁勬墭浼氬湪鍙傛暟閲屾樉寮忎紶 aws銆�
+ waitPakin.setBoxType1(Cools.isEmpty(param.getBoxType1()) ? "erp" : param.getBoxType1());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
- return null;
+ return R.ok().add(Cools.add("palletId", param.getPalletId()).add("orderId", param.getOrderId()));
}
@Override
- public R outOrder(OutTaskParam param) {
+ public R outOrder(OutTaskParam param,int count) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", param.getPalletId()));
if (locMast == null) {
- return R.error("娌℃湁鎵惧埌鎵樼洏鐮�=" + param.getPalletId() + "瀵瑰簲鐨勫簱浣�");
+ throw new CoolException("娌℃湁鎵惧埌鎵樼洏鐮�=" + param.getPalletId() + "瀵瑰簲鐨勫簱浣�");
}
Integer ioType = 101;
// 鑾峰彇璺緞
@@ -1461,6 +1392,7 @@
wrkDetl.setAppeUser(9995L);
wrkDetl.setModiTime(now);
wrkDetl.setModiUser(9995L);
+ wrkDetl.setSupp(param.getSeq()+"/"+count);
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
@@ -1479,7 +1411,21 @@
log.error(locMast.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
throw new CoolException(locMast.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
+ return R.ok().add(Cools.add("wrkNo", workNo).add("orderId", param.getOrderId()));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R outOrderBatch(List<OutTaskParam> params) {
+ int n = params.size();
+ for (OutTaskParam outTaskParam : params) {
+ R r = outOrder(outTaskParam, n);
+ if (!Objects.equals(r.get("code"), 200)) {
+ throw new CoolException("鍑哄簱寤哄崟澶辫触");
+ }
+ }
return R.ok();
}
}
+
--
Gitblit v1.9.1