From 9716f3990efc8319fb8db3736b34481fac09a971 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 06 十一月 2025 08:05:03 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 1 +
src/main/webapp/views/mat/mat.html | 32 ++++++++++++++++----------------
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3 ---
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 12 ++++++++++++
4 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index 95b349c..372039f 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -160,6 +160,12 @@
if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
return R.error(BaseRes.PARAM);
}
+ if (waitPakin.getBarcode().length() != 8) {
+ throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + waitPakin.getBarcode());
+ }
+ if (Integer.parseInt(waitPakin.getBarcode().substring(0,1)) < 4 || Integer.parseInt(waitPakin.getBarcode().substring(0,1)) > 8 ){
+ throw new CoolException("涓嶅瓨鍦ㄧ殑鎵樼洏鐮佺被鍨�:"+waitPakin.getBarcode().substring(0,1));
+ }
mobileService.combToWms(waitPakin);
return R.ok("缁勬墭鎴愬姛");
}
@@ -171,6 +177,12 @@
if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
return R.error(BaseRes.PARAM);
}
+ if (waitPakin.getBarcode().length() != 8) {
+ throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + waitPakin.getBarcode());
+ }
+ if (Integer.parseInt(waitPakin.getBarcode().substring(0,1)) < 4 || Integer.parseInt(waitPakin.getBarcode().substring(0,1)) > 8 ){
+ throw new CoolException("涓嶅瓨鍦ㄧ殑鎵樼洏鐮佺被鍨�:"+waitPakin.getBarcode().substring(0,1));
+ }
Mat mat = matService.selectById(waitPakin.getModiUser());
MobileAdjustParam combParam=new MobileAdjustParam();
ArrayList<CombParam.CombMat> combMats=new ArrayList<>();
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 5025977..0d73b09 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -735,9 +735,6 @@
@Override
public void combToWms(WaitPakin waitPakin) {
- if (waitPakin.getBarcode().length() != 8) {
- throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + waitPakin.getBarcode());
- }
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", waitPakin.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", waitPakin.getBarcode()));
WrkMast wrkMast = wrkMastService.selectByBarcode(waitPakin.getBarcode());
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 8c93789..2a4feee 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -573,6 +573,7 @@
wrkMast.setAppeTime(now);
wrkMast.setModiUser(userId);
wrkMast.setModiTime(now);
+ wrkMast.setBarcode(locMast.getBarcode());
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 873c4f6..cbcc05f 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -195,16 +195,16 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍨嬫潗鍨嬪彿</label>
+ <label class="layui-form-label layui-form-required">鍟嗗搧鍚嶇О</label>
<div class="layui-input-block">
- <input name="maktx" placeholder="璇疯緭鍏ュ瀷鏉愬瀷鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ <input name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">妯″叿鍚嶇О</label>
+ <label class="layui-form-label">鍟嗗搧缂栫爜</label>
<div class="layui-input-block">
- <input name="matnr" placeholder="璇疯緭鍏ユā鍏峰悕绉�" class="layui-input">
+ <input name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鐮�" class="layui-input">
</div>
</div>
@@ -246,22 +246,22 @@
<!-- </div>-->
<!-- </div>-->
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">妯″瓟鏁�</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input name="length" placeholder="璇疯緭鍏ユā瀛旀暟" class="layui-input">-->
-<!-- </div>-->
-<!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label">鐘舵��</label>
+ <label class="layui-form-label">棰滆壊</label>
<div class="layui-input-block">
- <select id="color" name="color" lay-filter="color" placeholder="璇烽�夋嫨鐘舵��">
- <option value="">璇烽�夋嫨鐘舵��</option>
- <option value="姝ｅ父" name="color" class="layui-input">姝ｅ父</option>
- <option value="鎶ュ簾" name="color" class="layui-input">鎶ュ簾</option>
- </select>
+ <input name="color" placeholder="棰滆壊" class="layui-input">
</div>
</div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">棰滆壊</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <select id="color" name="color" lay-filter="color" placeholder="璇烽�夋嫨鐘舵��">-->
+<!-- <option value="">璇烽�夋嫨鐘舵��</option>-->
+<!-- <option value="姝ｅ父" name="color" class="layui-input">姝ｅ父</option>-->
+<!-- <option value="鎶ュ簾" name="color" class="layui-input">鎶ュ簾</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
--
Gitblit v1.9.1