From 1bde682d9149b5b55488cfaa277ec1deacab4bee Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 30 四月 2025 08:57:11 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OpenController.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6548830..fbc8ff3 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -92,9 +92,10 @@
}
//鍒涘缓浠诲姟
- @PostMapping("/taskCreate")
+ @PostMapping("/taskCreate2")
+ @AppAuth(memo = "WMS浠诲姟涓嬪彂")
@Transactional
- public R taskCreate(@RequestHeader String appkey,
+ public synchronized R taskCreate(@RequestHeader String appkey,
@RequestBody List<TaskCreateParam> param1,
HttpServletRequest request) {
auth(appkey, param1, request);
@@ -105,15 +106,19 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
+
if (Cools.isEmpty(param.getTaskNo())) {
return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getIoType())) {
return R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
}
+ param.updateIoTyoe(param.getIoType());//涓埅涓嬪彂 1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴� ====杞崲涓�====> 1锛氬叆搴擄紝2锛氬嚭搴擄紝3锛氱Щ搴�
+
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
}
+
String locNo=null;
if(param.getIoType()==1){
locNo=param.getTargetPoint();
@@ -327,9 +332,9 @@
}
//浠诲姟涓嬪彂鎺ュ彛
- @PostMapping("/outboundTaskSend")
-// @PostMapping("/taskCreate")
-// @AppAuth(memo = "浠诲姟涓嬪彂鎺ュ彛")
+// @PostMapping("/outboundTaskSend")
+ @PostMapping("/taskCreate")
+ @AppAuth(memo = "浠诲姟涓嬪彂鎺ュ彛")
@Transactional
public R outboundTaskSend(@RequestHeader String appkey,
@RequestBody List<CarryParam> params,//涓埅涓嬪彂 1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴�
@@ -361,7 +366,14 @@
// }
// }
- LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
+
+ String locNo=null;
+ if(param.getIoType()==1){
+ locNo=param.getTargetPoint();
+ }else{
+ locNo=param.getStartPoint();
+ }
+ LocMast locMast = locMastService.selectByLocNo(locNo);
if(Cools.isEmpty(locMast)){
return R.error("鍒濆搴撲綅鏃犳硶鎵惧埌");
}
--
Gitblit v1.9.1