From 89b1a2adfd4af48b5a084a8cf1857362bf7dd323 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期三, 08 一月 2025 17:13:58 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 1 +
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2 +-
src/main/java/com/zy/common/web/WcsController.java | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 0233577..d136157 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -672,7 +672,7 @@
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
- waitPakin.setBatch(detlDto.getBatch());
+ waitPakin.setBatch(DateUtils.convert(new Date(), DateUtils.yyyyMMdd));
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
// waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index a85016a..78c3d36 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -207,7 +208,7 @@
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
- waitPakin.setBatch("");
+ waitPakin.setBatch(DateUtils.convert(new Date(), DateUtils.yyyyMMdd));
// waitPakin.setWeight(basDevp.getGrossWt());
waitPakin.setWeight(450.0);
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 702ede2..8edcc78 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -80,6 +80,7 @@
or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_sts=15 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_sts=15 and io_type = 110 and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and io_type = 101 and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
order by io_time,wrk_no asc
</select>
--
Gitblit v1.9.1