From 5f1280f3724da083732e858dec95bd7f3d14c8f9 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 29 四月 2025 11:44:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 24add0e..e7aff90 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -95,18 +95,24 @@
@RequestBody TaskCreateParam param,
HttpServletRequest request) {
auth(appkey, param, request);
+
+ R result = null;
try{
if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
+ result = R.parse(BaseRes.PARAM);
+ return result;
}
if (Cools.isEmpty(param.getTaskNo())) {
- return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+ result = R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+ return result;
}
if (Cools.isEmpty(param.getIoType())) {
- return R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
+ result = R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
+ return result;
}
if (Cools.isEmpty(param.getBarcode())) {
- return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
+ result = R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
+ return result;
}
String locNo=null;
if (param.getIoType() == 1) {
@@ -119,24 +125,37 @@
.eq("loc_no", locNo).ne("loc_sts", "X"));
if (Cools.isEmpty(locMast)) {
log.error("搴撲綅鍙蜂笉瀛樺湪" + locNo);
- return R.error("搴撲綅鍙蜂笉瀛樺湪" + locNo).add("搴撲綅鍙蜂笉瀛樺湪" + locNo);
+ result = R.error("搴撲綅鍙蜂笉瀛樺湪" + locNo).add("搴撲綅鍙蜂笉瀛樺湪" + locNo);
+ return result;
}
} catch (Exception e) {
log.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�" + e);
- return R.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�").add("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�" + e);
+ result = R.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�").add("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�" + e);
+ return result;
}
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_sts", "F")
.eq("loc_no", locNo)
.eq("barcode", param.getBarcode()));
if(Cools.isEmpty(locMast)){
- return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢"+param.getTargetPoint());
+ result = R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢" + param.getTargetPoint());
+ return result;
}
- return openService.taskCreate(param);
+ result = openService.taskCreate(param);
+ return result;
}catch (Exception e){
log.error("浠诲姟涓嬪彂寮傚父" + e);
return R.error();
+ }finally {
+ apiLogService.save("wms浠诲姟涓嬪彂鎺ュ彛"
+ ,request.getRemoteAddr()+request.getRequestURI()
+ ,""
+ ,request.getRemoteAddr()
+ ,JSON.toJSONString(param)
+ ,JSON.toJSONString(result)
+ ,true
+ );
}
}
--
Gitblit v1.9.1