From c8a2aee3eb27a1ee7ee21a298b869b2f4fb053f0 Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期一, 26 六月 2023 23:09:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 1 -
src/main/webapp/static/js/stoMan/stoQue.js | 19 ++++++++++---------
src/main/java/com/zy/common/service/CommonService.java | 6 +++---
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 097598f..1956e72 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -700,7 +700,6 @@
for (LocMast mast : insideLocMast) {
if (!mast.getLocSts().equals("D")
&& !mast.getLocSts().equals("F")
- && !mast.getLocSts().equals("O")
&& !mast.getLocSts().equals("X")) {
//D銆丗銆乆(涓嶈兘閫夊畾杩欎釜澶栦晶搴撲綅)
return true;
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 38f1ca2..f70ed5b 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -126,7 +126,7 @@
//103绔欏垎閰�1锛�2鍫嗗灈鏈�
crnNos.add(1);
-// crnNos.add(2);
+ crnNos.add(2);
//鍒嗛厤1锛�7锛�8锛�14鎺�
rows.add(1);
@@ -141,7 +141,7 @@
end = 21;
//203绔欏垎閰�2锛�3鍫嗗灈鏈�
-// crnNos.add(2);
+ crnNos.add(2);
crnNos.add(3);
//鍒嗛厤8锛�14锛�15锛�21鎺�
@@ -171,7 +171,7 @@
}
//3鍙峰彲浠ュ叆搴撳墠蹇呴』鎵撳紑鎺у埗
- if (!Cools.isEmpty(matNos) && crnNo != 2) {
+ if (!Cools.isEmpty(matNos)) {
for (String matNo : matNos) {
Mat mat = matService.selectByMatnr(matNo);
if (matType == null) {
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index e9fd9de..0f20b49 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -30,16 +30,17 @@
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'}
// ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
- ,{field: 'row1', align: 'center',title: '鎺�'}
- ,{field: 'bay1', align: 'center',title: '鍒�'}
- ,{field: 'lev1', align: 'center',title: '灞�'}
- ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
- var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- if(row.fullPlt === 'Y'){html += " checked ";}
- html += "disabled='disabled' >";
- return html;
- },width:80}
+ // ,{field: 'row1', align: 'center',title: '鎺�'}
+ // ,{field: 'bay1', align: 'center',title: '鍒�'}
+ // ,{field: 'lev1', align: 'center',title: '灞�'}
+ // ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
+ // var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ // if(row.fullPlt === 'Y'){html += " checked ";}
+ // html += "disabled='disabled' >";
+ // return html;
+ // },width:80}
,{field: 'frozen$', align: 'center',title: '鍐荤粨鐘舵��'}
+ ,{field: 'locType2$', align: 'center',title: '搴撲綅绫诲瀷'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180}
,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
--
Gitblit v1.9.1