From e8cbdfacdc15ce8e0faa1f4effc1154479b6ed31 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 15 八月 2025 19:19:10 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java | 7 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocDetlService.java | 3 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java | 4 +-
zy-asrs-wms/src/main/resources/mapper/asrs/LocDetlMapper.xml | 5 ++
zy-asrs-admin/src/views/loc/locDetl/index.vue | 28 ++++++++++++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/LocDetlMapper.java | 2 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java | 13 ++++++
7 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-admin/src/views/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue
index 2afcbdc..2857c42 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/index.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/index.vue
@@ -13,6 +13,7 @@
const TABLE_KEY = 'table-locDetl';
let currentPage = 1;
let pageSize = 10;
+let allQty = 0;
const searchInput = ref("")
const orderBy = ref({});
const searchParam = ref({
@@ -33,7 +34,7 @@
let tableData = ref([]);
getColumns();
getPage();
-
+getTotalQty();
const {
getColumnSearchProps,
handleResizeColumn,
@@ -248,6 +249,26 @@
}
}
+
+function getTotalQty() {
+ state.loading = true;
+ post('/api/locDetl/all/Qty').then((resp) => {
+ let result = resp.data;
+ if (result.code == 200) {
+ let {data} = result;
+ console.log("------------=======>");
+ allQty = data?.allQty;
+ state.loading = false;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+
function getPage() {
state.loading = true;
post('/api/locDetl/page', {
@@ -424,8 +445,9 @@
</template>
</template>
<template #footer>
- <div>
- <span>褰撳墠椤垫�婚噺锛歿{ total }}</span>
+ <div style="display: 'flex';">
+ <span>鎬诲簱瀛橈細{{ allQty }} </span>
+ <span>锛� 褰撳墠椤垫�婚噺锛歿{ total }}</span>
</div>
</template>
</a-table>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
index 48eb374..2dab91e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
@@ -70,6 +70,13 @@
return R.ok().add(data);
}
+
+ @PreAuthorize("hasAuthority('asrs:locDetl:list')")
+ @PostMapping("/locDetl/all/Qty")
+ public R getAllStock() {
+ return locDetlService.getAllStockQty();
+ }
+
@PreAuthorize("hasAuthority('asrs:locDetl:list')")
@PostMapping("/locDetl/outPage")
public R outPage(@RequestBody Map<String, Object> map) {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
index 3c19a34..2d501ee 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
@@ -84,7 +84,7 @@
@PostMapping("/out/orderOut/wave/preview")
@OperationLog("棰勮娉㈡鍑哄簱")
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public R orderOutWavePreview(@RequestBody OrderOutWavePreviewParam param) {
if (param == null) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
@@ -126,12 +126,12 @@
@PostMapping("/out/orderOut/merge/wave")
@OperationLog("鐢熸垚娉㈡浠诲姟")
- @Transactional
public R orderOutMerge(@RequestBody OrderOutMergeParamDto param) {
outManage.orderOutMergeWave(param);
return R.ok();
}
+
@PostMapping("/out/locs/stock")
@OperationLog("鎵嬪姩鍑哄簱")
public R stockOut(@RequestBody StockOutParam param) {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/LocDetlMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/LocDetlMapper.java
index f17e1bd..164df9b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/LocDetlMapper.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/LocDetlMapper.java
@@ -19,4 +19,6 @@
List<LocDetl> getStock(String matnr, String batch, List<Long> ids);
+
+ Double getAllStock();
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocDetlService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocDetlService.java
index 9d161d9..2409aab 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocDetlService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocDetlService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.asrs.entity.LocDetl;
import com.zy.asrs.wms.asrs.entity.ViewLocDetl;
import com.zy.asrs.wms.asrs.entity.param.FieldParam;
@@ -30,4 +31,6 @@
void removeLocDetl(Long locId);
List<LocDetl> queryFlatStock(String matnr, String batch, List<FieldParam> uniqueField);
+
+ R getAllStockQty();
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java
index 0bdab34..65b4b3c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.LocAreaTypeSts;
@@ -240,4 +241,16 @@
});
return detls;
}
+
+ /**
+ * 鑾峰彇鎵�鏈夊簱瀛樻暟閲�
+ * @return
+ */
+ @Override
+ public R getAllStockQty() {
+ Map<String, Double> map = new HashMap<>();
+ Double allQty = this.baseMapper.getAllStock();
+ map.put("allQty", allQty);
+ return R.ok().add(map);
+ }
}
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/LocDetlMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/LocDetlMapper.xml
index 0b3fd0c..90b14b4 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/LocDetlMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/LocDetlMapper.xml
@@ -29,5 +29,8 @@
</foreach>
</if>
</select>
-
+
+ <select id="getAllStock" resultType="java.lang.Double">
+ SELECT SUM(anfme) all_qty FROM man_loc_detl WHERE deleted = 0
+ </select>
</mapper>
--
Gitblit v1.9.1