From 98a6b90213f93fba289bdbdad177adfd9a2cc48c Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期四, 10 七月 2025 10:31:26 +0800
Subject: [PATCH] `1`
---
zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
index 654aad2..4575f99 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
@@ -109,7 +109,7 @@
// 鍒拌揪鎷ｉ�変綅锛屾帶鍒舵挱绉嶅浜伅
CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>()
.eq(CacheSite::getChannel, task.getTargetSite())
- .isNull(CacheSite::getOrderId).orderByAsc(CacheSite::getId));
+ .isNull(CacheSite::getOrderId).orderByAsc(CacheSite::getId),false);
// List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>()
// .eq(CacheSite::getBarcode, task.getBarcode()));
if(Objects.isNull(cacheSite)) {
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 545740d..86a19a2 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
@@ -13,7 +13,7 @@
</foreach>
</select>
<select id="getTaskDetlByTaskNo" resultType="com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl">
- SELECT mt.task_no,mtd.matnr, mtd.anfme ,mtd.wave_no, mt.site_no, mtd.stock, mtd.batch FROM man_task mt INNER JOIN
+ SELECT mt.task_no,mtd.matnr, mtd.anfme ,mtd.wave_no, mt.origin_site AS site_n4o, mtd.stock, mtd.batch FROM man_task mt INNER JOIN
man_task_detl mtd ON mt.id = mtd.task_id
WHERE 1 = 1
<if test="taskNo != null and taskNo != ''">
--
Gitblit v1.9.1