From e82ebf78cdc2b0c0579f8bc00f9956ce4f76bffc Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 28 四月 2025 13:11:57 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OpenController.java | 7 ++++++-
src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 1 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..9846b25 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -93,8 +93,9 @@
//鍒涘缓浠诲姟
@PostMapping("/taskCreate")
+ @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();
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java b/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java
index d87cda4..4a68674 100644
--- a/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java
@@ -34,6 +34,27 @@
public TaskCreateParam(){};
+ public TaskCreateParam(String taskNo, Integer ioType, String barcode, String startPoint, Integer taskPriority, String targetPoint, String emptyContainer) {
+ this.taskNo = taskNo;
+ this.ioType = ioType;
+ this.barcode = barcode;
+ this.startPoint = startPoint;
+ this.taskPriority = taskPriority;
+ this.targetPoint = targetPoint;
+ this.emptyContainer = emptyContainer;
+ }
+
+ public TaskCreateParam(String taskNo, Integer ioType, String startPoint, Integer taskPriority, String targetPoint, String emptyContainer, String barcode, String memo) {
+ this.taskNo = taskNo;
+ this.ioType = ioType;
+ this.startPoint = startPoint;
+ this.taskPriority = taskPriority;
+ this.targetPoint = targetPoint;
+ this.emptyContainer = emptyContainer;
+ this.barcode = barcode;
+ this.memo = memo;
+ }
+
public TaskCreateParam(WMSAndAGVInterfaceParam param){
this.taskNo = param.getTaskNo();
this.ioType = convertParamIoType(param.getTaskType());
@@ -70,4 +91,20 @@
}
}
+ public void updateIoTyoe(Integer ioTypeOld){
+ switch (ioTypeOld){
+ case 1:
+ this.ioType = 2;
+ break;
+ case 2:
+ this.ioType = 3;
+ break;
+ case 3:
+ this.ioType = 1;
+ break;
+ default:
+ this.ioType = 3;
+ }
+ }
+
}
--
Gitblit v1.9.1