From b6a8cc0f2d3ced0b287348eb2a6a5785129f0ffb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 25 三月 2021 09:12:04 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/CheckMapper.xml | 1
src/main/webapp/views/check/check_detail.html | 11 ++++-
src/main/webapp/views/check/check.html | 10 ++++
src/main/java/zy/cloud/wms/manager/entity/Check.java | 24 ++++++++++-
src/main/webapp/static/js/check/check.js | 30 ++++----------
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 7 ++-
6 files changed, 53 insertions(+), 30 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Check.java b/src/main/java/zy/cloud/wms/manager/entity/Check.java
index 621c603..1692c47 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Check.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Check.java
@@ -101,6 +101,13 @@
private Double cekQty;
/**
+ * 宸��
+ */
+ @ApiModelProperty(value= "宸��")
+ @TableField("diff_qty")
+ private Double diffQty;
+
+ /**
* 鐩堜簭 1: 鐩樼泩 2: 鐩樹簭
*/
@ApiModelProperty(value= "鐩堜簭 1: 鐩樼泩 2: 鐩樹簭 ")
@@ -148,7 +155,7 @@
public Check() {}
- public Check(String uuid,Long nodeId,String nodeUuid,String locNo,String matnr,String maktx,String unit,Long docId,String docNum,Double oriQty,Double cekQty,Integer settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Check(String uuid,Long nodeId,String nodeUuid,String locNo,String matnr,String maktx,String unit,Long docId,String docNum,Double oriQty,Double cekQty,Double diffQty,Integer settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.nodeId = nodeId;
this.nodeUuid = nodeUuid;
@@ -160,6 +167,7 @@
this.docNum = docNum;
this.oriQty = oriQty;
this.cekQty = cekQty;
+ this.diffQty = diffQty;
this.settle = settle;
this.status = status;
this.createBy = createBy;
@@ -295,6 +303,14 @@
this.cekQty = cekQty;
}
+ public Double getDiffQty() {
+ return diffQty;
+ }
+
+ public void setDiffQty(Double diffQty) {
+ this.diffQty = diffQty;
+ }
+
public Integer getSettle() {
return settle;
}
@@ -323,9 +339,11 @@
if (null == this.status){ return null; }
switch (this.status){
case 1:
- return "姝ｅ父";
+ return "寰呭鏍�";
+ case 2:
+ return "宸查�氳繃";
case 0:
- return "绂佺敤";
+ return "鍙栨秷";
default:
return String.valueOf(this.status);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index a3de2b5..f72e187 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -428,9 +428,7 @@
Date now = new Date();
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("node_id", node.getId()));
List<String> locDetlMatnrs = new ArrayList<>();
- locDetls.forEach(locDetl -> {
- locDetlMatnrs.add(locDetl.getMatnr());
- });
+ locDetls.forEach(locDetl -> locDetlMatnrs.add(locDetl.getMatnr()));
Iterator<LocDetl> detlIterator = locDetls.iterator();
List<PakinMatDto> dtos = param.getDtos();
@@ -452,6 +450,7 @@
null, // 鍗曟嵁缂栧彿
locDetl.getAnfme(), // 璐﹂潰鏁伴噺
dto.getCount(), // 瀹炵洏鏁伴噺
+ dto.getCount() - locDetl.getAnfme(), // 宸��
locDetl.getAnfme() < dto.getCount() ? 1 : 2, // 鐩堜簭
1, // 鐘舵��
userId, // 娣诲姞浜哄憳
@@ -484,6 +483,7 @@
null, // 鍗曟嵁缂栧彿
locDetl.getAnfme(), // 璐﹂潰鏁伴噺
0D, // 瀹炵洏鏁伴噺
+ 0D - locDetl.getAnfme(), // 宸��
2, // 鐩堜簭
1, // 鐘舵��
userId, // 娣诲姞浜哄憳
@@ -514,6 +514,7 @@
null, // 鍗曟嵁缂栧彿
0D, // 璐﹂潰鏁伴噺
dto.getCount(), // 瀹炵洏鏁伴噺
+ dto.getCount() - 0D, // 宸��
1, // 鐩堜簭
1, // 鐘舵��
userId, // 娣诲姞浜哄憳
diff --git a/src/main/resources/mapper/CheckMapper.xml b/src/main/resources/mapper/CheckMapper.xml
index 09e77d7..394315a 100644
--- a/src/main/resources/mapper/CheckMapper.xml
+++ b/src/main/resources/mapper/CheckMapper.xml
@@ -16,6 +16,7 @@
<result column="doc_num" property="docNum" />
<result column="ori_qty" property="oriQty" />
<result column="cek_qty" property="cekQty" />
+ <result column="diff_qty" property="diffQty" />
<result column="settle" property="settle" />
<result column="status" property="status" />
<result column="create_by" property="createBy" />
diff --git a/src/main/webapp/static/js/check/check.js b/src/main/webapp/static/js/check/check.js
index 74c4273..592cd02 100644
--- a/src/main/webapp/static/js/check/check.js
+++ b/src/main/webapp/static/js/check/check.js
@@ -31,16 +31,17 @@
,{field: 'docId', align: 'center',title: '鍗曟嵁绫诲瀷', hide: true}
,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'oriQty', align: 'center',title: '璐﹂潰鏁伴噺 (鍘�)', style: 'font-weight: bolder'}
- ,{field: 'cekQty', align: 'center',title: '瀹炵洏鏁伴噺 (鐜�)', style: 'font-weight: bolder; color: blue'}
+ ,{field: 'cekQty', align: 'center',title: '瀹炵洏鏁伴噺 (鐜�)', style: 'font-weight: bolder'}
+ ,{field: 'diffQty', align: 'center',title: '宸��', style: 'font-weight: bolder; color: blue'}
,{field: 'settle$', align: 'center',title: '鐩堜簭', templet: '#checkTpl', width: 100}
- ,{field: 'status$', align: 'center',title: '鐘舵��', hide: true}
,{field: 'createTime$', align: 'center',title: '鐩樼偣鏃堕棿'}
,{field: 'createBy$', align: 'center',title: '鐩樼偣浜哄憳'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��', templet: '#statusTpl', width: 110}
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
request: {
pageName: 'curr',
@@ -205,24 +206,11 @@
}
});
break;
- // 缂栬緫
- case 'edit':
- layer.open({
- type: 2,
- title: '淇敼',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- content: 'check_detail.html',
- success: function(layero, index){
- layer.getChildFrame('#data-detail-submit-save', index).hide();
- setFormVal(layer.getChildFrame('#detail', index), data, false);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
- top.convertDisabled(layer.getChildFrame('#id', index), true);
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- }
- });
+ // 瀹℃牳
+ case 'auditing':
+ layer.msg('瀹℃牳鎴愬姛', {icon : 1})
+
+
break;
}
diff --git a/src/main/webapp/views/check/check.html b/src/main/webapp/views/check/check.html
index 03393ab..7e5a837 100644
--- a/src/main/webapp/views/check/check.html
+++ b/src/main/webapp/views/check/check.html
@@ -55,8 +55,8 @@
</script>
<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-normal layui-btn-xs btn-edit" lay-event="auditing">瀹℃牳</a>
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
-<!-- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>-->
</script>
<script type="text/html" id="checkTpl">
<span name="settle"
@@ -67,6 +67,14 @@
{{# } }}
>{{d.settle$}}</span>
</script>
+<script type="text/html" id="statusTpl">
+ {{# if(d.status==1){ }}
+ <span style="color: orange;cursor: default;" lay-tips="姝ｅ湪瀹℃牳涓紝璇疯�愬績绛夊緟">
+ {{# }else if(d.status==2){ }}
+ <span class="icon-text" style="color: green;cursor: default;">
+ {{# } }}
+ {{d.status$}}</span>
+</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/check/check_detail.html b/src/main/webapp/views/check/check_detail.html
index baea1e1..cbb38c4 100644
--- a/src/main/webapp/views/check/check_detail.html
+++ b/src/main/webapp/views/check/check_detail.html
@@ -102,6 +102,12 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">宸�硷細</label>
+ <div class="layui-input-inline">
+ <input id="diffQty" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鐩堛��銆�浜忥細</label>
<div class="layui-input-inline">
<select id="settle">
@@ -116,8 +122,9 @@
<div class="layui-input-inline">
<select id="status">
<option value="" style="display: none"></option>
- <option value="1">姝ｅ父</option>
- <option value="0">绂佺敤</option>
+ <option value="1">寰呭鏍�</option>
+ <option value="2">宸查�氳繃</option>
+ <option value="0">鍙栨秷</option>
</select>
</div>
</div>
--
Gitblit v1.9.1