From 6ab07fef73e3f12ac25f41b71e9b83cb4227de10 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 10 六月 2025 14:35:26 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/report/workOut.js | 2
src/main/webapp/static/js/pakStore/stockAdjust.js | 18 ++++++--
src/main/webapp/static/js/report/workIn.js | 2
src/main/java/com/zy/asrs/entity/ViewWorkInBean.java | 4 ++
src/main/webapp/static/js/common.js | 40 ++++++++++++++++++++
5 files changed, 59 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index a4947ff..19fd383 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -155,6 +155,10 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ private Integer sta_no;
+
+ private Integer source_sta_no;
+
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modi_user);
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 2f035ab..b12f345 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -275,6 +275,46 @@
,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��', hide: false}
]
+var detlCols2 = [
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺(浠�)',hide: false}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜',hide: false}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸',hide: false}
+ ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
+ ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
+ ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+ ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+ ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+ ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
+ ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
+ ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
+ ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺(KG)', hide: false}
+ ,{field: 'source_sta_no', align: 'center',title: '婧愮珯鐐�', hide: false}
+ ,{field: 'sta_no', align: 'center',title: '鐩爣绔欑偣', hide: false}
+ ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
+ ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
+ ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
+ ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
+ ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
+ ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
+ ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
+ ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
+ ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
+ ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
+ ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ ,{field: 'owner$', align: 'center',title: '璐т富', hide: true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
+
+]
+
function getQueryVariable(variable)
{
var query = window.location.search.substring(1);
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 042a8b5..13e6882 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -12,7 +12,7 @@
arrRemove(detlCols, "field", "anfme");
arrRemove(detlCols, "field", "batch");
cols.push.apply(cols, detlCols);
- cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+
return cols;
}
@@ -42,6 +42,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
let index = obj.tr.attr("data-index");
+ console.log(index)
let data = matCodeData[index];
let modify = true;
if (obj.field === 'count'){
@@ -50,10 +51,17 @@
layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
modify = false;
} else {
- if (vle <= 0) {
- layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
- modify = false;
- }
+ // if (vle <= 0) {
+ // layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
+ // modify = false;
+ // }
+ }
+ }
+ if (obj.field === 'batch'){
+ let vle = obj.value;
+ if (vle.length <= 0){
+ layer.msg("鎵瑰彿涓嶅噯涓虹┖", {icon: 2});
+ modify = false;
}
}
if (modify) {
diff --git a/src/main/webapp/static/js/report/workIn.js b/src/main/webapp/static/js/report/workIn.js
index ec329f9..8405381 100644
--- a/src/main/webapp/static/js/report/workIn.js
+++ b/src/main/webapp/static/js/report/workIn.js
@@ -4,7 +4,7 @@
{field: 'ioTime$', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
];
- cols.push.apply(cols, detlCols);
+ cols.push.apply(cols, detlCols2);
return cols;
}
diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index c8b06bf..7bffef6 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -6,7 +6,7 @@
,{field: 'crn_str_time', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
,{field: 'crn_end_time', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
];
- cols.push.apply(cols, detlCols);
+ cols.push.apply(cols, detlCols2);
return cols;
}
--
Gitblit v1.9.1