From 7aba2103c4b3ea72e8e0fd79dc88be0e251c1c33 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 12 四月 2026 16:03:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 273 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 251 insertions(+), 22 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 b1eca9f..f096761 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -87,6 +87,10 @@
private String mesUrl;
@Value("${mes.stationaddress}")
private String stationAddress;
+ @Value("${erp.address.URL:}")
+ private String erpUrl;
+ @Value("${erp.address.OutErroraddress:}")
+ private String erpOutErrorAddress;
@Autowired
private WaitPakinService waitPakinService;
@Autowired
@@ -417,7 +421,7 @@
return R.ok(confirmedCount == 0 ? "浠诲姟宸茬‘璁ゆ墽琛�" : "ERP纭鎵ц鍑哄簱鎴愬姛").add(result);
}
if (Objects.equals(param.getExecute(), 2)) {
- // ERP璇锋眰鍙栨秷浠诲姟锛氭寜 plt_type 浠庡ぇ鍒板皬鍏� WCS 鍐� WMS锛涘け璐ユ垨寮傚父鍒欏仠姝㈠悗缁紝鎺ュ彛浠嶈繑鍥炲師鎴愬姛缁撴瀯銆�
+ // ERP璇锋眰鍙栨秷浠诲姟锛氱洿鎺ユ敹闆嗕换鍔″彿锛屾寜 taskList 鏍煎紡鍙戦�佺粰 WCS銆�
Map<String, Object> result = new HashMap<>();
result.put("orderNo", param.getOrderId());
result.put("execute", param.getExecute());
@@ -425,26 +429,17 @@
if (activeTasks.isEmpty()) {
return R.ok("鏃犳湁鏁堝嚭搴撲换鍔�").add(result);
}
- List<WrkMast> sorted = new ArrayList<>(activeTasks);
- sorted.sort(Comparator.comparing(WrkMast::getPltType, Comparator.nullsLast(Comparator.reverseOrder())));
- for (WrkMast wrkMast : sorted) {
- try {
- if (!Cools.isEmpty(wrkMast) && wrkMast.getWrkSts() == 11L) {
- workService.cancelWrkMast(wrkMast.getWrkNo() + "", 9955L);
- continue;
- }
- HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("taskNo", wrkMast.getWrkNo());
- List<HashMap<String, Object>> one = new ArrayList<>();
- one.add(hashMap);
- R wcsR = wcsApiService.pauseOutTasks(one);
- requireWcsPauseOk(wcsR);
- workService.cancelWrkMast(wrkMast.getWrkNo() + "", 9955L);
- } catch (Exception e) {
- log.warn("[pakoutOrderPause] execute=2 鍙栨秷涓, orderNo={}, err={}", param.getOrderId(), e.getMessage());
- break;
+ 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;
}
+ taskList.add(hashMap);
}
+ wcsApiService.pauseOutTasks(taskList);
return R.ok("鍙栨秷浠诲姟宸插彂閫佽嚦WCS").add(result);
}
throw new CoolException("reason浠呮敮鎸�1鎴�2");
@@ -1307,6 +1302,9 @@
return mesUrl + stationAddress;
}
+ /**
+ * 7.3 缁勬墭淇℃伅涓嬪彂銆�
+ */
@Override
public R mesToComb(MesToCombParam param) {
if (Cools.isEmpty(param.getPalletId())) {
@@ -1344,10 +1342,16 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(9995L);
waitPakin.setModiTime(now);
- waitPakin.setOrderNo(String.valueOf(param.getOrderId()));
+ waitPakin.setOrderNo(String.valueOf(param.getBizNo()));
waitPakin.setOrigin(String.valueOf(param.getStorageArea()));//寤鸿鍏ュ簱鍖哄煙
waitPakin.setManu(String.valueOf(param.getLocId()));//mes鍏蜂綋搴撲綅缂栧彿
waitPakin.setThreeCode(param.getBizNo());
+ // 7.3 鏂板瀛楁澶嶇敤鐜版湁缁勬墭妗ｆ壙杞戒綅锛屼笉鏂板鍒椼��
+ waitPakin.setSuppCode(param.getCustomerId());
+ waitPakin.setSupp(param.getCustomerName());
+ waitPakin.setStandby3(param.getItem());
+ waitPakin.setStandby1(param.getEntryWmsCode());
+ waitPakin.setStandby2(param.getOutDoorNo());
waitPakin.setBeBatch(param.getPackage1());//鏄惁鏁ｈ揣锛�0 闈炴暎璐э紱1 鏁ｈ揣锛涗负浜嗙鎺у嚭璐ч�熺巼锛屾暎璐у彲浠ュ嚭鎱㈢偣銆�
// ERP 鍏ュ彛榛樿鎵� erp锛孧QTT 缁勬墭浼氬湪鍙傛暟閲屾樉寮忎紶 aws銆�
waitPakin.setBoxType1(Cools.isEmpty(param.getBoxType1()) ? "erp" : param.getBoxType1());
@@ -1357,15 +1361,36 @@
return R.ok().add(Cools.add("palletId", param.getPalletId()).add("orderId", param.getOrderId()));
}
+ /**
+ * 7.11 鍑哄簱閫氱煡鍗曪紙浼犻�掓湁搴忔棤搴忚鍒欙級鍗曟潯寤哄崟銆�
+ */
@Override
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) {
throw new CoolException("娌℃湁鎵惧埌鎵樼洏鐮�=" + param.getPalletId() + "瀵瑰簲鐨勫簱浣�");
}
+ if (Cools.isEmpty(param.getStationId())) {
+ throw new CoolException("鍑哄簱鍙ｇ紪鐮佷笉鑳戒负绌�");
+ }
+ if (Cools.isEmpty(param.getBatchSeq())) {
+ throw new CoolException("鎵规鏍囪瘑涓嶈兘涓虹┖");
+ }
+ if (param.getSeq() == null || param.getSeq() < 0) {
+ throw new CoolException("鍑哄簱椤哄簭涓嶈兘涓虹┖涓斾笉鑳藉皬浜�0");
+ }
Integer ioType = 101;
// 鑾峰彇璺緞
- StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), Integer.valueOf(param.getStationId()));
+ Integer stationId;
+ try {
+ stationId = Integer.valueOf(param.getStationId());
+ } catch (NumberFormatException ex) {
+ throw new CoolException("鍑哄簱鍙ｇ紪鐮佹牸寮忛敊璇細" + param.getStationId());
+ }
+ StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), stationId);
+ if (staDesc == null) {
+ throw new CoolException("鏈壘鍒板嚭搴撳彛=" + param.getStationId() + "瀵瑰簲璺緞");
+ }
Date now = new Date();
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
@@ -1387,7 +1412,9 @@
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("N");
wrkMast.setPdcType("N");
+ // 7.11锛歰rderId 瀛� userNo锛宐atchSeq 瀛樻壒娆℃爣璇嗭紝seq 瀛樻壒娆″唴椤哄簭銆�
wrkMast.setUserNo(param.getOrderId());//璁㈠崟鍙�
+ wrkMast.setBatchSeq(param.getBatchSeq());//璁㈠崟鍐呮壒娆℃爣璇�
wrkMast.setPltType(param.getSeq());//鍑哄簱椤哄簭锛屼粠1寮�濮�
wrkMast.setTakeNone("0"); //0闈炶嚜鍔�
wrkMast.setAppeUser(9995L); // 鎿嶄綔浜哄憳鏁版嵁
@@ -1414,6 +1441,9 @@
wrkDetl.setAppeUser(9995L);
wrkDetl.setModiTime(now);
wrkDetl.setModiUser(9995L);
+ // 7.11锛歟ntryWmsCode銆乷utDoorNo 澶嶇敤鏄庣粏澶囩敤瀛楁銆�
+ wrkDetl.setStandby1(param.getEntryWmsCode());
+ wrkDetl.setStandby2(param.getOutDoorNo());
wrkDetl.setSupp(param.getSeq()+"/"+count);
if (!wrkDetlService.insert(wrkDetl)) {
@@ -1436,18 +1466,217 @@
return R.ok().add(Cools.add("wrkNo", workNo).add("orderId", param.getOrderId()));
}
+ /**
+ * 7.11 鍑哄簱閫氱煡鍗曪紙浼犻�掓湁搴忔棤搴忚鍒欙級鎵归噺寤哄崟銆�
+ */
@Override
@Transactional(rollbackFor = Exception.class)
public R outOrderBatch(List<OutTaskParam> params) {
int n = params.size();
+ Map<String, Integer> batchLineCounts = new HashMap<>();
for (OutTaskParam outTaskParam : params) {
- R r = outOrder(outTaskParam, n);
+ batchLineCounts.merge(buildOutOrderBatchKey(outTaskParam), 1, Integer::sum);
+ }
+ for (OutTaskParam outTaskParam : params) {
+ int count = batchLineCounts.getOrDefault(buildOutOrderBatchKey(outTaskParam), n);
+ R r = outOrder(outTaskParam, count);
if (!Objects.equals(r.get("code"), 200)) {
throw new CoolException("鍑哄簱寤哄崟澶辫触");
}
}
return R.ok();
}
+
+ /**
+ * 7.9 鍑哄簱寮傚父鍙樺姩涓婃姤銆�
+ * WCS 鍙紶 palletId銆乪rrorMsg锛學MS 瑙ｆ瀽 orderId 鍚庤浆鍙� ERP銆�
+ */
+ @Override
+ public R outOrderAbnormalReport(OutOrderAbnormalReportParam param) {
+ if (param == null || Cools.isEmpty(param.getPalletId())) {
+ return R.error("palletId涓嶈兘涓虹┖");
+ }
+ String orderId = resolveOutboundOrderId(param.getPalletId());
+ if (Cools.isEmpty(orderId)) {
+ return R.error("鏈壘鍒版墭鐩樺搴斿嚭搴撳崟鍙凤細" + param.getPalletId());
+ }
+ if (Cools.isEmpty(erpOutErrorAddress)) {
+ return R.error("ERP鍑哄簱寮傚父涓婃姤鍦板潃鏈厤缃�");
+ }
+
+ ErpOutOrderAbnormalReportParam erpParam = new ErpOutOrderAbnormalReportParam();
+ erpParam.setPalletId(param.getPalletId());
+ erpParam.setErrorMsg(param.getErrorMsg());
+ erpParam.setOrderId(orderId);
+
+ String requestJson = JSON.toJSONString(erpParam);
+ String response = "";
+ boolean pushOk = false;
+ String errorMsg = null;
+ String pushUrl = buildErpOutErrorRequestUrl();
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(erpUrl)
+ .setPath(erpOutErrorAddress)
+ .setJson(requestJson)
+ .build()
+ .doPost();
+ pushOk = isErpCallSuccess(response);
+ if (!pushOk) {
+ errorMsg = extractErpCallError(response);
+ }
+ } catch (Exception e) {
+ errorMsg = e.getMessage();
+ log.error("鎺‥RP鍑哄簱寮傚父涓婃姤澶辫触, palletId={}, orderId={}", param.getPalletId(), orderId, e);
+ } finally {
+ try {
+ apiLogService.save(
+ "鎺‥RP-鍑哄簱寮傚父涓婃姤",
+ pushUrl,
+ null,
+ "127.0.0.1",
+ requestJson,
+ response,
+ pushOk,
+ "palletId=" + param.getPalletId() + ",orderId=" + orderId
+ );
+ } catch (Exception logEx) {
+ log.error("save out abnormal api log failed", logEx);
+ }
+ }
+ if (!pushOk) {
+ return R.error(Cools.isEmpty(errorMsg) ? "ERP鍑哄簱寮傚父涓婃姤澶辫触" : errorMsg);
+ }
+ return R.ok().add(Cools.add("palletId", param.getPalletId()).add("orderId", orderId));
+ }
+
+ /**
+ * 7.10 鍑哄簱寮傚父鍙樺姩澶勭悊銆�
+ * 鏈湡鍙帴鏀躲�佹牎楠屽拰璁板綍锛屼笉鏀规湰鍦颁换鍔★紝涔熶笉杞彂 WCS銆�
+ */
+ @Override
+ public R outOrderAbnormalHandle(OutOrderAbnormalHandleParam param) {
+ if (param == null || Cools.isEmpty(param.getPalletId())) {
+ return R.error("palletId涓嶈兘涓虹┖");
+ }
+ if (param.getOperateType() == null || !(Objects.equals(param.getOperateType(), 0) || Objects.equals(param.getOperateType(), 2))) {
+ return R.error("operateType鍙厑璁�0鎴�2");
+ }
+ if (!existsOutboundPallet(param.getPalletId())) {
+ return R.error("鏈壘鍒版墭鐩橈細" + param.getPalletId());
+ }
+ log.info("鎺ユ敹鍑哄簱寮傚父澶勭悊鎸囦护, palletId={}, operateType={}", param.getPalletId(), param.getOperateType());
+ return R.ok().add(Cools.add("palletId", param.getPalletId()).add("operateType", param.getOperateType()));
+ }
+
+ private String buildOutOrderBatchKey(OutTaskParam param) {
+ return param.getOrderId() + "#" + param.getBatchSeq();
+ }
+
+ private String resolveOutboundOrderId(String palletId) {
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("io_type", 101)
+ .eq("barcode", palletId)
+ .orderBy("io_time", false)
+ .orderBy("wrk_no", false));
+ if (!Cools.isEmpty(wrkMasts)) {
+ for (WrkMast wrkMast : wrkMasts) {
+ if (!Cools.isEmpty(wrkMast.getUserNo())) {
+ return wrkMast.getUserNo();
+ }
+ }
+ }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>()
+ .eq("zpallet", palletId)
+ .orderBy("io_time", false)
+ .orderBy("wrk_no", false));
+ if (!Cools.isEmpty(wrkDetls)) {
+ for (WrkDetl wrkDetl : wrkDetls) {
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+ return wrkDetl.getOrderNo();
+ }
+ }
+ }
+ return null;
+ }
+
+ private boolean existsOutboundPallet(String palletId) {
+ if (locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", palletId)) > 0) {
+ return true;
+ }
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 101).eq("barcode", palletId)) > 0) {
+ return true;
+ }
+ return wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", palletId)) > 0;
+ }
+
+ private boolean isErpCallSuccess(String response) {
+ if (Cools.isEmpty(response)) {
+ return false;
+ }
+ try {
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject == null) {
+ return false;
+ }
+ Boolean success = jsonObject.getBoolean("success");
+ if (success != null) {
+ return success;
+ }
+ Integer code = jsonObject.getInteger("code");
+ if (code != null) {
+ return code == 200 || code == 0;
+ }
+ Integer status = jsonObject.getInteger("status");
+ if (status != null) {
+ return status == 200 || status == 0;
+ }
+ String result = jsonObject.getString("result");
+ if (!Cools.isEmpty(result)) {
+ return "success".equalsIgnoreCase(result) || "ok".equalsIgnoreCase(result) || "true".equalsIgnoreCase(result);
+ }
+ } catch (Exception ignore) {
+ return response.toLowerCase().contains("success") && response.toLowerCase().contains("true");
+ }
+ return false;
+ }
+
+ private String extractErpCallError(String response) {
+ if (Cools.isEmpty(response)) {
+ return "empty erp response";
+ }
+ try {
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject == null) {
+ return response;
+ }
+ String[] keys = new String[]{"msg", "message", "error", "errMsg"};
+ for (String key : keys) {
+ String value = jsonObject.getString(key);
+ if (!Cools.isEmpty(value)) {
+ return value;
+ }
+ }
+ } catch (Exception ignore) {
+ }
+ return response;
+ }
+
+ private String buildErpOutErrorRequestUrl() {
+ if (Cools.isEmpty(erpUrl)) {
+ return erpOutErrorAddress;
+ }
+ if (erpOutErrorAddress == null) {
+ return erpUrl;
+ }
+ if (erpUrl.endsWith("/") && erpOutErrorAddress.startsWith("/")) {
+ return erpUrl + erpOutErrorAddress.substring(1);
+ }
+ if (!erpUrl.endsWith("/") && !erpOutErrorAddress.startsWith("/")) {
+ return erpUrl + "/" + erpOutErrorAddress;
+ }
+ return erpUrl + erpOutErrorAddress;
+ }
}
--
Gitblit v1.9.1