From 1e035e59e748a047993a88389f4872b1c74fc1a4 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 21 十月 2025 17:02:21 +0800
Subject: [PATCH] 出库增加商品名称搜索条件
---
src/main/java/com/zy/asrs/controller/MobileController.java | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 5e78714..1081145 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -9,15 +9,15 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.GDYKConfirmGoodsParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.OffSaleParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.license.AbstractServerInfos;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -58,6 +58,8 @@
@Autowired
private WrkDetlLogService wrkDetlLogService;
+
+ private static Logger logger = LogManager.getLogger(MobileController.class);
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@@ -136,10 +138,13 @@
combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
combMat.setMaktx(orderDetl.getMaktx());
combMat.setSpecs(orderDetl.getSpecs());
+ combMat.setDetId(orderDetl.getDetId());
+ combMat.setDetlId(orderDetl.getId());
combMats.add(combMat);
}
combParam.setCombMats(combMats);
}
+ combParam.setBillNo(order.getOrderNo());
combParam.setOrderNo(order.getOrderNo());
combParams.add(combParam);
}
@@ -150,6 +155,7 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam) {
+ logger.info("缁勬墭鍙傛暟锛歿}",combParam);
if (Cools.isEmpty(combParam.getOrderNo())) {
combParam.setOrderNo(combParam.getBillNo());
}
@@ -162,6 +168,19 @@
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
+
+ @RequestMapping("/pickIn/auth")
+// @ManagerAuth(memo="鐩樼偣鍏ュ簱")
+ public R pickIn(@RequestParam String barcode){
+ WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+ List<PickInParam> param = wrkDetlService.selectDetByBarcode(barcode);
+ for(PickInParam pickInParam : param){
+ pickInParam.setStaNo(wrkMast.getStaNo());
+ pickInParam.setWorkNo(wrkMast.getWrkNo());
+ }
+ return R.ok().add(param);
+ }
+
@RequestMapping("/pack/get/auth")
@ManagerAuth
@@ -176,12 +195,12 @@
return R.ok("缁勬墭鎴愬姛");
}
- @RequestMapping("/pack/comb/auth")
- @ManagerAuth(memo = "涓嬬嚎缁勬墭")
- public R packComb(@RequestBody CombParam combParam) {
- mobileService.packComb(combParam, getUserId());
- return R.ok("缁勬墭鎴愬姛");
- }
+// @RequestMapping("/pack/comb/auth")
+// @ManagerAuth(memo = "涓嬬嚎缁勬墭")
+// public R packComb(@RequestBody CombParam combParam) {
+// mobileService.packComb(combParam, getUserId());
+// return R.ok("缁勬墭鎴愬姛");
+// }
// 鍑哄簱 ---------------------------------------------------------------------------------------------------
@@ -193,7 +212,6 @@
if (Cools.isEmpty(barcode)) {
return R.ok();
}
- System.out.println(barcode);
if (!Cools.isEmpty(barcode)) {
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
return R.ok().add(wrkDetls);
@@ -430,7 +448,7 @@
if (temp1 == null) {
throw new CoolException("璇ヨ鍗曚笉瀛樺湪");
}
- List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", temp1.getOrderNo()).like("model", size).last("and anfme > work_qty"));
+ List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", temp1.getOrderNo()).last("and anfme > work_qty"));
if (waitMatins == null || waitMatins.isEmpty()) {
throw new CoolException("璇ヨ鍗曢」涓嶅瓨鍦�");
}
@@ -443,9 +461,10 @@
if (!Cools.isEmpty(waitMatins)) {
for (OrderDetl waitMatin : waitMatins) {
CombBillQueryVo vo = new CombBillQueryVo();
+ vo.setDetlId(waitMatin.getId());
vo.setMatnr(waitMatin.getMatnr());
vo.setMatName(waitMatin.getMaktx());
- vo.setQty(waitMatin.getAnfme());
+ vo.setQty(waitMatin.getAnfme() - waitMatin.getWorkQty());
vo.setCount(waitMatin.getAnfme() - waitMatin.getWorkQty());
vo.setBillNo(waitMatin.getOrderNo());
vo.setSeqNo(waitMatin.getINo());
@@ -454,6 +473,11 @@
vo.setSize(waitMatin.getModel());
vo.setColor(waitMatin.getColor());
vo.setItemBatch(waitMatin.getBatch());
+ vo.setLuHao(waitMatin.getLuHao());
+ vo.setOutOrderNo(waitMatin.getOutOrderNo());
+ vo.setSPgNO(waitMatin.getSPgNO());
+ vo.setProType(waitMatin.getProType());
+ vo.setPacking(waitMatin.getPacking());
//vo.setOveFlag(waitMatin.getOveFlag());
vos.add(vo);
}
--
Gitblit v1.9.1