From a1dd6ff24f7cae0b529ad313ba07351c07965605 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 03 十一月 2025 13:04:09 +0800
Subject: [PATCH] 管控线边仓库存
---
src/main/java/com/zy/asrs/controller/MobileController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 84f7452..3dd3986 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -58,7 +58,7 @@
private WrkDetlLogService wrkDetlLogService;
@PostMapping("/pda/OutOrder")
- @ManagerAuth(memo = "鑾峰緱鍑哄簱鍗�")
+ @ManagerAuth(memo = "鑾峰緱鍑哄簱鍗�",value = ManagerAuth.Auth.NONE)
@Transactional
public R OutOrder(@RequestParam String orderNo) {
List<Order> orders=new ArrayList<Order>();
@@ -90,7 +90,7 @@
}
@PostMapping("/pda/OutLocNo")
- @ManagerAuth(memo = "鑾峰緱骞冲簱鍑哄簱鐨勫搴斿簱浣嶅彿")
+ @ManagerAuth(memo = "鑾峰緱骞冲簱鍑哄簱鐨勫搴斿簱浣嶅彿",value = ManagerAuth.Auth.NONE)
@Transactional
public R OutLocNo(@RequestParam Long orderId) {
List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
@@ -107,17 +107,17 @@
} else {
//鏌ョ湅搴撲綅鏄庣粏涓湁鐨勭墿鏂�
List<ManLocDetl> locDetls = manLocDetlMapper.selectList(new EntityWrapper<ManLocDetl>()
- .eq("matnr", o.getMatnr()).eq("batch",o.getBatch())
+ .eq("matnr", o.getMatnr()).orderBy("modi_time",false)
);
if (Cools.isEmpty(locDetls)) {
continue;
} else {
for (ManLocDetl l : locDetls
) {
- String s = l.getLocNo().substring(0, 2);
- if (Integer.parseInt(s) > 8) {
+// String s = l.getLocNo().substring(0, 2);
+// if (Integer.parseInt(s) > 8) {
list.add(l.getLocNo());
- }
+// }
}
}
}
@@ -127,7 +127,7 @@
}
@PostMapping("/pda/OrderDetlContrastLocDetl")
- @ManagerAuth(memo = "鑾峰緱璁㈠崟鏄庣粏瀵瑰簲鐨勫簱瀛樻槑缁�")
+ @ManagerAuth(memo = "鑾峰緱璁㈠崟鏄庣粏瀵瑰簲鐨勫簱瀛樻槑缁�",value = ManagerAuth.Auth.NONE)
@Transactional
public R OrderDetlContrastLocDetl(@RequestParam Long orderId, @RequestParam String locNo) {
List<ManLocDetl> locDetlList = new ArrayList<ManLocDetl>();
@@ -149,7 +149,7 @@
}
for (ManLocDetl l : locDetls
) {
- if (o.getMatnr().equals(l.getMatnr()) && o.getBatch().equals(l.getBatch())) {
+ if (o.getMatnr().equals(l.getMatnr())) {
if (o.getAnfme() - o.getWorkQty() >= l.getAnfme()) {
} else {
--
Gitblit v1.9.1