From a41ab7e1c5a486c785545755f02afed2c6805a50 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 16 三月 2026 10:38:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxhcasrs' into jxhcasrs
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 2 +-
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 17 ++++++++++++-----
src/main/resources/mapper/OrderDetlPakoutMapper.xml | 8 ++++----
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index c446587..9121617 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -104,11 +104,18 @@
continue;
}
Integer crnNo = wrkMast.getCrnNo();
- //璇ュ爢鍨涙満宸茬粡涓嬪彂浠诲姟缁檞cs鍚庝笉鍐嶄笅鍙戞柊鐨勬惉杩愪换鍔�
- List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("wrk_sts", Arrays.asList(12L)));
- if (!wrkMasts1.isEmpty()) {
- continue;
- }
+ //濡傛灉浠诲姟鏄Щ搴撲换鍔℃椂锛氳鍫嗗灈鏈哄凡缁忎笅鍙戜换鍔＄粰wcs鍚庝笉鍐嶄笅鍙戞柊鐨勬惉杩愪换鍔�
+ if(wrkMast.getIoType()==101&&!Cools.isEmpty(wrkMast.getLocNo())){
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("crn_no", crnNo).eq("loc_no", wrkMast.getLocNo()));
+ if (!Cools.isEmpty(locMast)) {
+ List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("wrk_sts", Arrays.asList(12L)));
+ if (!wrkMasts1.isEmpty()) {
+ continue;
+ }
+ }
+
+ }
+
//婧愬簱浣嶄负鍐荤粨搴撲綅鏃剁姝笅鍙戞惉杩愪换鍔＄粰鍫嗗灈鏈�
if (!Cools.isEmpty(wrkMast.getSourceLocNo())) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index c3c92c3..12d8020 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -145,7 +145,7 @@
Double v = Math.round((selectOne.getStockQty() - selectOne.getAnfme()) * 10000) / 10000.0;
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), null, null, null, null,
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), "", "", "", "",
null, null, null);
if (!Objects.isNull(orderDetlPakout)) {
diff --git a/src/main/resources/mapper/OrderDetlPakoutMapper.xml b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
index 96844e9..2dde019 100644
--- a/src/main/resources/mapper/OrderDetlPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
@@ -60,9 +60,9 @@
<if test="brand != null and brand != ''">
and brand = #{brand}
</if>
-<!-- <if test="standby1 != null and standby1 != ''">-->
-<!-- and standby1 = #{standby1}-->
-<!-- </if>-->
+ <if test="standby1 != null and standby1 != ''">
+ and standby1 = #{standby1}
+ </if>
<if test="standby2 != null and standby2 != ''">
and standby2 = #{standby2}
</if>
@@ -84,7 +84,7 @@
</select>
<select id="selectItemByOrderNo" resultMap="BaseResultMap">
- select * from man_order_detl_pakout
+ select top 1 * from man_order_detl_pakout
where 1=1
and order_no = #{orderNo}
and matnr = #{matnr}
--
Gitblit v1.9.1