From e7d62ae2a599f7f05d882c2eff825d4328e69187 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 26 二月 2025 10:25:01 +0800
Subject: [PATCH] 入库任务根据305站点任务号判断
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index abf55aa..0556712 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -261,10 +261,9 @@
} else if(param.getFlag() == 1) { // 鍏ュ簱璇锋眰wms寮�闂�
BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("Y")
- && basDevp.getInEnable().equals("Y")) { // 鍏ュ簱搴曞骇
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type",1)
- .eq("source_sta_no",305).lt("wrk_sts",3));
- if (wrkMast.getWhsType() == null) {
+ && basDevp.getInEnable().equals("Y") && basDevp.getWrkNo() <= 3000) { // 鍏ュ簱搴曞骇
+ WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
+ if (wrkMast == null || wrkMast.getWhsType() == null) {
throw new CoolException("娌℃湁鍏ュ簱浠诲姟");
} else if (wrkMast.getWhsType() == 1) {
WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
--
Gitblit v1.9.1