From e9e62abb618d334d6999102ec20c49d38df587e6 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 15 十月 2025 13:10:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 109 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 00dff10..c75a28d 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;
@@ -17,6 +18,7 @@
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +29,7 @@
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
* Created by vincent on 2020/6/10
*/
+@Slf4j
@RestController
@RequestMapping("mobile")
public class MobileController extends BaseController {
@@ -59,6 +62,8 @@
private CommonService commonService;
@Autowired
private MatService matService;
+ @Autowired
+ private BomMatService bomMatService;
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@@ -104,11 +109,107 @@
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){
+ public synchronized R comb(@RequestBody CombParam combParam){
+ log.info("comb,{}",JSONObject.toJSON(combParam));
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
+ }
+
+ @RequestMapping("/comb/auth2")
+ @ManagerAuth(memo = "缁勬墭")
+ public synchronized R comb2(@RequestBody CombParam combParam){
+ log.info("comb2,{}",JSONObject.toJSON(combParam));
+ mobileService.comb2(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ @RequestMapping("/comb/auth3")
+ @ManagerAuth(memo = "缁勬墭")
+ public synchronized R comb3(@RequestBody CombParam combParam){
+ log.info("comb3,{}",JSONObject.toJSON(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")
+ @ManagerAuth(memo = "鏍￠獙Bom")
+ public R checkBom(@RequestBody CheckBom checkBom){
+ BomMat bomMat = new BomMat();
+ // 娌℃湁杈撳叆bom鍙锋甯哥粍鎵�
+ if (Cools.isEmpty(checkBom.getBomCode())) {
+ return R.ok();
+ }
+
+ if (Cools.isEmpty(checkBom.getMatnr())) {
+ return R.ok().add(bomMat);
+ } else {
+ // 妫�鏌ユ槸鍚﹀湪bom娓呭崟鍐�
+ 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 {
+ // 妫�鏌ュ簱瀛樹腑鏄惁鏈夊綋鍓峛om鐨勭墿鏂�
+ Double bomQyt = locDetlService.getBomQyt(checkBom.getBomCode(), checkBom.getMatnr());
+ if (!Cools.isEmpty(bomQyt)) {
+ bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQyt);
+ }
+ Double bomQty = wrkDetlService.getBomQty(checkBom.getBomCode(), checkBom.getMatnr());
+ if (!Cools.isEmpty(bomQty)) {
+ bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQty);
+ }
+ // 妫�鏌ュ伐浣滄。涓槸鍚︽湁褰撳墠bom鐨勭墿鏂�
+
+ }
+ }
+ return R.ok().add(bomMat);
}
@RequestMapping("/pack/get/auth")
@@ -539,4 +640,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