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/controller/OpenController.java | 79 +++++++++++++++++++++++++--------------
1 files changed, 51 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 867a601..d48f641 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -60,9 +60,6 @@
private LocMastService locMastService;
@Autowired
private ReportQueryMapper reportQueryMapper;
- @Autowired
- private WorkService workService;
-
// @PostMapping("/order/matSync/default/v1")
//// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
// public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@@ -156,6 +153,7 @@
private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ log.info("[auth] cache: {}", obj == null ? "null" : JSON.toJSONString(obj));
request.setAttribute("cache", obj);
if (!auth) {
return;
@@ -401,8 +399,12 @@
@PostMapping("/order/matSync/default/v2")
// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
- public synchronized R syncMatInfoV2(@RequestBody(required = false) List<MatSyncParam.MatParam> param){
-
+ public synchronized R syncMatInfoV2(@RequestBody(required = false) List<MatSyncParam.MatParam> param,
+ HttpServletRequest request) {
+ if (request != null) {
+ log.info("[syncMatInfoV2] cache: {}", param == null ? "null" : JSON.toJSONString(param));
+ request.setAttribute("cache", param);
+ }
System.out.println(param);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -427,7 +429,12 @@
* return
*/
@PostMapping("/station/all")
- public synchronized R stationAll(){
+ public synchronized R stationAll(HttpServletRequest request) {
+ if (request != null) {
+ String cachePayload = JSON.toJSONString(Collections.singletonMap("op", "stationAll"));
+ log.info("[stationAll] cache: {}", cachePayload);
+ request.setAttribute("cache", cachePayload);
+ }
return openService.stationAll();
}
@@ -436,7 +443,11 @@
* return
*/
@PostMapping("/comb/auth")
- public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param){
+ public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param, HttpServletRequest request) {
+ if (request != null) {
+ log.info("[comb] cache: {}", param == null ? "null" : JSON.toJSONString(param));
+ request.setAttribute("cache", param);
+ }
List<MesToCombParam> errorComb = Lists.newArrayList();
List<MesToCombParam> validComb = Lists.newArrayList();
for (MesToCombParam mesToCombParam : param) {
@@ -480,10 +491,12 @@
*/
@PostMapping("/outOrder")
- public synchronized R outOrder (@RequestBody ArrayList<OutTaskParam> params){
+ public synchronized R outOrder(@RequestBody ArrayList<OutTaskParam> params, HttpServletRequest request) {
if (Cools.isEmpty(params)) {
return R.error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
}
+ log.info("[outOrder] cache: {}", JSON.toJSONString(params));
+ request.setAttribute("cache", params);
Set<String> orderIds = new LinkedHashSet<>();
for (OutTaskParam outTaskParam : params) {
if (Cools.isEmpty(outTaskParam) || Cools.isEmpty(outTaskParam.getOrderId())) {
@@ -509,7 +522,7 @@
Collections.sort(seqs);
for (int i = 0; i < seqs.size(); i++) {
if (!String.valueOf(seqs.get(i)).equals(String.valueOf(i + 1))) {
- return R.error("鍑哄簱鍗曘��" + oid + "銆嶅簭鍙蜂笉杩炵画");
+ return R.error("鍑哄簱鍗曘��" + oid + "銆嶅簭鍙蜂笉杩炶疮");
}
}
}
@@ -542,42 +555,48 @@
// }
// }
- List<OutTaskParam> errorOutOrders = Lists.newArrayList();
- List<OutTaskParam> validOutOrders = Lists.newArrayList();
+ List<OutTaskParam> missingStock = Lists.newArrayList();
+ List<OutTaskParam> missingLoc = Lists.newArrayList();
for (OutTaskParam outTaskParam : params) {
- // TODO:寰呮脯瑭︼紝鏍￠搴瓨淇℃伅锛屼笉瀛樺湪鍓囪繑鍥�
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", outTaskParam.getPalletId()));
- if (countLoc == 0){
- errorOutOrders.add(outTaskParam);
+ if (countLoc == 0) {
+ missingStock.add(outTaskParam);
continue;
}
- validOutOrders.add(outTaskParam);
- }
- for (OutTaskParam outTaskParam : validOutOrders) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", outTaskParam.getPalletId()));
if (locMast == null) {
- throw new CoolException("娌℃湁鎵惧埌鎵樼洏鐮�=" + outTaskParam.getPalletId() + "瀵瑰簲鐨勫簱浣�");
+ missingLoc.add(outTaskParam);
}
}
-
- for (OutTaskParam outTaskParam : validOutOrders) {
- R r = openService.outOrder(outTaskParam,validOutOrders.size());
- if (!r.get("code").equals(200)){
- return r;
+ if (!missingStock.isEmpty()) {
+ List<String> missingPalletIds = new ArrayList<>(missingStock.size());
+ for (OutTaskParam p : missingStock) {
+ String pid = p.getPalletId();
+ missingPalletIds.add(Cools.isEmpty(pid) ? "锛堢┖锛�" : pid);
}
+ return R.error("搴撳瓨涓笉瀛樺湪璇ユ墭鐩橈細" + String.join("锛�", missingPalletIds)).add(missingStock);
}
- if(errorOutOrders.size() > 0) {
- return R.error("搴撳瓨涓笉瀛樺湪璇ユ墭鐩�").add(errorOutOrders);
+ if (!missingLoc.isEmpty()) {
+ List<String> badPalletIds = new ArrayList<>(missingLoc.size());
+ for (OutTaskParam p : missingLoc) {
+ String pid = p.getPalletId();
+ badPalletIds.add(Cools.isEmpty(pid) ? "锛堢┖锛�" : pid);
+ }
+ return R.error("娌℃湁鎵惧埌鎵樼洏鐮佸搴斿簱浣嶏細" + String.join("锛�", badPalletIds)).add(missingLoc);
}
- return R.ok();
+ return openService.outOrderBatch(params);
}
/**
* pause out order
*/
@PostMapping("/order/pakout/pause/default/v1")
- public synchronized R pakoutOrderPause(@RequestBody OpenOrderPakoutPauseParam param){
+ public synchronized R pakoutOrderPause(@RequestBody OpenOrderPakoutPauseParam param, HttpServletRequest request) {
+ if (request != null) {
+ log.info("[pakoutOrderPause] 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");
}
@@ -699,7 +718,11 @@
* 浠诲姟鏌ヨ鎺ュ彛
*/
@PostMapping("/queryTask")
- public synchronized R queryTask(@RequestBody QueryTaskParam param) {
+ public synchronized R queryTask(@RequestBody QueryTaskParam param, HttpServletRequest request) {
+ if (request != null) {
+ log.info("[queryTask] cache: {}", param == null ? "null" : JSON.toJSONString(param));
+ request.setAttribute("cache", param);
+ }
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
--
Gitblit v1.9.1