From 880794f63e27b64ae03c40afc55a34928d090d57 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 28 五月 2025 10:08:18 +0800
Subject: [PATCH] #ZH
---
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
index 8f1aeac..8c9ebc5 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -34,6 +34,7 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDateTime;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -143,9 +144,12 @@
try{
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("taskNo",taskWrk.getTaskNo());
- headParam.put("status",taskWrk.getStatus());
+ headParam.put("taskStatus",taskWrk.getStatusWms());
headParam.put("ioType",taskWrk.getIoTypeWms());
- headParam.put("barcode",taskWrk.getBarcode());
+ headParam.put("barCode",taskWrk.getBarcode());
+ headParam.put("reportTime", LocalDateTime.now());
+ headParam.put("weight",taskWrk.getScWeight().doubleValue());
+
// headParam.put("reportTime",new Date());
String response;
response = new HttpHandler.Builder()
@@ -253,12 +257,12 @@
@Override
- public List<TaskWrk> selectTaskWrkList(Integer wrkNo,Integer taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd, Integer curr, Integer limit) {
+ public List<TaskWrk> selectTaskWrkList(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd, Integer curr, Integer limit) {
return this.baseMapper.selectTaskWrkList(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd,curr,limit);
}
@Override
- public Long selectTaskWrkListTotal(Integer wrkNo,Integer taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd) {
+ public Long selectTaskWrkListTotal(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd) {
return this.baseMapper.selectTaskWrkListTotal(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd);
}
--
Gitblit v1.9.1