From 2b0fb92e407df0c3abd0ed2f06ae7103c1569281 Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期四, 18 八月 2022 16:47:50 +0800
Subject: [PATCH] Revert "#"
---
src/main/webapp/views/locMast/locMast.html | 26 ++++++------
src/main/webapp/views/locMast/locMast_detail.html | 5 +-
src/main/java/com/zy/asrs/entity/TestMast.java | 2
src/main/java/com/zy/asrs/entity/LocMast.java | 14 +++---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 16 +++++--
5 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 1f3c032..7a82d5d 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -242,19 +242,19 @@
if (null == this.locType2){ return null; }
switch (this.locType2){
case 0:
- return "鏃犺澶�";
+ return "";
case 1:
- return "1鍙疯澶�";
+ return "1鍙�";
case 2:
- return "2鍙疯澶�";
+ return "2鍙�";
case 3:
- return "3鍙疯澶�";
+ return "3鍙�";
case 4:
- return "4鍙疯澶�";
+ return "4鍙�";
case 5:
- return "5鍙疯澶�";
+ return "5鍙�";
case 6:
- return "6鍙疯澶�";
+ return "6鍙�";
default:
return String.valueOf(this.locType2);
}
diff --git a/src/main/java/com/zy/asrs/entity/TestMast.java b/src/main/java/com/zy/asrs/entity/TestMast.java
index 6f6cfde..b0bd69f 100644
--- a/src/main/java/com/zy/asrs/entity/TestMast.java
+++ b/src/main/java/com/zy/asrs/entity/TestMast.java
@@ -53,7 +53,7 @@
/**
* 鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍�;3 4: 瀹屾垚
*/
- @ApiModelProperty(value= "鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍� 3锛氭祴璇曚腑 4: 瀹屾垚 ")
+ @ApiModelProperty(value= "鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍� 3: 娴嬭瘯涓� 4: 瀹屾垚 ")
private Integer status;
/**
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 b6b3259..50f8bb7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -602,10 +602,11 @@
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(1.0); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setManuDate(requestTime.toString());
waitPakin.setAppeUser(null);
- waitPakin.setAppeTime(requestTime);
+ waitPakin.setAppeTime(new Date());
waitPakin.setModiUser(null);
- waitPakin.setModiTime(requestTime);
+ waitPakin.setModiTime(new Date());
waitPakin.setDeadWarn(param.getSettingTimes());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
@@ -615,11 +616,14 @@
@Override
@Transactional
public void infoReview(Review review) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
+ if (!review.getBarcode().equals(locMast.getBarcode())){
+ throw new CoolException("pack鐮佷笉鍚�");
+ }
Wrapper wrapper = new EntityWrapper<TestMast>()
.eq("loc_no", review.getLocNo())
.eq("barcode", review.getBarcode())
.eq("user_Id", review.getUserId());
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
if (null == locMast ||locMast.getPackStatus()!=1) {
throw new CoolException("浜у搧鐘舵�佷笉鏄� 1:寰呮祴璇�");
}
@@ -641,7 +645,7 @@
throw new CoolException("鐘舵�佷笉鏄� 1:鐢宠涓�");
}
} else {
- throw new CoolException("娴嬭瘯鐢宠澶辫触");
+ throw new CoolException("娴嬭瘯鐢宠澶嶆牳澶辫触");
}
}
@@ -655,8 +659,10 @@
.eq("barcode", review.getBarcode())
.eq("user_Id", review.getUserId());
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
- if (locMast.getPackStatus()!=2){
+ if (null == locMast ||locMast.getPackStatus()!=2){
throw new CoolException("浜у搧鐘舵�佷笉鏄� 2:娴嬭瘯涓�");
+ }else if (!review.getBarcode().equals(locMast.getBarcode())){
+ throw new CoolException("pack鐮佷笉鍚�");
}
TestMast testMast = testMastService.selectOne(wrapper);
if(null != testMast){
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index 4ed082d..1e147cf 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -65,12 +65,12 @@
<!-- <option style="display: none"></option>-->
<option value="">璁惧鍙�</option>
<option value="0">闈欑疆搴撲綅</option>
- <option value="1">1鍙疯澶�</option>
- <option value="2">2鍙疯澶�</option>
- <option value="3">3鍙疯澶�</option>
- <option value="4">4鍙疯澶�</option>
- <option value="5">5鍙疯澶�</option>
- <option value="6">6鍙疯澶�</option>
+ <option value="1">1鍙�</option>
+ <option value="2">2鍙�</option>
+ <option value="3">3鍙�</option>
+ <option value="4">4鍙�</option>
+ <option value="5">5鍙�</option>
+ <option value="6">6鍙�</option>
</select>
</div>
</div>
@@ -173,13 +173,13 @@
<div class="layui-input-inline">
<select name="locType2">
<option style="display: none"></option>
- <option value="0">鏈煡</option>
- <option value="1">1鍙疯澶�</option>
- <option value="2">2鍙疯澶�</option>
- <option value="3">3鍙疯澶�</option>
- <option value="4">4鍙疯澶�</option>
- <option value="5">5鍙疯澶�</option>
- <option value="6">6鍙疯澶�</option>
+ <option value="0"></option>
+ <option value="1">1鍙�</option>
+ <option value="2">2鍙�</option>
+ <option value="3">3鍙�</option>
+ <option value="4">4鍙�</option>
+ <option value="5">5鍙�</option>
+ <option value="6">6鍙�</option>
</select>
</div>
</div>
diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html
index 9f4c82e..55ee17e 100644
--- a/src/main/webapp/views/locMast/locMast_detail.html
+++ b/src/main/webapp/views/locMast/locMast_detail.html
@@ -89,8 +89,9 @@
<option value="0">鏃�</option>
<option value="1">寰呮祴</option>
<option value="2">娴嬭瘯涓�</option>
- <option value="3">闈欑疆涓�</option>
- <option value="4">闈欑疆瀹屾垚</option>
+ <option value="3">娴嬭瘯瀹屾垚</option>
+ <option value="4">闈欑疆涓�</option>
+ <option value="5">闈欑疆瀹屾垚</option>
</select>
</div>
</div>
--
Gitblit v1.9.1