From 102a41a8d5c231dd306bad622344e98312c1a774 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 02 十二月 2025 10:16:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 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 e10b4c3..daff9ef 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -13,6 +13,8 @@
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.OrderDetlPakinServiceImpl;
+import com.zy.asrs.service.impl.OrderPakinServiceImpl;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
@@ -54,6 +56,10 @@
@Resource
private StaDescService staDescService;
+ @Autowired
+ private OrderPakinServiceImpl orderPakinService;
+ @Autowired
+ private OrderDetlPakinServiceImpl orderDetlPakinService;
@RequestMapping("/pda/WarehouseOut/v1")
@ManagerAuth(memo = "骞舵澘閫斾腑鎷ｆ枡-鍙傝�冨康鍒�")
@@ -197,6 +203,40 @@
return R.ok().add(combParams);
}
+ @RequestMapping("/order/search/orderDetl/auth")
+ @ManagerAuth
+ public R orderDetlSearchByBarcode(@RequestBody OrderDetlByCode param){
+ if (Cools.isEmpty(param)){
+ return R.ok();
+ }
+ List<OrderDetlPakin> orderDetls = orderDetlPakinService.selectOrderDetls(param);
+ CombParam combParam = new CombParam();
+ if (!Cools.isEmpty(orderDetls)) {
+ LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
+
+ for (OrderDetlPakin od : orderDetls) {
+ CombParam.CombMat mat = new CombParam.CombMat();
+ mat.setMatnr(od.getMatnr());
+ mat.setOrderNo(od.getOrderNo());
+ mat.setAnfme(od.getAnfme() - od.getWorkQty());
+ mat.setMaktx(od.getMaktx());
+ mat.setSku(od.getSku());
+ mat.setMemo(od.getMemo());
+ mat.setSupp(od.getSupp());
+ mat.setBoxType1(od.getBoxType1());
+ mat.setBoxType2(od.getBoxType2());
+ mat.setBoxType3(od.getBoxType3());
+ mat.setStandby1(od.getStandby1());
+ mat.setStandby2(od.getStandby2());
+ mat.setStandby3(od.getStandby3());
+ combMats.add(mat);
+ }
+ combParam.setCombMats(combMats);
+ }
+ return R.ok().add(combParam);
+ }
+
+
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
@@ -206,6 +246,14 @@
return R.ok("缁勬墭鎴愬姛");
}
+ @RequestMapping("/comb/agv/auth")
+ @ManagerAuth(memo = "缁勬墭")
+ public R combAgv(@RequestBody CombParam combParam){
+// mobileService.comb(combParam, getUserId());
+ mobileService.combAgv(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
@RequestMapping("/combAuto/auth")
@ManagerAuth(memo = "缁勬墭")
public R combAuto(@RequestBody CombParam combParam){
--
Gitblit v1.9.1