From 7c75c8b98bb06517bacd809e01ad29ab77b2f2dc Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 五月 2025 15:53:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 91 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 88 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index ec82562..856ae84 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -8,10 +8,11 @@
import com.core.common.DateUtils;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.TaskWrkService;
+import com.zy.asrs.entity.param.CarryParam;
+import com.zy.asrs.entity.param.TaskCreateParam;
+import com.zy.asrs.service.*;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -38,6 +39,12 @@
@Autowired
private LocMastService locMastService;
+
+ @Autowired
+ private OpenService openService;
+
+ @Autowired
+ private StaDescService staDescService;
@Value("${wms.taskStatusFeedbackPath}")
private String taskStatusFeedbackPath;
@@ -147,6 +154,84 @@
return R.ok();
}
+ @RequestMapping(value = "/taskWrk/addTask/auth")
+ @ManagerAuth
+ public R addTaskPoint(CarryParam param){
+ try{
+ param.updateIoTyoe(param.getIoType());//涓埅涓嬪彂 1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴� ====杞崲涓�====> 1锛氬叆搴擄紝2锛氬嚭搴擄紝3锛氱Щ搴�
+ param.updateLocNo();
+ if (Cools.isEmpty(param)){
+ return R.error("鍙傛暟涓虹┖锛�");
+ } else if (Cools.isEmpty(param.getTaskNo())){
+ return R.error("浠诲姟鍙蜂负绌猴紒");
+ } else if (Cools.isEmpty(param.getIoType())){
+ return R.error("浠诲姟绫诲瀷涓虹┖锛�");
+ }
+ if (Cools.isEmpty(param.getStartPoint()) || Cools.isEmpty(param.getTargetPoint())){
+ return R.error("鍒濆鐩爣鎴栬�呯洰鏍囦綅涓虹┖");
+ }
+
+
+ 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("鍒濆搴撲綅鏃犳硶鎵惧埌");
+ }
+
+ R r = null;
+
+ if(param.getIoType() == 1){
+ //鍏ュ簱浠诲姟鍒涘缓
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("type_no",1)
+ .eq("crn_no",locMast.getCrnNo())
+ .eq("stn_no",param.getStartPoint()));
+ if(Cools.isEmpty(staDesc)){
+ return R.error("鍏ュ簱璺姴涓嶅瓨鍦�");
+ }
+ r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo(),staDesc.getCrnStn()));
+
+ }else if(param.getIoType() == 2){
+ //鍑哄簱浠诲姟鍒涘缓
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("type_no",2)
+ .eq("crn_no",locMast.getCrnNo())
+ .eq("stn_no",param.getTargetPoint()));
+ if(Cools.isEmpty(staDesc)){
+ return R.error("鍑哄簱璺姴涓嶅瓨鍦�");
+ }
+ r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo(),staDesc.getStnNo()));
+ }else if (param.getIoType() == 3){
+ LocMast locMast2 = locMastService.selectByLocNo(param.getTargetPoint());
+ if(Cools.isEmpty(locMast2)){
+ return R.error("鐩爣搴撲綅鏃犳硶鎵惧埌");
+ }
+ if (!locMast2.getCrnNo().equals(locMast.getCrnNo())){
+ return R.error("璧峰搴撲綅涓庣洰鏍囧簱浣嶄笉鍐嶅悓涓�宸烽亾");
+ }
+ //绉诲簱浠诲姟鍒涘缓
+ r = openService.taskCreate(new TaskCreateParam(param,locMast.getCrnNo()));
+ }
+
+ apiLogService.save("wcs鎵嬪姩鐢熸垚Wms浠诲姟"
+ ,request.getRemoteAddr()+request.getRequestURI()
+ ,null
+ ,request.getRemoteAddr()
+ ,JSON.toJSONString(param)
+ ,r.toString()
+ ,true
+ );
+ } catch (Exception e){
+
+ }
+ return R.ok();
+ }
+
@RequestMapping(value = "/taskWrk/delete/auth")
@ManagerAuth
public R delete(@RequestParam String taskNo){
--
Gitblit v1.9.1