From 088106d0d8a844b68a1e087a44b5eda350e8706a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 20 八月 2020 15:17:10 +0800
Subject: [PATCH] #通知档完善
---
src/main/java/com/zy/asrs/task/handler/NotifyLogHandler.java | 4 ++--
src/main/webapp/static/js/waitPakin/waitPakin.js | 10 +++++-----
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 4 ++--
src/main/webapp/static/js/waitPakinLog/waitPakinLog.js | 10 +++++-----
5 files changed, 16 insertions(+), 16 deletions(-)
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 aa619aa..d78a656 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -36,7 +36,7 @@
throw new CoolException(BaseRes.PARAM);
}
int count = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("status", "N"));
+ eq("zpallet", param.getBarcode()).eq("io_status", "N"));
if (count > 0) {
throw new CoolException("鏉＄爜鏁版嵁宸插瓨鍦�");
}
@@ -47,7 +47,7 @@
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setStatus("N"); // 鐘舵��
+ waitPakin.setStatus("Y"); // 鐘舵��
waitPakin.setAnfme(combMat.getCount()); // 鏁伴噺
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAppeUser(userId);
diff --git a/src/main/java/com/zy/asrs/task/handler/NotifyLogHandler.java b/src/main/java/com/zy/asrs/task/handler/NotifyLogHandler.java
index bc75cb9..7e4371e 100644
--- a/src/main/java/com/zy/asrs/task/handler/NotifyLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/NotifyLogHandler.java
@@ -21,9 +21,9 @@
public ReturnT<String> start() {
try {
// 鍏ュ簱閫氱煡妗ｈ浆鍘嗗彶妗�
- int pakInLog = jdbcTemplate.update("insert into cust_wait_pakin_log select * from cust_wait_pakin where status = 'Y';");
+ int pakInLog = jdbcTemplate.update("insert into cust_wait_pakin_log select * from cust_wait_pakin where io_status = 'F';");
if (pakInLog > 0) {
- int pakInDelete = jdbcTemplate.update("delete from cust_wait_pakin where status = 'Y';");
+ int pakInDelete = jdbcTemplate.update("delete from cust_wait_pakin where io_status = 'F';");
if (pakInDelete <= 0) {
exceptionHandle("鍏ュ簱閫氱煡妗ｈ浆鍘嗗彶妗ｅけ璐�");
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 125e2a5..7524b50 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -93,9 +93,9 @@
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
}
- // 鏇存柊鍏ュ簱閫氱煡妗� status ===>> Y
+ // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
WaitPakin setParam = new WaitPakin();
- setParam.setStatus("Y");
+ setParam.setIoStatus("Y");
boolean updateRes = waitPakinService.update(setParam
, new EntityWrapper<WaitPakin>().eq("zpallet", wrkDetl.getZpallet())
.eq("matnr", wrkDetl.getMatnr())
diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js
index 7d87f3e..ef7f164 100644
--- a/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -3,15 +3,15 @@
var cols = [
];
cols.push.apply(cols, detlCols);
- cols.push({field: 'status', align: 'center',title: '鐘舵��', templet:function(row){
- var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='寰呭叆搴搢宸插惎鍔�' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
- if(row.status !== 'Y'){html += " checked ";}
+ cols.push({field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
+ var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝ｅ父|閿佸畾'' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
+ if(row.status === 'Y'){html += " checked ";}
html += ">";
return html;
}}
,{field: 'ioStatus', align: 'center',title: '鍏ュ嚭鐘舵��', templet:function(row){
- var html = "<input value='ioStatus' type='checkbox' lay-skin='switch' lay-text='鍏ュ簱|鍑哄簱' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
- if(row.ioStatus !== 'Y'){html += " checked ";}
+ var html = "<input value='ioStatus' type='checkbox' lay-skin='switch' lay-text='杩愯涓瓅寰呭鐞�' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
+ if(row.ioStatus === 'Y'){html += " checked ";}
html += ">";
return html;
}}
diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index 0e3e360..54fc129 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -3,15 +3,15 @@
var cols = [
];
cols.push.apply(cols, detlCols);
- cols.push({field: 'status', align: 'center',title: '鐘舵��', templet:function(row){
- var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='寰呭叆搴搢宸插惎鍔�' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
- if(row.status !== 'Y'){html += " checked ";}
+ cols.push({field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
+ var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝ｅ父|閿佸畾' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
+ if(row.status === 'Y'){html += " checked ";}
html += ">";
return html;
}}
,{field: 'ioStatus', align: 'center',title: '鍏ュ嚭鐘舵��', templet:function(row){
- var html = "<input value='ioStatus' type='checkbox' lay-skin='switch' lay-text='鍏ュ簱|鍑哄簱' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
- if(row.ioStatus !== 'Y'){html += " checked ";}
+ var html = "<input value='ioStatus' type='checkbox' lay-skin='switch' lay-text='杩愯涓瓅寰呭鐞�' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
+ if(row.ioStatus === 'Y'){html += " checked ";}
html += ">";
return html;
}}
--
Gitblit v1.9.1