From abccd023bae40d5d8ad2fcdbf848b4240928414d Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 23 四月 2025 14:00:23 +0800
Subject: [PATCH] 更新取消任务接口
---
src/main/java/com/whyc/service/WmsService.java | 93 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 75 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/whyc/service/WmsService.java b/src/main/java/com/whyc/service/WmsService.java
index d9aa74d..3fc27d9 100644
--- a/src/main/java/com/whyc/service/WmsService.java
+++ b/src/main/java/com/whyc/service/WmsService.java
@@ -5,14 +5,12 @@
import com.google.gson.reflect.TypeToken;
import com.whyc.dto.*;
import com.whyc.pojo.db_abe_ram.AbeInf;
-import com.whyc.pojo.db_param.PageParam;
import com.whyc.pojo.db_wms.Task;
import com.whyc.util.HttpUtil;
import com.whyc.util.JsonUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import sun.applet.Main;
import java.util.Date;
import java.util.HashMap;
@@ -64,29 +62,78 @@
String dataStr = (String) response.getData();
WmsResponse responseInside = JsonUtil.getGson().fromJson(dataStr, WmsResponse.class);
response.set(1,responseInside);
- //瀵逛笅鍙戠殑浠诲姟杩涜鏁版嵁搴撳瓨鍌�
- Date date = new Date();
- List<String> pallets = palletDto.getPallets();
- List<String> taskNos = responseInside.getTask_no();
- for (int i = 0; i < pallets.size(); i++) {
- String pallet = pallets.get(i);
- String taskNo = taskNos.get(i);
+ if(responseInside.getCode() ==0) {
+ //瀵逛笅鍙戠殑浠诲姟杩涜鏁版嵁搴撳瓨鍌�
+ Date date = new Date();
+ List<String> pallets = palletDto.getPallets();
+ List<String> taskNos = responseInside.getTask_no();
+ for (int i = 0; i < pallets.size(); i++) {
+ String pallet = pallets.get(i);
+ String taskNo = taskNos.get(i);
+ Task task = new Task();
+ task.setTaskNo(taskNo);
+ task.setPallets(pallet);
+ task.setDes(palletDto.getDes());
+
+ if (palletDto.getDes() == 3) { //娲诲寲,濉叆娲诲寲鍙傛暟
+ List<String> activateParameter = palletDto.getActivateParameter();
+ task.setActivateParameter(String.join(",", activateParameter));
+ }
+ task.setCreateTime(date);
+
+ taskService.add(task);
+
+
+ }
+ }
+ }
+ return response;
+ }
+
+ public Response sendTaskInbound(WmsTaskDto taskDto) {
+ String httpUrl = "http://192.168.10.133:8051"+"/api/wms_task/inbound";
+ Response response = HttpUtil.doPost(httpUrl, JsonUtil.getGson().toJson(taskDto));
+ //瀵圭粨鏋滆繘琛屽鐞�
+ if(response.getCode() == 1){ //璇锋眰鎴愬姛,data鏈夋甯告暟鎹�
+ String dataStr = (String) response.getData();
+ WmsTaskResponse responseInside = JsonUtil.getGson().fromJson(dataStr, WmsTaskResponse.class);
+ response.set(1,responseInside);
+ if(responseInside.getCode() ==0) {
+ //瀵逛笅鍙戠殑浠诲姟杩涜鏁版嵁搴撳瓨鍌�
+ Date date = new Date();
+ String pallet = taskDto.getPallet_code();
+ String startLocationCode = taskDto.getStartlocation_code();
+ //1=鎼繍绌烘墭,2=鎼繍鐢垫睜. 杞寲鍒板瓧娈礑es涓�,1001=鎼繍绌烘墭,1002=鎼繍鐢垫睜
+ Integer type = taskDto.getType();
+ String taskNo = responseInside.getTask_no();
+
Task task = new Task();
task.setTaskNo(taskNo);
task.setPallets(pallet);
- task.setDes(palletDto.getDes());
+ task.setStartLocationCode(startLocationCode);
+ task.setDes(type ==1?1001:1002);
- if(palletDto.getDes()==3) { //娲诲寲,濉叆娲诲寲鍙傛暟
- List<String> activateParameter = palletDto.getActivateParameter();
- task.setActivateParameter(String.join(",", activateParameter));
- }
task.setCreateTime(date);
taskService.add(task);
}
+ }
+ return response;
+ }
+ public Response cancelTask(WmsTaskCancelDto stopDto) {
+ String httpUrl = "http://192.168.10.133:8051"+"/api/wms_task/force_send";
+ Response response = HttpUtil.doPost(httpUrl, JsonUtil.getGson().toJson(stopDto));
+ //瀵圭粨鏋滆繘琛屽鐞�
+ if(response.getCode() == 1){ //璇锋眰鎴愬姛,data鏈夋甯告暟鎹�
+ String dataStr = (String) response.getData();
+ WmsResponseTaskCancelDto responseInside = JsonUtil.getGson().fromJson(dataStr, WmsResponseTaskCancelDto.class);
+ response.set(1,responseInside);
+ /*if(responseInside.getCode() ==0) {
+
+ }*/
}
return response;
}
@@ -131,10 +178,16 @@
}
public Response sendTaskStatus(TaskDto taskDto) {
+ String taskNo = taskDto.getTask_no();
+ //閫氳繃taskNo浠庢暟鎹簱鏌ユ壘瀵瑰簲鐨勮褰�
+ Task taskInDB = taskService.getByTaskNo(taskNo);
+ if(taskInDB == null){
+ return new Response<>().setII(1,"浠诲姟涓婃姤澶辫触锛屾棤娉曞畾浣嶅埌浠诲姟锛屼换鍔″彲鑳戒笉鏄�氳繃鐩戞帶骞冲彴涓嬪彂");
+ }
Task task = new Task();
- task.setTaskNo(taskDto.getTask_no());
+ task.setTaskNo(taskNo);
task.setTaskType(taskDto.getTask_type());
- //TODO 杩欎釜鍦版柟璧峰鐐圭殑瀹氫箟,杩愯杩囩▼涓渶瑕佸叧娉�,浠ュ強缂栫爜瀵瑰簲鐨勫叿浣撲綅缃�,闇�瑕佷粬浠彁渚�
+ //杩欎釜鍦版柟璧峰鐐圭殑瀹氫箟,杩愯杩囩▼涓渶瑕佸叧娉�,浠ュ強缂栫爜瀵瑰簲鐨勫叿浣撲綅缃�,闇�瑕佷粬浠彁渚�
task.setStartLocationCode(taskDto.getStart_location_code());
task.setEndLocationCode(taskDto.getEnd_location_code());
@@ -142,7 +195,7 @@
task.setStatusTime(ThreadLocalUtil.parse(taskDto.getStatus_time(),1));
//瀵规帴鏀跺埌鐨勪换鍔¤繘琛岄�昏緫鍒ゆ柇鍜屾暟鎹瓨鍌�
- String taskNo = task.getTaskNo();
+ //String taskNo = task.getTaskNo();
//taskType=4,鍏ュ簱娴嬪帇浠诲姟,杩欎釜涓轰粨鍌ㄨ嚜鍔ㄨЕ鍙戠殑浠诲姟,闈炰富鍔ㄥ钩鍙颁笅杈�,
// 闇�瑕佹墜鍔ㄦ坊鍔犱换鍔＄被鍨�,鍜岀數姹犵粍缂栧彿
Integer taskType = task.getTaskType();
@@ -167,7 +220,7 @@
if(pallet == null){
pallet = taskService.getByTaskNo(taskNo).getPallets();
}*/
- String pallet = taskService.getByTaskNo(taskNo).getPallets();
+ String pallet = taskInDB.getPallets();
//鏇存柊鐢垫睜鍗曚綋缂栧彿鍜屼换鍔＄紪鍙�
AbeInf abeInf = abeInfService.get();
abeInf.setAbeMonId(Integer.valueOf(pallet));
@@ -177,7 +230,11 @@
task.setActivationChamberStartTime(statusTime);
}break;
case 14:
+ task.setActivationChamberPickUpTime(statusTime);break;
case 24:
+ //娴嬪帇浠诲姟,寮�濮嬪彇娴嬪帇缁撴潫鐨勭數姹�. 璇诲彇abe_inf琛ㄤ腑鐨勫唴闃�,鎻掑叆鍒颁换鍔￠噷
+ AbeInf abeInf = abeInfService.get();
+ task.setNowMonRes(abeInf.getNowMonRes());
task.setActivationChamberPickUpTime(statusTime);break;
case 15:
case 25:
--
Gitblit v1.9.1