From 3f9b7886fa35a79db3ff2a5f47bd44214f5202e0 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期六, 13 三月 2021 15:22:35 +0800
Subject: [PATCH] 1.0.3 pda关联嘱托-隐藏物料名称，显示生成单号，并传入生成单号，组托根据（物料编号+生成单号+通知单号）判断唯一性
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 11 +++++
src/main/webapp/views/pda/combPro.html | 56 +++++++---------------------
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2 +
3 files changed, 27 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 3847ad6..6e1815a 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -15,8 +15,19 @@
// 鎴愬搧鐮�
private String productCode;
+ // 鐢熸垚鍗曞彿
+ private String warehouse;
+
private String billNo;
+ public String getWarehouse() {
+ return warehouse;
+ }
+
+ public void setWarehouse(String warehouse) {
+ this.warehouse = warehouse;
+ }
+
public static class CombMat {
// 鐗╂枡缂栧彿
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 d099d1a..d1c64a6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -123,11 +123,13 @@
waitPakinService.delete(new EntityWrapper<WaitPakin>()
.eq("supplier", param.getBillNo())
.eq("matnr", combMat.getMatNo())
+ .eq("warehouse", param.getWarehouse())
.isNull("zpallet"));
} else {
Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
.eq("supplier", param.getBillNo())
.eq("matnr", combMat.getMatNo())
+ .eq("warehouse", param.getWarehouse())
.isNull("zpallet");
WaitPakin pakin = new WaitPakin();
pakin.setAnfme(one.getAnfme() - waitPakin.getAnfme());
diff --git a/src/main/webapp/views/pda/combPro.html b/src/main/webapp/views/pda/combPro.html
index 0792161..610e91e 100644
--- a/src/main/webapp/views/pda/combPro.html
+++ b/src/main/webapp/views/pda/combPro.html
@@ -89,6 +89,10 @@
<span>鍚嶇О</span>
<input id="matName" type="text" disabled="disabled" style="width: 70%">
</div>
+ <div class="form-item">
+ <span>鐢熸垚鍗曞彿</span>
+ <input id="warehouse" type="text" disabled="disabled" style="width: 60%;height: 24.8px; color: blue">
+ </div>
<div class="form-item" style="margin-top: 5px">
<span style="vertical-align: middle">鏁伴噺</span>
<div class="number-tool" style="vertical-align: middle">
@@ -97,23 +101,6 @@
</div>
<button id="remove" onclick="remove()">绉婚櫎</button>
<button id="confirm" onclick="confirm()">淇濆瓨</button>
-</div>
-
-<!-- 鏄剧ず鐢熸垚鍗曞彿寮圭獥 -->
-<div id="warehouseModal" style="display: none; text-align: center; padding-top: 10px">
- <div class="form-item">
- <span>鐗╂枡</span>
- <input id="matNo2" type="text" disabled="disabled" style="width: 70%">
- </div>
- <div class="form-item">
- <span>鍚嶇О</span>
- <input id="matName2" type="text" disabled="disabled" style="width: 70%">
- </div>
- <div class="form-item">
- <span>鐢熸垚鍗曞彿</span>
- <input id="warehouse" type="text" disabled="disabled" style="width: 60%;height: 24.8px; color: blue">
- </div>
- <button onclick="closeWarehouse()" style="margin-top: 8px">鍏抽棴</button>
</div>
</body>
@@ -134,7 +121,7 @@
cellMinWidth: 50,
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', event: 'modify', style:'cursor: pointer;color: blue', width:50},
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜', event: 'warehouse', style: 'cursor: pointer;color: blue'},
+ {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
{field: 'warehouse', align: 'center', title: '鐢熸垚鍗曞彿'}
// {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
@@ -152,28 +139,14 @@
offset: '20px',
title: '淇敼鏁伴噺',
shadeClose: true,
- area: ['80%', '200px'],
+ area: ['80%', '220px'],
content: $("#modify"),
success: function (layero, index) {
$('#matNo').val(data.matNo);
$('#matName').val(data.matName);
$('#count').val(data.count);
- maxCount = data.count;
- }
- });
- break;
- case 'warehouse':
- layer.open({
- type: 1,
- offset: '20px',
- title: '鐢熸垚鍗曞彿鏄庣粏',
- shadeClose: true,
- area: ['80%', '180px'],
- content: $("#warehouseModal"),
- success: function (layero, index) {
- $('#matNo2').val(data.matNo);
- $('#matName2').val(data.matName);
$('#warehouse').val(data.warehouse);
+ maxCount = data.count;
}
});
break;
@@ -181,11 +154,6 @@
});
});
-
- /* 鍏抽棴鐢熸垚鍗曞彿鏄庣粏 */
- function closeWarehouse() {
- layer.closeAll();
- }
function findCode(el) {
if (el.value.length === 7) {
@@ -267,8 +235,9 @@
function confirm(){
var matNo = $('#matNo').val();
var count = $('#count').val();
+ var warehouse = $("#warehouse").val();
for (var j=0;j<matData.length;j++){
- if (matNo === matData[j].matNo) {
+ if (matNo === matData[j].matNo && warehouse === matData[j].warehouse) {
if (count > maxCount || count < minCount) {
tips("鏁伴噺涓嶈兘瓒呰繃鑼冨洿", true);
return;
@@ -284,8 +253,9 @@
// 绉婚櫎鐗╂枡
function remove() {
var matNo = $('#matNo').val();
+ var warehouse = $("#warehouse").val();
for (var j=0;j<matData.length;j++){
- if (matNo === matData[j].matNo) {
+ if (matNo === matData[j].matNo && warehouse === matData[j].warehouse) {
matData.splice(j, 1);
}
}
@@ -337,13 +307,15 @@
return;
}
var billNo = $('#billNo').val();
+ var warehouse = $('#warehouse').val();
$.ajax({
url: baseUrl+"/mobile/comb/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
barcode: barcode,
combMats: matData,
- billNo: billNo
+ billNo: billNo,
+ warehouse: warehouse,
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
--
Gitblit v1.9.1