From 5ee8d702138b67a8070e850ba622aa4b07d64fb9 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 30 十月 2025 13:00:08 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index 3ac94fd..95b349c 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -10,12 +10,11 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.WaitPakinService;
-import com.zy.asrs.service.WrkMastService;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +34,10 @@
private OrderDetlService orderDetlService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private MobileService mobileService;
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/waitPakin/{id}/auth")
@ManagerAuth
@@ -150,4 +153,36 @@
return R.ok();
}
+ /*鍏ュ簱閫氱煡妗ｇ晫闈㈢粍鎵� 闀囨睙鎭掔珛*/
+ @RequestMapping(value = "waitPakin/comb/auth")
+ @ManagerAuth
+ public R comb(WaitPakin waitPakin) {
+ if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
+ return R.error(BaseRes.PARAM);
+ }
+ mobileService.combToWms(waitPakin);
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ /*鍏ュ簱閫氱煡妗ｇ晫闈㈠苟鏉� 闀囨睙鎭掔珛*/
+ @RequestMapping(value = "/waitPakin/clamp/auth")
+ @ManagerAuth
+ public R clamp(WaitPakin waitPakin) {
+ if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
+ return R.error(BaseRes.PARAM);
+ }
+ Mat mat = matService.selectById(waitPakin.getModiUser());
+ MobileAdjustParam combParam=new MobileAdjustParam();
+ ArrayList<CombParam.CombMat> combMats=new ArrayList<>();
+ CombParam.CombMat combMat=new CombParam.CombMat();
+ combMat.setSpecs(mat.getSpecs());
+ combMat.setMatnr(mat.getMatnr());
+ combMat.setMaktx(mat.getMaktx());
+ combMat.setAnfme(waitPakin.getAnfme());
+ combMats.add(combMat);
+ combParam.setBarcode(waitPakin.getBarcode());
+ combParam.setCombMats(combMats);
+ mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
+ return R.ok("骞舵澘鎴愬姛");
+ }
}
--
Gitblit v1.9.1