From 010dc23827d3b1020356b6741ec47f7ce81497ab Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期五, 05 七月 2024 13:05:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs
---
src/main/java/com/zy/asrs/controller/MobileController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 15eebc8..eda46bb 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -106,6 +106,23 @@
return R.ok().add(orderDetls);
}
+ @RequestMapping("/check/mergeStore/barcode")
+ @ManagerAuth
+ public R mergeStoreBarcode(@RequestParam String barcode){
+ WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+ if (Cools.isEmpty(wrkMast)) {
+ throw new CoolException("褰撳墠鎵樼洏鐮�" + barcode + "娌℃湁浠诲姟锛岃妫�鏌ワ紒");
+ }
+ if (wrkMast.getIoType() != 104) {
+ throw new CoolException("褰撳墠鎵樼洏鐮�" + barcode + "闈炲苟鏉垮嚭搴�");
+ }
+ if (wrkMast.getWrkSts() != 14L) {
+ throw new CoolException("褰撳墠鎵樼洏鐮�" + barcode + "鍑哄簱鏈畬鎴�");
+ }
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ return R.ok().add(wrkDetl.getBomCode());
+ }
+
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
@@ -117,6 +134,13 @@
@ManagerAuth(memo = "缁勬墭")
public R comb2(@RequestBody CombParam combParam){
mobileService.comb2(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ @RequestMapping("/merge/comb/auth")
+ @ManagerAuth(memo = "缁勬墭")
+ public R mergeComb(@RequestBody CombParam combParam){
+ mobileService.mergeComb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@@ -133,7 +157,7 @@
return R.ok().add(bomMat);
} else {
// 妫�鏌ユ槸鍚﹀湪bom娓呭崟鍐�
- bomMat = bomMatService.selectOne(new EntityWrapper<BomMat>().eq("unit_num", checkBom.getBomCode()).eq("element_num", checkBom.getMatnr()));
+ bomMat = bomMatService.selectOne(new EntityWrapper<BomMat>().eq("bom_num", checkBom.getBomCode()).eq("element_num", checkBom.getMatnr()));
if (Cools.isEmpty(bomMat)) {
throw new CoolException("褰撳墠鐗╂枡" + checkBom.getMatnr() + "涓嶅湪Bom娓呭崟鍐�");
} else {
--
Gitblit v1.9.1