From a86418430d5bba912c2b56fc24e5c6232a7a039c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 24 十月 2024 09:30:32 +0800
Subject: [PATCH] 国自agv服务器IP修改
---
src/main/java/com/zy/asrs/controller/MobileController.java | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 4200c10..ec8bded 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -18,6 +18,9 @@
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 +61,8 @@
@Autowired
private WrkDetlLogService wrkDetlLogService;
+
+ private static Logger logger = LogManager.getLogger(MobileController.class);
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@@ -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());
}
@@ -176,12 +182,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("缁勬墭鎴愬姛");
+// }
// 鍑哄簱 ---------------------------------------------------------------------------------------------------
@@ -189,22 +195,20 @@
@RequestMapping("/pakout/query/auth")
@ManagerAuth
@Deprecated
- public R pakoutQuery(@RequestParam(required = false) String barcode,
- @RequestParam(required = false) Integer staNo,
- @RequestParam(required = false) String matnr) {
- if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
+ public R pakoutQuery(@RequestParam String barcode) {
+ if (Cools.isEmpty(barcode)) {
return R.ok();
}
if (!Cools.isEmpty(barcode)) {
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
return R.ok().add(wrkDetls);
}
- if (!Cools.isEmpty(matnr)) {
- if (!Cools.isEmpty(staNo)) {
- List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr);
- return R.ok().add(wrkDetls);
- }
- }
+// if (!Cools.isEmpty(matnr)) {
+// if (!Cools.isEmpty(staNo)) {
+// List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr);
+// return R.ok().add(wrkDetls);
+// }
+// }
return R.ok();
}
@@ -431,7 +435,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("璇ヨ鍗曢」涓嶅瓨鍦�");
}
@@ -444,9 +448,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());
@@ -455,6 +460,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