From 9d7bfe8cf15f1b34a87351560f39662d9e141cce Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期二, 20 一月 2026 11:09:37 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 40c5155..27814e8 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -136,7 +136,7 @@
crnCommand.setDestinationPosX(Utils.getRowShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鎺�
- crnCommand.setCommand((short)1);
+// crnCommand.setCommand((short)1);
if (!MessageQueue.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(5, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
@@ -144,7 +144,7 @@
try{
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("taskNo",taskWrk.getTaskNo());
- headParam.put("taskStatus",taskWrk.getStatus());
+ headParam.put("taskStatus",taskWrk.getStatusWms());
headParam.put("ioType",taskWrk.getIoTypeWms());
headParam.put("barCode",taskWrk.getBarcode());
headParam.put("reportTime", LocalDateTime.now());
@@ -210,7 +210,7 @@
crnCommand.setDestinationPosX(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(crnStn.getLev().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(crnStn.getRow().shortValue()); // 鐩爣搴撲綅灞�
- crnCommand.setCommand((short)1);
+// crnCommand.setCommand((short)1);
if (!MessageQueue.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(5, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
@@ -257,13 +257,13 @@
@Override
- public List<TaskWrk> selectTaskWrkList(Integer wrkNo,Integer taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd, Integer curr, Integer limit) {
- return this.baseMapper.selectTaskWrkList(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd,curr,limit);
+ public List<TaskWrk> selectTaskWrkList(Integer wrkNo,String taskNo,Integer status, String barcode,String startPoint,String targetPoint,String allField,Date modiTimeStart,Date modiTimeEnd, Integer curr, Integer limit) {
+ return this.baseMapper.selectTaskWrkList(wrkNo,taskNo, status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd,curr,limit);
}
@Override
- public Long selectTaskWrkListTotal(Integer wrkNo,Integer taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd) {
- return this.baseMapper.selectTaskWrkListTotal(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd);
+ public Long selectTaskWrkListTotal(Integer wrkNo,String taskNo,Integer status, String barcode,String startPoint,String targetPoint,String allField,Date modiTimeStart,Date modiTimeEnd) {
+ return this.baseMapper.selectTaskWrkListTotal(wrkNo,taskNo, status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd);
}
--
Gitblit v1.9.1