From 546c6de55f2f4a1f3ceb9c3a7248c7d8afca3341 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 02 一月 2025 10:11:50 +0800
Subject: [PATCH] #大屏显示问题修复
---
zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml | 3 +--
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java | 2 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java | 3 ++-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java
index 714b842..7154197 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java
@@ -10,6 +10,8 @@
public class WaveTaskDetl implements Serializable {
private static final long serialVersionUID = 1L;
+ private Long id;
+
/**
* 浠诲姟鍗曞彿
*/
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
index 600ff2a..18ba37f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
@@ -226,7 +226,7 @@
return defaultLoc;
}
}
-
+ //fixme 濡傛灉娌℃湁鐩搁偦搴撲綅鏄惁鑰冭檻鎺ㄨ崘搴撲綅
if (ruleDetl.getDetlType().equals(ShelvesRuleDetlType.SUGGEST.id)) {
//鑾峰彇鎺ㄨ崘搴撲綅
List<Loc> suggestLoc = locUtils.getSuggestLoc(taskType, mat.getId(), batch, locTypeHeight, laneRowList, currentLev);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
index 5ae1ae3..5203a6f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
@@ -121,7 +121,8 @@
waveSeed.setOrderDetlId(orderDetl.getId());
waveSeed.setWaveId(taskDetl.getWaveId()).setWaveNo(taskDetl.getWaveNo());
waveSeed.setTaskDetlId(taskDetl.getId());
- waveSeed.setAnfme(taskDetl.getAnfme());
+ //fixme 纭鏄惁浣跨敤璁㈠崟鏄庣粏鏁伴噺
+ waveSeed.setAnfme(orderDetl.getAnfme());
waveSeed.setWorkQty(0D);
waveSeed.setMatnr(taskDetl.getMatnr());
waveSeed.setBatch(taskDetl.getBatch());
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
index cb36f39..1c278d0 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
@@ -19,11 +19,10 @@
<if test="taskNo != null and taskNo != ''">
AND mt.task_no = #{taskNo}
</if>
- GROUP BY mt.task_no, mtd.matnr
</select>
<select id="getTaskDetlQutify" resultType="com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl">
SELECT
- matnr,order_no, anfme ,wave_no, work_qty, batch
+ id,matnr,order_no, anfme ,wave_no, work_qty, batch
FROM
man_wave_seed
WHERE
--
Gitblit v1.9.1