From b610e067cf2c44fdcc99ec3a3190820d1a5b7bcb Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 10 一月 2024 16:55:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 106 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 46ee865..2ec6529 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -16,6 +16,8 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.utils.SaasUtils;
+import com.zy.asrs.utils.Utils;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -23,7 +25,11 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.*;
+
+import static com.zy.asrs.entity.param.TaskStatusFeedbackParam.getTaskType;
@RestController
@Slf4j
@@ -90,7 +96,7 @@
@RequestMapping(value = "/taskWrk/updatePoint/auth")
@ManagerAuth
- public R updatePoint(TaskWrk taskWrk){
+ public R updatePoint(TaskWrk taskWrk) throws UnknownHostException {
if (Cools.isEmpty(taskWrk) || null == taskWrk.getTaskNo()) {
return R.error();
}
@@ -98,10 +104,25 @@
if (taskWrk1 == null) {
return R.error();
}
+ InetAddress localHost = InetAddress.getLocalHost();
+ String ipAddress = localHost.getHostAddress();
+
+ SaasUtils.insertLog(1,taskWrk1.getStartPoint()+"-"+taskWrk1.getTargetPoint(),taskWrk.getStartPoint()+"-"+taskWrk.getTargetPoint(), ipAddress,getUser().getUsername());
+
+
taskWrk1.setStartPoint(taskWrk.getStartPoint());
taskWrk1.setTargetPoint(taskWrk.getTargetPoint());
+ if (taskWrk1.getIoType() == 1){
+ taskWrk1.setOriginTargetPoint(Utils.getWmsLocNo(taskWrk.getTargetPoint()));
+ } else if (taskWrk1.getIoType() == 2) {
+ taskWrk1.setOriginStartPoint(Utils.getWmsLocNo(taskWrk.getStartPoint()));
+ } else if (taskWrk1.getIoType() == 3) {
+ taskWrk1.setOriginTargetPoint(Utils.getWmsLocNo(taskWrk.getTargetPoint()));
+ taskWrk1.setOriginStartPoint(Utils.getWmsLocNo(taskWrk.getStartPoint()));
+ }
taskWrk1.setModiTime(new Date());
taskWrk1.setModiUser(getUserId());
+
taskWrkService.updateById(taskWrk1);
return R.ok();
}
@@ -246,21 +267,64 @@
if (taskWrk == null) {
return R.error();
}
- if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
- return R.error(taskWrk.getTaskNo() + "宸茶鍙栨秷");
+ String wmsCancelledtask = toWmsCancelledtask(taskWrk);
+ JSONObject jsonObject = JSON.parseObject(wmsCancelledtask);
+ if (Cools.isEmpty(jsonObject)){
+ return R.error("瓒呮椂鎴栨湭鐭ラ敊璇�");
}
- Date now = new Date();
- taskWrk.setStatus(TaskStatusType.CANCEL.id);
- taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
- try{
- taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
- }catch (Exception e){
- taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
+ if (jsonObject.getInteger("code").equals(200)){
+ if (!taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no",taskNo))){
+ return R.error("鍒犻櫎浠诲姟澶辫触");
+ }
+ }else if (jsonObject.getInteger("code").equals(500)){
+ return R.error(jsonObject.get("msg").toString());
+ }else {
+ return R.error("瓒呮椂鎴栨湭鐭ラ敊璇�");
}
- taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
- taskWrkService.updateById(taskWrk);
+
return R.ok();
}
+
+ public String toWmsCancelledtask(TaskWrk taskWrk){
+ Map<String, Object> map = new HashMap<>();
+ map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
+ TaskOverToWms taskOverToWms = new TaskOverToWms();
+ taskOverToWms.setFeedbackFrom("WCS"); //鏉ユ簮
+ taskOverToWms.setWarehouseId("1688469798893297665"); //浠撳簱鏍囪瘑
+ taskOverToWms.setTaskNo(taskWrk.getTaskNo()); //浠诲姟鍙�
+ taskOverToWms.setTaskType(getTaskType(taskWrk.getIoType())); // 浠诲姟绫诲瀷
+ taskOverToWms.setContainerCode(taskWrk.getBarcode()); // 瀹瑰櫒缂栫爜
+ if (taskWrk.getIoType() ==1 ){
+ taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
+ taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
+ }else if (taskWrk.getIoType() ==2){
+ Map<Integer,String> map1 = new HashMap<>();
+ map1.put(102,"J-1101");
+ map1.put(106,"J-1103");
+ map1.put(110,"J-1105");
+ map1.put(114,"J-1107");
+ map1.put(118,"J-1109");
+ map1.put(122,"J-1111");
+ taskOverToWms.setEquipmentCode(map1.get(taskWrk.getTargetPoint())); //璁惧缂栫爜
+ taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //婧愬簱浣�
+ }
+
+ taskOverToWms.setTaskStatus("cancelled"); //浠诲姟鐘舵��
+ String response = null;
+ try {
+ response = new HttpHandler.Builder()
+ .setHeaders(map)
+ .setUri(wmsUrl)
+ .setPath("wcsManager/wcsInterface/taskStatusFeedback")
+ .setJson(JSON.toJSONString(taskOverToWms))
+ .build()
+ .doPost();
+ }catch (Exception e){
+ log.error("wms杩炴帴澶辫触");
+ }
+ return response;
+ }
+
@PostMapping(value = "/taskWrk/updateCommandStep")
@ManagerAuth(memo = "鏇存柊姝ュ簭")
@@ -276,6 +340,36 @@
taskWrkService.updateById(taskWrk);
return R.ok();
}
+ @PostMapping(value = "/taskWrk/upIoPri")
+ public R upIoPri(@RequestParam String taskNo){
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk.getIoPri() > 300){
+ return R.error("浼樺厛绾у凡鏈�楂�");
+ }
+ Map<Integer,Integer> map = new HashMap<>();
+ map.put(100,200);map.put(200,300);map.put(300,400);
+ Integer pri = map.get(taskWrk.getIoPri());
+ taskWrk.setIoPri(pri);
+ if (!taskWrkService.updateById(taskWrk)){
+ return R.error("澧炲姞浼樺厛绾уけ璐�");
+ }
+ return R.ok();
+ }
+ @PostMapping(value = "/taskWrk/downIoPri")
+ public R downIoPri(@RequestParam String taskNo){
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk.getIoPri() <200){
+ return R.error("浼樺厛绾у凡鏈�浣�");
+ }
+ Map<Integer,Integer> map = new HashMap<>();
+ map.put(200,100);map.put(300,200);map.put(400,300);
+ Integer pri = map.get(taskWrk.getIoPri());
+ taskWrk.setIoPri(pri);
+ if (!taskWrkService.updateById(taskWrk)){
+ return R.error("闄嶄綆浼樺厛绾уけ璐�");
+ }
+ return R.ok();
+ }
public static String getTaskType(Integer paramIoType){
switch (paramIoType){
--
Gitblit v1.9.1