From 4b2559d7c694e4cbdc7c200bca951f6110b3799e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 25 四月 2022 13:49:21 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderDetlMapper.xml | 11 +++--------
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 3 +++
src/main/java/com/zy/common/model/MesPakoutParam.java | 5 ++++-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index a418ebe..86e9186 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -304,6 +304,9 @@
for (LocDto locDto : taskDto.getLocDtos()) {
if (locDto.getAnfme()==null || locDto.getAnfme() <= 0.0D) { continue; }
OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
+ if (orderDetl == null) {
+ orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
+ }
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(orderDetl);
wrkDetl.setIoTime(now);
diff --git a/src/main/java/com/zy/common/model/MesPakoutParam.java b/src/main/java/com/zy/common/model/MesPakoutParam.java
index c59b573..e9a9449 100644
--- a/src/main/java/com/zy/common/model/MesPakoutParam.java
+++ b/src/main/java/com/zy/common/model/MesPakoutParam.java
@@ -11,7 +11,10 @@
@Data
public class MesPakoutParam {
- // 鍏ュ簱鏃堕棿
+ // 鍗曟嵁缂栧彿
+ private String orderNo;
+
+ // 鍑哄簱鏃堕棿
private String pakoutTime;
// 鏉ユ簮鍦� - 鍐欐
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index f57cc3f..5d5fa60 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -69,14 +69,9 @@
where 1=1
and order_no = #{orderNo}
and matnr = #{matnr}
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
+ <if test="batch!=null and batch!='' ">
+ and batch = #{batch}
+ </if>
</select>
<select id="selectWorkingDetls" resultMap="BaseResultMap">
--
Gitblit v1.9.1