From 3d3fc58d20b03ad3a5bd6a40975608c8c8bf9e4c Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 02 九月 2025 08:52:21 +0800
Subject: [PATCH] WMS功能完善
---
src/main/webapp/views/wrkDetlLog/wrkDetlLog.html | 15 ++++++++++-----
src/main/java/com/zy/common/model/OutLocDto.java | 14 +++++++++++---
src/main/webapp/views/wrkMast/wrkMast.html | 2 +-
src/main/resources/mapper/LocDetlMapper.xml | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 4 ++++
5 files changed, 27 insertions(+), 10 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 cebb70d..8d9a908 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1246,6 +1246,10 @@
HashMap<String, Object> xx = new HashMap<>();
List<GwmsGenerateInventoryDto.MatList> matList = param.getMatList();
for (GwmsGenerateInventoryDto.MatList obj : matList) {
+ int zpalletCount2 = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("brand", obj.getPackageGroupNo()));
+ if (zpalletCount2 > 0) {
+ throw new CoolException("鍖呰缁勫彿宸插瓨鍦細" + obj.getPackageGroupNo());
+ }
if (xx.get(obj.getPackageGroupNo()) != null) {
throw new CoolException("鏄庣粏涓瓨鍦�2鏉＄浉鍚岀殑鍖呰缁勫彿锛�" + obj.getPackageGroupNo());
} else {
diff --git a/src/main/java/com/zy/common/model/OutLocDto.java b/src/main/java/com/zy/common/model/OutLocDto.java
index 77e050b..2282503 100644
--- a/src/main/java/com/zy/common/model/OutLocDto.java
+++ b/src/main/java/com/zy/common/model/OutLocDto.java
@@ -47,10 +47,18 @@
if (!Cools.eq(next.getLocDetl().getBatch(), locDetl.getBatch())) {
continue;
}
- if (next.getCount() > locDetl.getAnfme()) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ if (!Cools.isEmpty(locDetl.getAnfme())) {
+ if (next.getCount() > locDetl.getAnfme()) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
}
- if (next.getCount().equals(locDetl.getAnfme())) {
+ if (!locDetl.getMatnr().equalsIgnoreCase("绌虹")){
+ if (next.getCount().equals(locDetl.getAnfme())) {
+ sameNumber++;
+ iterator.remove();
+ break;
+ }
+ }else {
sameNumber++;
iterator.remove();
break;
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index bde6021..bcb05be 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -148,7 +148,7 @@
<if test="anfme!=null and anfme!='' ">
and a.anfme like concat('%' , #{anfme} , '%')
</if>
- <if test="startTime!=null and endTime!=null">
+ <if test="startTime!=null and endTime!=null and endTime!=''">
and a.modi_time between #{startTime} and #{endTime}
</if>
<if test="crnNo!=null and crnNo!='' ">
diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
index 754872d..b855c1a 100644
--- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
+++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
@@ -30,11 +30,16 @@
<input class="layui-input" type="text" name="matnr" placeholder="瑙勬牸" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="绠卞彿" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="brand" placeholder="鍖呰鍙�" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="unit" placeholder="绠卞彿" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="model" placeholder="鍗峰彿" autocomplete="off">
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index a00eb4c..53c9853 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -124,7 +124,7 @@
<a class="layui-btn layui-btn-danger layui-btn-xs btn-cancel" lay-event="complete">瀹屾垚</a>
<a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷</a>
- <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">缁存姢鐘舵��</a>
+<!-- <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">缁存姢鐘舵��</a>-->
{{#if (d.ioType === 103) { }}
<a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">鎷�</a>
--
Gitblit v1.9.1