From fb4cfaec4b05618ef49f483cd80b770a286bb9f8 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期四, 31 十月 2024 10:13:13 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 19 ++++++++++++-------
src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java | 7 +++++--
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 8 ++++++--
3 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index c45aa28..5789409 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -156,24 +156,29 @@
@PostMapping("/order/pakout/default/v1")
- @AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁")
+ //@AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁")
public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
//@RequestBody(required = false) HashMap<String,Object> param,
@RequestBody(required = false) OrderProdSyncParam param, HttpServletRequest request) {
log.info("鍚屾宸ュ崟鍗曟嵁,{}", JSON.toJSONString(param));
- auth(appkey, param, request);
+ ///auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
DocType type = getType(param.get鎿嶄綔鍗曟嵁(), param.getIQuantity());
if (!Cools.isEmpty(type)) {
- if (type.getDocName().equals("MO")) {
+ if (param.get鎿嶄綔鍗曟嵁().equals("MO")) {
mappingPakInOrderParam(param, true, type.getDocName());
- mappingPakOutOrderParam(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�");
- } else if (type.getDocName().equals("OM")) {
+ if (!Cools.isEmpty(param.getChildren())) {
+ mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�");
+ }
+ } else if (param.get鎿嶄綔鍗曟嵁().equals("OM")) {
mappingPakInOrderParam(param, true, type.getDocName());
- mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�");
+ if (!Cools.isEmpty(param.getChildren())) {
+ mappingPakOutOrderParam(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�");
+ }
+
} else {
if (type.getPakin() == 1) {
mappingPakInOrderParam(param, true, type.getDocName());
@@ -268,7 +273,7 @@
orderSyncParam.set鎿嶄綔绯荤粺鍙�(param.get鎿嶄綔绯荤粺鍙�());
orderSyncParam.setcPOID(child.get(0).getOrderNoT());
orderSyncParam.setDdate(param.getOrderTime());
- orderSyncParam.setcMemo("");
+ orderSyncParam.setcMemo(param.getCMemo());
//鐢熸垚鍗曟嵁鏄庣粏
List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index b42f5b7..1e4e397 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -283,13 +283,17 @@
int code = Integer.parseInt(jsonObject.get("code").toString());
if(code != 0){
- throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ //TODO 寮犺秴
+ //throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ return code;
}
success = true;
return code;
}catch (Exception e){
log.error(e.getMessage());
- throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ //TODO 寮犺秴
+ //throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ return 1;
}finally {
apiLogService.save(
namespace,
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java
index bb9bbca..82a15f8 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java
@@ -130,13 +130,16 @@
int code = Integer.parseInt(jsonObject.get("code").toString());
if(code != 0){
- throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ //TODO 寮犺秴
+ //throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ return code;
}
success = true;
return code;
}catch (Exception e){
log.error(e.getMessage());
- throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ //throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ return 1;
}finally {
apiLogService.save(
namespace,
--
Gitblit v1.9.1