From a7a5c6df3617f879ed502be8a1895f4bf4be7559 Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期四, 18 八月 2022 13:39:56 +0800
Subject: [PATCH] Revert "#"
---
src/main/webapp/views/locMast/locMast_detail.html | 2 +-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 6 ++++--
src/main/webapp/static/js/stoMan/stoQue.js | 4 +++-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2 +-
4 files changed, 9 insertions(+), 5 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 b2d00ce..b6b3259 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -667,7 +667,7 @@
throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
}
locMast.setPackStatus(3);
- if (!locMastService.update(locMast, wrapper)){
+ if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");
}
}else if (Cools.isEmpty(testMast.getStatus())){
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 102f0bc..34ec9c5 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -521,8 +521,10 @@
throw new CoolException("浜у搧鍦ㄦ祴璇曚腑锛岀姝㈠簱浣嶇Щ鏍�");
// }else if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
// throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�");
- }else if(sourceLoc.getLocType1()!=loc.getLocType1()){
- throw new CoolException("婧愬簱涓轰笌鐩爣搴撲綅鐨勫簱浣嶇被鍨嬩笉鍚�");
+ }else if(sourceLoc.getPackStatus()!=3){
+ if(sourceLoc.getLocType1()!=loc.getLocType1()){
+ throw new CoolException("婧愬簱涓轰笌鐩爣搴撲綅鐨勫簱浣嶇被鍨嬩笉鍚�");
+ }
}
Date now = new Date();
// 鑾峰彇宸ヤ綔鍙�
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 3a4f55d..45f0d32 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -30,8 +30,10 @@
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'}
,{field: 'fireStatus$', align: 'center',title: '娑堥槻鐘舵��', width: 90, style: 'color: #8E2323'}
,{field: 'packStatus$', align: 'center',title: '浜у搧鐘舵��', width: 90, style: 'color: #8E2323'}
+ ,{field: 'locType1$', align: 'center',title: '搴撲綅绫诲瀷'}
+ ,{field: 'locType2$', align: 'center',title: '娴嬭瘯璁惧鍙�'}
// ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
- ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+ // ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�'}
,{field: 'bay1', align: 'center',title: '鍒�'}
,{field: 'lev1', align: 'center',title: '灞�'}
diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html
index 2d1bc76..9f4c82e 100644
--- a/src/main/webapp/views/locMast/locMast_detail.html
+++ b/src/main/webapp/views/locMast/locMast_detail.html
@@ -82,7 +82,7 @@
</div>
</div>
<div class="layui-inline" style="width:80%;">
- <label class="layui-form-label"><span class="not-null">*</span>娴嬭瘯鐘舵�侊細</label>
+ <label class="layui-form-label"><span class="not-null">*</span>浜у搧鐘舵�侊細</label>
<div class="layui-input-inline">
<select id="packStatus" class="layui-input" type="text">
<!-- <option style="display: none"></option>-->
--
Gitblit v1.9.1