From d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/controller/MobileController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index ec47bd4..edd7051 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -47,6 +47,8 @@
private BasDevpService basDevpService;
@Autowired
private PackService packService;
+ @Autowired
+ private WaitPakinService waitPakinService;
// 鎷ｆ枡妫�绱㈡墭鐩樹俊鎭�
@RequestMapping("/piking/auth")
@@ -61,6 +63,25 @@
}
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
return R.ok().add(wrkDetls);
+ }
+
+ // 缁勬墭鍓嶆煡璇㈡墭鐩樼爜鏄惁宸茬粡缁勬墭
+ @RequestMapping("/barcode/auth")
+ @ManagerAuth
+ public R pakinAuth(@RequestParam("barcode") String barcode) {
+ WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", barcode));
+ if (!Cools.isEmpty(waitPakin)) {
+ return R.error("鍏ュ簱閫氱煡妗ｅ凡瀛樺湪锛�");
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("barcode",barcode));
+ if (!Cools.isEmpty(locMast)) {
+ return R.error("搴撳瓨涓绘。涓凡瀛樺湪褰撳墠鏉＄爜锛�");
+ }
+ LocDetl locdetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("barcode", barcode));
+ if (!Cools.isEmpty(locdetl)){
+ return R.error("搴撳瓨鏄庣粏涓凡瀛樺湪褰撳墠鏉＄爜,璇锋鏌ュ簱瀛�");
+ }
+ return R.ok();
}
// 鎷ｆ枡杞叏鏉�
@@ -88,6 +109,7 @@
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setModiTime(now);
+ wrkDetl.setMatType(locDetl.getMatType());
wrkDetl.sync(locDetl);
wrkDetlService.insert(wrkDetl);
@@ -241,6 +263,7 @@
wrkDetl.setOrderNo(orderNo);
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setWrkNo(wrkNo);
+ wrkDetl.setMatType(locDetl.getMatType());
return R.ok().add(wrkDetl);
}
}
--
Gitblit v1.9.1