From 803cad115e8fb96fe042b7070fa41dedec4b6361 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 20 五月 2024 15:31:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 3 +++
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 2 +-
src/main/resources/mapper/LocDetlMapper.xml | 1 +
src/main/webapp/static/js/common.js | 4 ++--
src/main/resources/application.yml | 2 +-
5 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 9ae2e2c..421d50e 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -272,10 +272,13 @@
Page<LocDetlAll> stockStatis = locDetlService.getStockStatisAll(toPage(curr, limit, param, LocDetlAll.class));
for (LocDetlAll locDetlAll : stockStatis.getRecords()) {
+ Double weight = locDetlAll.getWeight();
+
Mat mat = matService.selectByMatnr(locDetlAll.getMatnr());
if (mat != null) {
locDetlAll.sync(mat);
}
+ locDetlAll.setWeight(weight);
}
return R.ok().add(stockStatis);
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 561f51f..a4f6c33 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 8088
servlet:
context-path: /@pom.build.finalName@
compression:
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 2cbe139..12043c2 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -580,6 +580,7 @@
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr,a.batch
, sum(a.anfme) as anfme
+ ,sum (a.weight) as weight
,owner
,payment
from asr_loc_detl_all a
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index ca698e8..299563c 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -258,7 +258,7 @@
,{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: '閲嶉噺', hide: false}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺(KG)', hide: false}
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
@@ -270,7 +270,7 @@
,{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: false}
+ ,{field: 'owner$', align: 'center',title: '璐т富', hide: true}
,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��', hide: false}
]
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index a259837..b85f62d 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -6,7 +6,7 @@
arrRemove(detlCols, "field", "anfme")
arrRemove(detlCols, "field", "zpallet")
arrRemove(detlCols, "field", "model")
- arrRemove(detlCols, "field", "weight")
+ // arrRemove(detlCols, "field", "weight")
cols.push.apply(cols, detlCols);
// cols.push({field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'}
// )
--
Gitblit v1.9.1