From 7d7bb8298935b1002ee2770fdf00fc382a53864c Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 03 七月 2024 09:43:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs
---
src/main/java/com/zy/asrs/controller/MobileController.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 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 00dff10..630bdd7 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -59,6 +59,8 @@
private CommonService commonService;
@Autowired
private MatService matService;
+ @Autowired
+ private BomMatService bomMatService;
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@@ -111,6 +113,46 @@
return R.ok("缁勬墭鎴愬姛");
}
+ @RequestMapping("/comb/auth2")
+ @ManagerAuth(memo = "缁勬墭")
+ public R comb2(@RequestBody CombParam combParam){
+ mobileService.comb2(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("unit_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")
@ManagerAuth
public R packGet(@RequestParam String barcode){
--
Gitblit v1.9.1