From 52a57d1a6cd61009304656db35e50d4b9dbbda03 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期二, 01 七月 2025 11:16:40 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 127 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 115 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 4c5eb58..990db0d 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;
@@ -39,6 +40,12 @@
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private OpenService openService;
+
+ @Autowired
+ private StaDescService staDescService;
+
@Value("${wms.taskStatusFeedbackPath}")
private String taskStatusFeedbackPath;
@@ -61,7 +68,7 @@
try{
Integer wrkNo = null;
- Integer taskNo = null;
+ String taskNo = null;
Integer status = null;
Date modiTimeStart = null, modiTimeEnd = null;
for (Map.Entry<String, Object> entry : param.entrySet()) {
@@ -76,16 +83,16 @@
} else if (entry.getKey().equals("wrk_no")) {
wrkNo = Integer.parseInt(val);
} else if (entry.getKey().equals("task_no")) {
- taskNo = Integer.parseInt(val);
+ taskNo = val;
} else if (entry.getKey().equals("status")) {
status = Integer.parseInt(val);
}
}
-
- EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+//
+// EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
+// excludeTrash(param);
+// convert(param, wrapper);
+// if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
Page<TaskWrk> page = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList);
@@ -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){
@@ -161,6 +246,8 @@
taskWrk.setMemo("鎵嬪姩寮哄埗鍒犻櫎锛侊紒锛�");
taskWrk.setModiTime(now);
taskWrk.setModiUser(getUserId());
+ taskWrk.setCompleteTime(now);
+ taskWrk.setCancelTime(now);
if (!taskWrkService.updateById(taskWrk)){
log.error("鍒犻櫎澶辫触" + taskWrk);
return R.error("鍒犻櫎澶辫触" + taskWrk);
@@ -224,7 +311,7 @@
@ManagerAuth(memo = "鎵嬪姩瀹屾垚浠诲姟")
public R complete(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
- if (Cools.isEmpty(taskWrk) || taskWrk.getStatus()>=3){
+ if ((Cools.isEmpty(taskWrk) || taskWrk.getStatus()>=3) && !taskWrk.getStatus().equals(TaskStatusType.OVER3.id)){
return R.error("宸插畬缁撴垨宸插彇娑�") ;
}
LocMast locMast=new LocMast();
@@ -264,7 +351,7 @@
Date now = new Date();
locMast.setModiTime(now);
- taskWrk.setStatus(7);//鎵嬪姩瀹屾垚浠诲姟
+ taskWrk.setStatus(TaskStatusType.OVER2.id);//鎵嬪姩瀹屾垚浠诲姟
taskWrk.setModiTime(now);
taskWrk.setCompleteTime(now);
// try{
@@ -394,6 +481,22 @@
}
}
+ @PostMapping(value = "/taskWrk/assign/auth")
+ @ManagerAuth(memo = "杈撻�佺嚎涓嬪彂瀹屾垚")
+ public R returnAssign(@RequestParam String taskNo) {
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==1){
+ taskWrk.setStatus(TaskStatusType.RECEIVE.id);//娲惧彂鐘舵��
+ taskWrk.setWrkSts(2);
+ if(!taskWrkService.updateById(taskWrk)){
+ return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
+ }
+ return R.ok();
+ }else{
+ return R.error("浠诲姟鐘舵�佷笉瀵规棤娉曡烦杞�");
+ }
+
+ }
}
--
Gitblit v1.9.1