From 920631775c8b2d6c0541ae4d69c34c8a8675bf60 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期三, 02 七月 2025 15:50:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2 +
src/main/resources/mapper/asrs/LocDetlMapper.xml | 7 +++
src/main/java/com/zy/asrs/service/LocDetlService.java | 2 +
src/main/java/com/zy/asrs/controller/LocDetlController.java | 14 +++++++
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 16 +++++++
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 8 ++++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 9 ++++
src/main/java/com/zy/asrs/controller/MobileController.java | 4 +-
8 files changed, 58 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 b664a1f..bf07b1f 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -379,9 +379,13 @@
@RequestParam Map<String, Object> param) {
Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
for (LocDetl locDetl : stockStatis.getRecords()) {
+ Double weight = locDetl.getWeight();
+ String standby1 = locDetl.getStandby1();
Mat mat = matService.selectByMatnr(locDetl.getMatnr());
if (mat != null) {
locDetl.sync(mat);
+ locDetl.setStandby1(standby1);
+ locDetl.setWeight(weight);
}
}
return R.ok().add(stockStatis);
@@ -420,4 +424,14 @@
return R.ok(sum);
}
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @return
+ */
+ @RequestMapping("/locDetl/count2")
+ public R getAllCount2(){
+ Integer sum = locDetlService.sum2();
+ return R.ok(sum);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index bff7c10..67840c8 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -355,7 +355,7 @@
ckbmList.add(storeType.getStoreId());
}
- NccSaleXclGgsybWms nccSaleXclGgsybWms = nccSaleXclGgsybWmsService.selectOne(new EntityWrapper<NccSaleXclGgsybWms>()
+ /*NccSaleXclGgsybWms nccSaleXclGgsybWms = nccSaleXclGgsybWmsService.selectOne(new EntityWrapper<NccSaleXclGgsybWms>()
.eq("WLBM", combMat.getMatnr())
.eq("VBATCHCODE", combMat.getBatch())
.in("CKBM", ckbmList)
@@ -389,7 +389,7 @@
List<CombParam.CombMat> combMats = combParam.getCombMats();
for (CombParam.CombMat mat : combMats) {
mat.setStandby1(nccSaleXclGgsybWms.getCkbm());
- }
+ }*/
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 82eedd7..2f134ba 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -87,6 +87,8 @@
Integer sum();
+ Integer sum2();
+
List<LocDetl> unreason();
Double selectLocDetlSumQty(String locNo);
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 2bdc4f2..0d0651e 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -76,6 +76,8 @@
Integer sum();
+ Integer sum2();
+
List<LocDetl> unreason();
Double getLocDetlSumQty(String locNo);
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index a793146..4b1695a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -152,6 +152,15 @@
return this.baseMapper.sum();
}
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @return
+ */
+ @Override
+ public Integer sum2() {
+ return this.baseMapper.sum2();
+ }
+
@Override
public List<LocDetl> unreason() {
return this.baseMapper.unreason();
diff --git a/src/main/resources/mapper/asrs/LocDetlMapper.xml b/src/main/resources/mapper/asrs/LocDetlMapper.xml
index 7288003..8fb1e25 100644
--- a/src/main/resources/mapper/asrs/LocDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/LocDetlMapper.xml
@@ -387,11 +387,13 @@
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
, a.batch
+ , a.standby1
, sum(a.anfme) as anfme
+ , sum(a.weight) as weight
from asr_loc_detl a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr, a.batch
+ group by a.matnr, a.batch , a.standby1
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -642,6 +644,9 @@
<select id="sum" resultType="java.lang.Integer">
SELECT SUM(anfme) FROM asr_loc_detl
</select>
+ <select id="sum2" resultType="java.lang.Integer">
+ SELECT SUM(weight) FROM asr_loc_detl
+ </select>
<select id="unreason" resultMap="BaseResultMap">
SELECT
*
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index fd1da33..a9703d9 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -3,8 +3,9 @@
var cols = [
{field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺', style: 'font-weight: bold'}
];
- arrRemove(detlCols, "field", "anfme")
arrRemove(detlCols, "field", "zpallet")
+ arrRemove(detlCols, "field", "orderNo")
+ arrRemove(detlCols, "field", "supp")
cols.push.apply(cols, detlCols);
// cols.push({field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'}
// )
@@ -72,6 +73,19 @@
}
});
+ /**
+ * 鏄剧ず搴撳瓨鎬绘暟閲�
+ */
+ $.ajax({
+ url: baseUrl+"/locDetl/count2",
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ $("#countNum2").text(res.data + '涓�');
+ }
+ });
+
}
});
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index a312e9c..e249819 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -34,6 +34,14 @@
</div>
</fieldset>
</div>
+ <div class="layui-inline">
+ <fieldset class="layui-elem-field">
+ <legend>鎬昏杈呮暟閲�</legend>
+ <div class="layui-field-box" id="countNum2">
+ 璇风◢绛�
+ </div>
+ </fieldset>
+ </div>
</div>
<!-- 琛ㄦ牸 -->
--
Gitblit v1.9.1