From 57e7846403cd3c72cc70e17e205c4e0d8b3aa404 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 04 十一月 2025 10:10:53 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index 9898dde..95b349c 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -10,10 +10,14 @@
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.service.WaitPakinService;
+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;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -26,6 +30,14 @@
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private MobileService mobileService;
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/waitPakin/{id}/auth")
@ManagerAuth
@@ -82,13 +94,24 @@
@RequestMapping(value = "/waitPakin/delete/auth")
@ManagerAuth
+ @Transactional
public R delete(@RequestParam String param){
List<WaitPakin> list = JSONArray.parseArray(param, WaitPakin.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鏁版嵁涓虹┖");
}
for (WaitPakin entity : list){
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("barcode", entity.getZpallet()));
+ if(!Cools.isEmpty(wrkMasts) || wrkMasts.size() > 0){
+ return R.error("鏉＄爜宸茬敓鎴愬叆搴撳伐浣滄。锛岀姝㈠垹闄�");
+ }
waitPakinService.delete(new EntityWrapper<>(entity));
+ //璁㈠崟鍏宠仈锛屼慨鏀硅鍗曚綔涓氭暟閲�
+ if (!Cools.isEmpty(entity.getOrderNo())) {
+ if (!orderDetlService.decrease(entity, entity.getAnfme())) {
+ return R.error("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+ }
+ }
}
return R.ok();
}
@@ -130,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