From 6c0c9c6711af6ae5a0cd7a9d08ee3a123eca6263 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期日, 19 九月 2021 10:00:15 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/report/stayTime.js | 4 ++
src/main/webapp/static/js/report/workOut.js | 4 ++
src/main/webapp/views/home/console.html | 4 ++
src/main/java/com/zy/asrs/controller/LocDetlController.java | 2
src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java | 44 +++++++++++++---------
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2
src/main/webapp/static/js/report/workIn.js | 5 ++
7 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index da624a0..b1b0e1d 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -124,7 +124,7 @@
value= (String) param.get(s);
}
LocMast loc_no = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", value));
- if (loc_no.getLocSts().equals("O")||loc_no.getLocSts().equals("F")){
+ if (loc_no.getLocSts().equals("O")||loc_no.getLocSts().equals("D")||loc_no.getLocSts().equals("F")){
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
diff --git a/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
index 07969ca..f5e16b1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
@@ -71,25 +71,33 @@
// 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
Double sumCount=locDetlService.getLocDetlSumQty(locDetl.getLocNo());
int ioType=0;
- ioType=sumCount-outQty>0?103 : 101;
+ ioType = sumCount-locDetl.getQty()>0 ? 103 : 101;
- if (outQty >= locDetl.getQty()){
- //鐢熸垚鏂囨。璁板綍
- stockOut(waitMatout.getBillNo(),waitMatout.getSeqNo(),staNo,new LocDetlDto(locDetl,locDetl.getQty()),ioType,userId);
- waitMatout.setOutQty(waitMatout.getOutQty() + locDetl.getQty());
- waitMatout.setIoStatus(1);
- //淇敼璁板綍
- Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
- .eq("seq_no",paramLocDetl.getSeqNo()));
- }else {
- //鐢熸垚鏂囨。璁板綍
- stockOut(waitMatout.getBillNo(),waitMatout.getSeqNo(),staNo,new LocDetlDto(locDetl,outQty),ioType,userId);
- waitMatout.setOutQty(waitMatout.getOutQty() + outQty);
- waitMatout.setIoStatus(1);
- //淇敼璁板綍
- Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
- .eq("seq_no",paramLocDetl.getSeqNo()));
- }
+ Double curOutQty = outQty >= locDetl.getQty() ? locDetl.getQty() : outQty; //鏈鍑哄簱閲�
+ stockOut(waitMatout.getBillNo(),waitMatout.getSeqNo(),staNo,new LocDetlDto(locDetl,curOutQty),ioType,userId);
+ waitMatout.setOutQty(waitMatout.getOutQty() + curOutQty);
+ waitMatout.setIoStatus(1);
+ //淇敼璁板綍
+ Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
+ .eq("seq_no",paramLocDetl.getSeqNo()));
+
+// if (outQty >= locDetl.getQty()){
+// //鐢熸垚鏂囨。璁板綍
+// stockOut(waitMatout.getBillNo(),waitMatout.getSeqNo(),staNo,new LocDetlDto(locDetl,locDetl.getQty()),ioType,userId);
+// waitMatout.setOutQty(waitMatout.getOutQty() + locDetl.getQty());
+// waitMatout.setIoStatus(1);
+// //淇敼璁板綍
+// Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
+// .eq("seq_no",paramLocDetl.getSeqNo()));
+// }else {
+// //鐢熸垚鏂囨。璁板綍
+// stockOut(waitMatout.getBillNo(),waitMatout.getSeqNo(),staNo,new LocDetlDto(locDetl,outQty),ioType,userId);
+// waitMatout.setOutQty(waitMatout.getOutQty() + outQty);
+// waitMatout.setIoStatus(1);
+// //淇敼璁板綍
+// Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
+// .eq("seq_no",paramLocDetl.getSeqNo()));
+// }
}
}
}
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 b1d2c77..e8115b4 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -570,7 +570,7 @@
throw new CoolException("搴撲綅涓嶅瓨鍦�");
}
//鏌ヨ搴撲綅鐘舵��
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")){
//鏇存柊搴撲綅鐘舵��
locMast.setLocSts("F");
// boolean b = locMastService.updateById(locMast);
diff --git a/src/main/webapp/static/js/report/stayTime.js b/src/main/webapp/static/js/report/stayTime.js
index 81ee2f2..8cd0475 100644
--- a/src/main/webapp/static/js/report/stayTime.js
+++ b/src/main/webapp/static/js/report/stayTime.js
@@ -4,7 +4,11 @@
{field: 'appe_time', title: '鍏ュ簱鏃堕棿', align: 'center', width: 200}
,{field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟'}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'mat_no', align: 'center',title: '鐗╂枡缂栧彿'}
+ ,{field: 'mat_name', align: 'center',title: '鐗╂枡鍚嶇О'}
];
+ arrRemove(detlCols, "field", "matNo");
+ arrRemove(detlCols, "field", "matName")
cols.push.apply(cols, detlCols);
return cols;
}
diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index 367d367..83312e6 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -3,7 +3,11 @@
var cols = [
{field: 'io_time', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'mat_no', align: 'center',title: '鐗╂枡缂栧彿'}
+ ,{field: 'mat_name', align: 'center',title: '鐗╂枡鍚嶇О'}
];
+ arrRemove(detlCols, "field", "matNo");
+ arrRemove(detlCols, "field", "matName")
cols.push.apply(cols, detlCols);
return cols;
}
@@ -43,6 +47,7 @@
statusCode: 200
},
done: function(res, curr, count) {
+ console.log(res);
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index b4f4f32..6ec4bab 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -5,7 +5,11 @@
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
,{field: 'crn_str_time', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
,{field: 'crn_end_time', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
+ ,{field: 'mat_no', align: 'center',title: '鐗╂枡缂栧彿'}
+ ,{field: 'mat_name', align: 'center',title: '鐗╂枡鍚嶇О'}
];
+ arrRemove(detlCols, "field", "matNo");
+ arrRemove(detlCols, "field", "matName")
cols.push.apply(cols, detlCols);
return cols;
}
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index 562662f..53558a9 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -238,7 +238,11 @@
{field: 'appe_time', title: '鍏ュ簱鏃堕棿', align: 'center', width: 200}
,{field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟'}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'mat_no', align: 'center',title: '鐗╂枡缂栧彿'}
+ ,{field: 'mat_name', align: 'center',title: '鐗╂枡鍚嶇О'}
];
+ arrRemove(detlCols, "field", "matNo");
+ arrRemove(detlCols, "field", "matName")
cols.push.apply(cols, detlCols);
return cols;
}
--
Gitblit v1.9.1