From 85deecd28f589f280a3db19fb35fcb6d9081b781 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 09:57:18 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pakStore/locCheckOut.js | 3 ++-
src/main/webapp/static/js/pltBarcode/pltBarcode.js | 2 +-
version/db/sxjzasrs20220211.bak | 0
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 1 +
src/main/webapp/views/pakStore/pakStore.html | 2 +-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2 ++
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 10 ++++++++++
src/main/java/com/zy/asrs/entity/MatCodeCountDto.java | 3 ++-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 1 -
src/main/java/com/zy/common/web/WcsController.java | 2 +-
src/main/webapp/static/js/common.js | 2 +-
src/main/webapp/static/js/pakStore/pakStore.js | 2 +-
12 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
index 39178ce..f02fea8 100644
--- a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
+++ b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
@@ -63,7 +63,7 @@
this.vendor= vendor;
}
- public MatCodeCountDto(String billNo, Integer seqNo, String matNo, String supplier, Double count,String source, String vendor) {
+ public MatCodeCountDto(String billNo, Integer seqNo, String matNo, String supplier, Double count,String source, String vendor,String memo) {
this.matNo = matNo;
this.count = count;
this.billNo = billNo;
@@ -71,6 +71,7 @@
this.seqNo = seqNo;
this.source = source;
this.vendor= vendor;
+ this.memo=memo;
}
public MatCodeCountDto(String billNo, Integer seqNo, String matNo, String supplier, Double count) {
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index 9b238d3..19d8b3d 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -46,6 +46,16 @@
// 鏁伴噺
private Double count;
+ private String supplier;
+
+ public String getSupplier() {
+ return supplier;
+ }
+
+ public void setSupplier(String supplier) {
+ this.supplier = supplier;
+ }
+
public String getBillNo() { return billNo; }
public void setBillNo(String billNo) { this.billNo = billNo; }
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 fbc865f..cb0209b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -106,7 +106,6 @@
pltBarcode.setVendor(combMat.getVendor());
pltBarcode.setSource(combMat.getSource());
pltBarcode.setQtyBox(matCode.getStr6());
- pltBarcode.setMemo(combMat.getMemo());
if (!pltBarcodeService.insert(pltBarcode)) {
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
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 2c60ab6..05cdbe8 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -284,6 +284,7 @@
wrkDetl.setAllQty(qty*matCode.getStr6());
wrkDetl.setVendor(detlDto.getLocDetl().getVendor());
wrkDetl.setSource(detlDto.getLocDetl().getSource());
+ wrkDetl.setSupplier(detlDto.getLocDetl().getSupplier());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
@@ -498,6 +499,7 @@
LocDetl sqlParam = new LocDetl();
sqlParam.setLocNo(paramLocDetl.getLocNo());
sqlParam.setMatNo(paramLocDetl.getMatNo());
+ sqlParam.setSupplier(paramLocDetl.getSupplier());
LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
if (null != one) locDetlDtos.add(new LocDetlDto(one, one.getQty()));
}
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 9624c2e..d6605e3 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -124,6 +124,7 @@
locDetl.setVendor(wrk_no.getVendor());
locDetl.setWeight(matCode.getWeight());
locDetl.setQtyBox(matCode.getStr6());
+
if (!Cools.isEmpty(wrk_no)){
locDetl.setMemo(wrk_no.getMemo());
locDetl.setSupplier(wrk_no.getSupplier());
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 5155061..78f3121 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -140,7 +140,7 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
List<MatCodeCountDto> matDtos = new ArrayList<>();
pltBarcodes.forEach(elem -> {
- matDtos.add(new MatCodeCountDto(elem.getBillNo(), elem.getSeqNo(), elem.getMatNo(), elem.getSupplier(), elem.getQty(),elem.getSource(),elem.getVendor()));
+ matDtos.add(new MatCodeCountDto(elem.getBillNo(), elem.getSeqNo(), elem.getMatNo(), elem.getSupplier(), elem.getQty(),elem.getSource(),elem.getVendor(),elem.getMemo()));
//鏇存柊缁勬墭鏁版嵁鐘舵�佷负鍏ュ簱涓�
Wrapper<PltBarcode> wrapper = new EntityWrapper<PltBarcode>().eq("barcode", elem.getBarcode())
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 5e422fd..e172ae1 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -192,7 +192,7 @@
,{field: 'color', align: 'center',title: '棰滆壊'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
// ,{field: 'bname', align: 'center',title: '搴撲綅鍚嶇О'}
- ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+ ,{field: 'memo', align: 'center',title: '鐢熶骇鏃ユ湡',}
,{field: 'weight', align: 'center', title: '姣忕閲嶉噺(KG)'}
,{field: 'str3', align: 'center', title: '瀹㈡埛鍚嶇О'}
,{field: 'str4', align: 'center', title: '椤圭洰淇℃伅'}
diff --git a/src/main/webapp/static/js/pakStore/locCheckOut.js b/src/main/webapp/static/js/pakStore/locCheckOut.js
index f6797c8..456139c 100644
--- a/src/main/webapp/static/js/pakStore/locCheckOut.js
+++ b/src/main/webapp/static/js/pakStore/locCheckOut.js
@@ -53,11 +53,12 @@
data.forEach(function(elem) {
console.log(elem)
// locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count}); // todo
- locDetls.push({locNo: elem.locNo, matNo: elem.matNo});
+ locDetls.push({locNo: elem.locNo, matNo: elem.matNo, supplier:elem.supplier});
});
let param = {
outSite: staNo,
locDetls: locDetls
+
}
$.ajax({
url: baseUrl+"/locCheck/out/start",
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index fefffe9..9b0b98e 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -12,7 +12,7 @@
];
cols.push.apply(cols, matCols);
cols.push(
- {field: 'memo', title:'澶囨敞', align: 'center'},
+ {field: 'memo', title:'鐢熶骇鏃ユ湡', align: 'center'},
{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
)
return cols;
diff --git a/src/main/webapp/static/js/pltBarcode/pltBarcode.js b/src/main/webapp/static/js/pltBarcode/pltBarcode.js
index 48c8ee1..a139d5e 100644
--- a/src/main/webapp/static/js/pltBarcode/pltBarcode.js
+++ b/src/main/webapp/static/js/pltBarcode/pltBarcode.js
@@ -40,7 +40,7 @@
,{field: 'source', align: 'center',title: '鏉ユ簮'}
,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
,{field: 'vendor', align: 'center',title: '渚涘簲鍟�'}
- ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+ ,{field: 'memo', align: 'center',title: '鐢熶骇鏃ユ湡'}
,{field: 'linkErp$', align: 'center',title: 'ERP杩炵嚎', hide: true}
,{field: 'ioStatus$', align: 'center',title: '瀹屾垚鐘舵��'}
,{field: 'ioTime$', align: 'center',title: '瀹屾垚鏃堕棿', hide: true}
diff --git a/src/main/webapp/views/pakStore/pakStore.html b/src/main/webapp/views/pakStore/pakStore.html
index 2250d7a..e465277 100644
--- a/src/main/webapp/views/pakStore/pakStore.html
+++ b/src/main/webapp/views/pakStore/pakStore.html
@@ -108,7 +108,7 @@
<!-- 琛� -->
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="memo">澶囨敞</a>
+ <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="memo">鐢熶骇鏃ユ湡</a>
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">绉婚櫎</a>
</script>
diff --git a/version/db/sxjzasrs20220211.bak b/version/db/sxjzasrs20220211.bak
index fb10b28..de0b8b5 100644
--- a/version/db/sxjzasrs20220211.bak
+++ b/version/db/sxjzasrs20220211.bak
Binary files differ
--
Gitblit v1.9.1