From 0be9b760e948e9c60ef5495a2e6bc66961c8fd17 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 02 三月 2021 17:02:22 +0800
Subject: [PATCH] 入库作业 1.新增物料状态
---
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 10 ++
src/main/webapp/views/pakStore/pakStore.html | 5 +
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 1
src/main/java/com/zy/asrs/entity/WrkDetl.java | 7 +
src/main/java/com/zy/asrs/entity/MatCodeCountDto.java | 13 +++
src/main/webapp/views/pakStore/matStatus.html | 26 ++++++
src/main/webapp/static/js/pakStore/pakStore.js | 146 ++++++++++++++++++++++++++++++------
src/main/webapp/views/pakStore/matQuery.html | 4 +
9 files changed, 187 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
index cf738da..642c06f 100644
--- a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
+++ b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
@@ -9,12 +9,15 @@
private Double count;
+ private String matStatus;
+
public MatCodeCountDto() {
}
- public MatCodeCountDto(String matNo, Double count) {
+ public MatCodeCountDto(String matNo, Double count, String matStatus) {
this.matNo = matNo;
this.count = count;
+ this.matStatus = matStatus;
}
public String getMatNo() {
@@ -32,4 +35,12 @@
public void setCount(Double count) {
this.count = count;
}
+
+ public String getMatStatus() {
+ return matStatus;
+ }
+
+ public void setMatStatus(String matStatus) {
+ this.matStatus = matStatus;
+ }
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 9c917aa..bf0d348 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -140,6 +140,13 @@
@TableField("appe_time")
private Date appeTime;
+ /**
+ * 鐗╂枡鐘舵�� (1鑹搧锛�2涓嶈壇鍝�)
+ */
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
+ @TableField("mat_status")
+ private String matStatus;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
index 0a41edd..fb7b9ac 100644
--- a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -26,6 +26,8 @@
// 鐗╂枡鏁伴噺
private Double count;
+ private String matStatus;
+
public String getMatNo() {
return matNo;
}
@@ -41,6 +43,14 @@
public void setCount(Double count) {
this.count = count;
}
+
+ public String getMatStatus() {
+ return matStatus;
+ }
+
+ public void setMatStatus(String matStatus) {
+ this.matStatus = matStatus;
+ }
}
public String getBarcode() {
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 a55b22b..80c6c09 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -111,7 +111,7 @@
List<MatCodeCountDto> matDtos = new ArrayList<>();
if (Cools.isEmpty(param.getProductCode())) {
param.getList().forEach(elem -> {
- matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getCount()));
+ matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getCount(), elem.getMatStatus()));
});
wrkDetlService.createWorkDetail(workNo, matDtos, param.getBarcode(), userId);
// 鎴愬搧鐗╂枡
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 0273900..1aafa90 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -45,6 +45,7 @@
wrkDetl.setAppeTime(new Date());
wrkDetl.setModiUser(userId);
wrkDetl.setModiTime(new Date());
+ wrkDetl.setMatStatus(dto.getMatStatus());
if (!this.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index d40dd18..e7d15a4 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -1,16 +1,26 @@
-
var initCountVal = 0;
var matCodeData = [];
+
function getCol() {
var cols = [
- {fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭～)', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
+ {type: 'checkbox', fixed: 'left'},
+ {
+ fixed: 'left',
+ field: 'count',
+ title: '鏁伴噺(蹇呭～)',
+ align: 'center',
+ edit: 'text',
+ width: 120,
+ style: 'color: blue;font-weight: bold'
+ }
];
cols.push.apply(cols, matCols);
- cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+ cols.push({field: 'matStatus', title: '鐗╂枡鐘舵��', align: 'center', width: 120, templet: '#matStatus'});
+ cols.push({fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 80});
return cols;
}
-layui.use(['table','laydate', 'form'], function() {
+layui.use(['table', 'laydate', 'form'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -42,7 +52,7 @@
table.on('toolbar(chooseData)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
var data = checkStatus.data;
- switch(obj.event) {
+ switch (obj.event) {
case 'comb':
// 鍒ゆ柇鏄惁瀛樺湪鐗╂枡
if (matCodeData.length === 0) {
@@ -50,34 +60,39 @@
return;
}
// 鍒ゆ柇鐗╂枡鏁伴噺鏄惁瀛樺湪寮傚父
- for (var i=0;i<matCodeData.length;i++){
+ for (var i = 0; i < matCodeData.length; i++) {
if (isNaN(matCodeData[i].count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
return;
}
- if (matCodeData[i].count === 0){
+ if (matCodeData[i].count === 0) {
layer.msg("鏁伴噺涓嶈兘涓洪浂");
return;
}
}
$.ajax({
- url: baseUrl+"/full/store/put/start",
+ url: baseUrl + "/full/store/put/start",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
devpNo: Number($('#putSiteSelect').val()),
list: matCodeData
}),
- contentType:'application/json;charset=UTF-8',
+ contentType: 'application/json;charset=UTF-8',
method: 'POST',
async: false,
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data);
matCodeData = [];
- tableIns.reload({data: matCodeData,done:function (res) { limit(); getInBound();}});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ tableIns.reload({
+ data: matCodeData, done: function (res) {
+ limit();
+ getInBound();
+ }
+ });
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg)
}
}
@@ -87,7 +102,7 @@
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(chooseData)', function(obj){
+ table.on('tool(chooseData)', function (obj) {
var data = obj.data;
switch (obj.event) {
case 'remove':
@@ -96,18 +111,20 @@
matCodeData.splice(i, 1);
}
}
- tableIns.reload({data: matCodeData,done:function (res) {
+ tableIns.reload({
+ data: matCodeData, done: function (res) {
limit();
getInBound();
// 瑕嗙洊render鏂规硶鐨刣one
- }});
+ }
+ });
break;
}
});
function setMatCodeData(data) {
matCodeData = data;
- for (var i=0;i<matCodeData.length;i++){
+ for (var i = 0; i < matCodeData.length; i++) {
matCodeData[i]["count"] = initCountVal;
}
}
@@ -117,8 +134,8 @@
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
if (count > 0) {
- for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matNo"] === matNo){
+ for (var i = 0; i < matCodeData.length; i++) {
+ if (matCodeData[i]["matNo"] === matNo) {
matCodeData[i]["count"] = count;
}
}
@@ -127,11 +144,13 @@
}
}
- tableIns.reload({data: matCodeData,done:function (res) {
+ tableIns.reload({
+ data: matCodeData, done: function (res) {
limit();
getInBound();
// 瑕嗙洊render鏂规硶鐨刣one
- }});
+ }
+ });
}
// 鑾峰彇鍙敤鍏ュ簱绔欑偣
@@ -169,16 +188,16 @@
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
content: 'matQuery.html',
- success: function(layero, index){
+ success: function (layero, index) {
}
});
}
// 娣诲姞琛ㄦ牸鏁版嵁
function addTableData(data) {
- for (var i=0;i<data.length;i++){
+ for (var i = 0; i < data.length; i++) {
let pass = false;
- for (var j=0;j<matCodeData.length;j++){
+ for (var j = 0; j < matCodeData.length; j++) {
if (data[i].matNo === matCodeData[j].matNo) {
pass = true;
break;
@@ -193,4 +212,81 @@
matCodeData.push.apply(matCodeData, data);
tableIns.reload({data: matCodeData});
layer.close(matCodeLayerIdx);
+}
+
+// 鎵撳紑鎵归噺淇敼鐗╂枡鐘舵�佸脊绐�
+var matStatusConfirm;
+function showMatStatus() {
+ var layer = layui.layer;
+ var table = layui.table;
+ // 鑾峰彇閫変腑琛�
+ var checkStatus = table.checkStatus('chooseData');
+ // 閫夋嫨琛屾暟鎹�
+ var checkData = checkStatus.data;
+ if (checkData.length == 0) {
+ layer.msg("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+
+ matStatusConfirm = layer.open({
+ type: 2,
+ title: '閫夋嫨鐗╂枡鐘舵��',
+ area: ['300px', '175px'],
+ content: 'matStatus.html',
+ btn: ['纭畾'],
+ success: function (layero, index) {
+ // 鎴愬姛鎵撳紑寮圭獥
+ },
+ yes: function (index, layero) {
+ //do something
+ // 瀛愰〉闈�
+ var matStatus = layero.find('iframe')[0].contentDocument;
+ // 椤甸潰閫夋嫨鏁版嵁鐩戞帶
+ var forms = matStatus.forms;
+ var cho = forms[0][0].value;
+ // 鏇存柊琛ㄥ崟鏁版嵁
+ matCodeData.map(function (item) {
+ checkData.map(function (e) {
+ if (item.matNo === e.matNo) {
+ item.matStatus = cho;
+ }
+ });
+ });
+ // 琛ㄦ牸鏁版嵁閲嶈浇
+ tableIns.reload({data: matCodeData});
+ // 鍏抽棴寮圭獥
+ layer.close(index);
+ }
+ });
+}
+
+// 鍏抽棴鎵归噺淇敼鐗╂枡鐘舵�佸脊绐�
+function closeMatStatus() {
+ var layer = layui.layer;
+ layer.close(matStatusConfirm);
+}
+
+// 鎵归噺绉婚櫎
+function batchRemove() {
+ debugger
+ var layer = layui.layer;
+ var table = layui.table;
+ // 鑾峰彇閫変腑琛�
+ var checkStatus = table.checkStatus('chooseData');
+ // 閫夋嫨琛屾暟鎹�
+ var checkData = checkStatus.data;
+ if (checkData.length == 0) {
+ layer.msg("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ // 鏇存柊琛ㄥ崟鏁版嵁
+ for (var k = checkData.length-1; k >= 0; k--) {
+ for(var i = matCodeData.length-1; i >= 0; i--) {
+ if (matCodeData[i].matNo === checkData[k].matNo) {
+ matCodeData.splice(i, 1);
+ }
+ }
+ }
+ // 琛ㄦ牸鏁版嵁閲嶈浇
+ tableIns.reload({data: matCodeData});
}
\ No newline at end of file
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index f7edc4a..a6a9827 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -139,6 +139,10 @@
layer.msg("璇烽�夋嫨鏁版嵁");
return;
}
+ // 榛樿鑹搧
+ data.map(function (item) {
+ item.matStatus = '1';
+ })
parent.addTableData(data);
break;
}
diff --git a/src/main/webapp/views/pakStore/matStatus.html b/src/main/webapp/views/pakStore/matStatus.html
new file mode 100644
index 0000000..c8dac91
--- /dev/null
+++ b/src/main/webapp/views/pakStore/matStatus.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+</head>
+<body style="text-align: center;padding-top: 20px">
+
+<form>
+ <select class="cool-auto-complete-window-select" id="matStatusChoose" lay-filter="matStatusChoose" style="width: 250px; height: 30px">
+ <option value="1">鑹搧</option>
+ <option value="2">涓嶈壇鍝�</option>
+ </select>
+
+</form>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+
+</body>
+<script>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/pakStore/pakStore.html b/src/main/webapp/views/pakStore/pakStore.html
index 2387f41..70d7127 100644
--- a/src/main/webapp/views/pakStore/pakStore.html
+++ b/src/main/webapp/views/pakStore/pakStore.html
@@ -102,6 +102,8 @@
</select>
<!-- 2.鍚姩鍑哄簱 -->
<button class="layui-btn layui-btn-normal layui-btn-lg" id="btn-comb" lay-event="comb" style="">鍚姩鍏ュ簱</button>
+ <button class="layui-btn layui-btn-primary layui-btn-lg" id="btn-mat-status" style="margin-left: 8px" onclick="showMatStatus()">鎵归噺淇敼鐘舵��</button>
+ <button class="layui-btn layui-btn-danger layui-btn-lg" id="btn-mat-remove" style="margin-left: 8px" onclick="batchRemove()">鎵归噺绉婚櫎</button>
</div>
</div>
</script>
@@ -126,6 +128,9 @@
<option value="{{this}}">{{this}}</option>
{{/each}}
</script>
+<script type="text/html" id="matStatus">
+ {{ d.matStatus == '1' ? '<span style="color: green">鑹搧</span>' : '<span style="color: red">涓嶈壇鍝�</span>' }}
+</script>
</body>
</html>
--
Gitblit v1.9.1