From fcc24525fba4cbc27b0965bf18440efc38ad9150 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 12 五月 2025 17:07:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 3df677d..d0f9338 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -23,6 +23,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDateTime;
import java.util.*;
@RestController
@@ -87,9 +88,9 @@
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> page1 = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList);
- page1.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
- return R.ok(page1);
+ Page<TaskWrk> page = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList);
+ page.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
+ return R.ok(page);
// return R.ok(taskWrkService.selectPage(new Page<>(curr, limit), wrapper));
} catch (Exception e) {
@@ -263,10 +264,12 @@
try{
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("taskNo",taskWrk.getTaskNo());
- headParam.put("status",taskWrk.getStatus());
+ headParam.put("taskStatus",taskWrk.getStatus());
headParam.put("ioType",taskWrk.getIoTypeWms());
- headParam.put("barcode",taskWrk.getBarcode());
-// headParam.put("reportTime",new Date());
+ headParam.put("barCode",taskWrk.getBarcode());
+ headParam.put("reportTime", LocalDateTime.now());
+ headParam.put("weight",taskWrk.getScWeight().doubleValue());
+
log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk);
response = new HttpHandler.Builder()
// .setHeaders(headParam)
@@ -322,10 +325,12 @@
try{
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("taskNo",taskWrk.getTaskNo());
- headParam.put("status",taskWrk.getStatus());
+ headParam.put("taskStatus",taskWrk.getStatus());
headParam.put("ioType",taskWrk.getIoTypeWms());
- headParam.put("barcode",taskWrk.getBarcode());
-// headParam.put("reportTime",new Date());
+ headParam.put("barCode",taskWrk.getBarcode());
+ headParam.put("reportTime", LocalDateTime.now());
+ headParam.put("weight",taskWrk.getScWeight().doubleValue());
+
log.info("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wm={}", taskWrk);
response = new HttpHandler.Builder()
@@ -377,6 +382,7 @@
return R.ok();
} else if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==3) {
taskWrk.setWrkSts(2);
+ taskWrk.setStatus(TaskStatusType.RECEIVE.id);//娲惧彂鐘舵��
taskWrkService.updateById(taskWrk);
if(!taskWrkService.updateById(taskWrk)){
return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
--
Gitblit v1.9.1