From e1ac2ad822d9adc007505be6fc89fd4afba696ba Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 07 四月 2025 11:32:40 +0800
Subject: [PATCH] 更新上报
---
src/main/java/com/whyc/service/WmsService.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/WmsService.java b/src/main/java/com/whyc/service/WmsService.java
index 945e5c7..71c456e 100644
--- a/src/main/java/com/whyc/service/WmsService.java
+++ b/src/main/java/com/whyc/service/WmsService.java
@@ -132,10 +132,16 @@
}
public Response sendTaskStatus(TaskDto taskDto) {
+ String taskNo = taskDto.getTask_no();
+ //閫氳繃taskNo浠庢暟鎹簱鏌ユ壘瀵瑰簲鐨勮褰�
+ Task taskInDB = taskService.getByTaskNo(taskNo);
+ if(taskInDB == null){
+ return new Response<>().set(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());
@@ -143,7 +149,7 @@
task.setStatusTime(ThreadLocalUtil.parse(taskDto.getStatus_time(),1));
//瀵规帴鏀跺埌鐨勪换鍔¤繘琛岄�昏緫鍒ゆ柇鍜屾暟鎹瓨鍌�
- String taskNo = task.getTaskNo();
+ //String taskNo = task.getTaskNo();
//taskType=4,鍏ュ簱娴嬪帇浠诲姟,杩欎釜涓轰粨鍌ㄨ嚜鍔ㄨЕ鍙戠殑浠诲姟,闈炰富鍔ㄥ钩鍙颁笅杈�,
// 闇�瑕佹墜鍔ㄦ坊鍔犱换鍔＄被鍨�,鍜岀數姹犵粍缂栧彿
Integer taskType = task.getTaskType();
@@ -168,7 +174,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));
--
Gitblit v1.9.1