From aa146b6fad8f892752e832dc874c050e4375451c Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期日, 11 五月 2025 16:54:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index b145e8b..a8b9f79 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -87,9 +87,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) {
@@ -264,7 +264,7 @@
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("taskNo",taskWrk.getTaskNo());
headParam.put("status",taskWrk.getStatus());
- headParam.put("ioType",taskWrk.getIoType());
+ headParam.put("ioType",taskWrk.getIoTypeWms());
headParam.put("barcode",taskWrk.getBarcode());
// headParam.put("reportTime",new Date());
log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk);
@@ -323,7 +323,7 @@
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("taskNo",taskWrk.getTaskNo());
headParam.put("status",taskWrk.getStatus());
- headParam.put("ioType",taskWrk.getIoType());
+ headParam.put("ioType",taskWrk.getIoTypeWms());
headParam.put("barcode",taskWrk.getBarcode());
// headParam.put("reportTime",new Date());
@@ -377,6 +377,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