From 4901728f970314cddd9fa167cf3d3fb9476208e5 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 08:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs
---
src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java | 6 +++---
src/main/webapp/static/js/pakStore/stockAdjust.js | 2 +-
src/main/java/com/zy/common/web/WcsController.java | 2 +-
src/main/webapp/views/pakStore/matQuery.html | 2 +-
src/main/webapp/views/pda/matQuery.html | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java b/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java
index bd76722..d03e191 100644
--- a/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java
@@ -24,9 +24,9 @@
int updateCount = jdbcTemplate.update("insert into asr_stk_hplc select * from asr_stk_plcm where dateadd(day,7,appe_time) <= getdate();");
if (updateCount > 0) {
int deleteCount = jdbcTemplate.update("delete from asr_stk_plcm where dateadd(day,7,io_time) <= getdate();");
- if (deleteCount <= 0) {
- exceptionHandle("鍫嗗灈鏈�&PLC鍛戒护杞巻鍙叉。閿欒 ! ");
- }
+// if (deleteCount <= 0) {
+// exceptionHandle("鍫嗗灈鏈�&PLC鍛戒护杞巻鍙叉。閿欒 ! ");
+// }
}
// //鏉＄爜缁勬墭鏁版嵁杞巻鍙叉。 2021-09-10 TQS ADD
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index d8fcf6a..5155061 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(), null, elem.getQty(),elem.getSource(),elem.getVendor()));
+ matDtos.add(new MatCodeCountDto(elem.getBillNo(), elem.getSeqNo(), elem.getMatNo(), elem.getSupplier(), elem.getQty(),elem.getSource(),elem.getVendor()));
//鏇存柊缁勬墭鏁版嵁鐘舵�佷负鍏ュ簱涓�
Wrapper<PltBarcode> wrapper = new EntityWrapper<PltBarcode>().eq("barcode", elem.getBarcode())
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index dcca9b1..d234aee 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -9,7 +9,7 @@
arrRemove(detlCols, "field", "str6")
var cols = [
{fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
- // {field: 'supplier', title: '鎵瑰彿', align: 'center', edit:'text', width: 120},
+ {field: 'supplier', title: '鎵瑰彿', align: 'center', width: 120},
{field: 'source', title: '鏉ユ簮', align: 'center', edit:'text', width: 120},
{field: 'vendor', title: '渚涘簲鍟�', align: 'center', edit:'text', width: 120}
,{field: 'qtyBox', align: 'center', title: '姣忕鏁伴噺(PCS)'}
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index b01d0bd..24c21b6 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -124,7 +124,7 @@
var checkStatus = table.checkStatus(obj.config.id);
var data = checkStatus.data;
for(i=0;i<data.length;i++){
- data[i].supplier='';
+ data[i].supplier='0';
}
// debugger
switch(obj.event) {
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index d185eef..fa84166 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -90,7 +90,7 @@
</div>
<div class="form-item">
<span>鎵瑰彿</span>
- <input id="supplier" type="text">
+ <input id="supplier" value="0" type="text">
</div>
<div class="form-item">
<span>鐢熶骇鏃ユ湡</span>
--
Gitblit v1.9.1