From d3cb0e841e6585aa84a45f18bb30965db8d1a6aa Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 08 一月 2025 15:48:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 62 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 630bdd7..9e27f88 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -106,6 +107,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){
@@ -118,6 +136,42 @@
public R comb2(@RequestBody CombParam combParam){
mobileService.comb2(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
+ }
+
+ @RequestMapping("/comb/auth3")
+ @ManagerAuth(memo = "缁勬墭")
+ public R comb3(@RequestBody CombParam combParam){
+ mobileService.comb3(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ @RequestMapping("/check/fullplt/auth")
+ @ManagerAuth(memo = "妫�娴嬬墿鏂欐槸鍚︽湁鏈弧鎵樻墭鐩�")
+ public R checkFullplt(@RequestBody CombParam.CombMat combMat){
+ List<LocMast> locMasts = mobileService.checkFullplt(combMat, getUserId());
+ return R.ok().add(locMasts);
+ }
+
+
+ @RequestMapping("/merge/comb/auth")
+ @ManagerAuth(memo = "骞舵澘")
+ public R mergeComb(@RequestBody CombParam combParam){
+ mobileService.mergeComb(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ @RequestMapping("/merge/out/auth")
+ @ManagerAuth(memo = "pda骞舵澘鍑哄簱")
+ public R mergeOut(@RequestParam String locNo,@RequestParam String staNo){
+ mobileService.mergeOut(locNo,staNo, getUserId());
+ return R.ok("鍑哄簱鎴愬姛");
+ }
+
+ @RequestMapping("/merge/comb2/auth")
+ @ManagerAuth(memo = "骞舵澘")
+ public R mergeComb2(@RequestBody CombParam combParam){
+ mobileService.mergeComb2(combParam, getUserId());
+ return R.ok("骞舵澘鎴愬姛");
}
@RequestMapping("/comb/checkBom")
@@ -133,7 +187,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 {
@@ -581,4 +635,11 @@
return R.ok();
}
+ @RequestMapping("/adjustNew/v2/auth")
+ @ManagerAuth(memo = "琛ヨ揣")
+ public synchronized R adjustNewV2(@RequestBody MobileAdjustParam combParam){
+ mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
+ return R.ok("琛ヨ揣鎴愬姛");
+ }
+
}
--
Gitblit v1.9.1