From 55eb3d480594f4c0dd382eaeeb8548bf911d6ad7 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 08:28:08 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/MobileController.java | 62 ++++++------------------------
1 files changed, 13 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 5b3b2ab..f3a4615 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -44,9 +44,14 @@
@Autowired
private LocDetlService locDetlService;
@Autowired
- private OrderService orderService;
+ private OrderPakoutService orderPakoutService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
@Autowired
private DocTypeService docTypeService;
@Autowired
@@ -61,13 +66,7 @@
private CommonService commonService;
-// @PostMapping("/agv/start")
-// @ManagerAuth
-// public R pdaStockCheck(@RequestBody StockCheckParam param){
-//
-//
-//
-// }
+
@PostMapping("/agv/start")
@@ -79,16 +78,6 @@
} else if (Cools.isEmpty(map.get("inSta"))) {
return R.parse("鍏ュ簱绔欑偣涓嶈兘涓虹┖");
}
-// HashMap<String, String> map1 = new HashMap<>();
-// map1.put("agv0001","sta0001");
-// String sta = map.get("sta").toString();
-//
-// ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
-// getAgvTaskParam(forwardAGVTaskParam,sta,map1.get(sta));
-// String request = forwardAGVHttpRequest(forwardAGVTaskParam, "10.0.100.110:8182", "/rcms/services/rest/hikRpcService/genAgvSchedulingTask");
-// if ("SUCCESS".equals(request)) {
-// return R.ok();
-// }
String sta = (String) map.get("sta"); // 鏆傚瓨浣�
String inSta = String.valueOf(map.get("inSta")); // 鍏ュ簱绔欑偣
@@ -187,39 +176,14 @@
}
- // 缁勬墭 ----------------------------------------------------------------------------------------------------
- /**
- * 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
- * http://localhost:8081/jkwms/mobile/order/serach/orderNo/auth?orderNo=123123
- */
-// @RequestMapping("/order/search/orderNo/auth")
-// @ManagerAuth
-// public R orderSearchByBarcode(@RequestParam String orderNo){
-// Order order = orderService.selectByNo(orderNo);
-// if (order == null) {
-// return R.ok();
-// }
-// DocType docType = docTypeService.selectById(order.getDocType());
-// if (docType.getPakin() == null || docType.getPakin() != 1) {
-// return R.ok();
-// }
-// if (order.getSettle() > 2) {
-// return R.ok();
-// }
-// List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
-// if (Cools.isEmpty(orderDetls)) {
-// return R.ok();
-// }
-// return R.ok().add(orderDetls);
-// }
@RequestMapping("/order/search/orderNo/auth")
@ManagerAuth
public R orderSearchByBarcode(@RequestParam String orderNo) {
if (Cools.isEmpty(orderNo)) {
orderNo = null;
}
- List<OrderPakin> orders = orderService.selectorderNoL(orderNo);
+ List<OrderPakin> orders = orderPakinService.selectorderNoL(orderNo);
if (Cools.isEmpty(orders)) {
return R.ok();
}
@@ -237,10 +201,10 @@
if (order.getSettle() > 2) {
continue;
}
- List<OrderDetlPakout> orderDetlPakouts = orderService.selectWorkingDetls(order.getId());
+ List<OrderDetlPakin> orderDetlPakouts = orderPakinService.selectWorkingDetls(order.getId());
if (!Cools.isEmpty(orderDetlPakouts)) {
LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
- for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+ for (OrderDetlPakin orderDetlPakout : orderDetlPakouts) {
CombParam.CombMat combMat = new CombParam.CombMat();
combMat.setMatnr(orderDetlPakout.getMatnr());
combMat.setBatch(orderDetlPakout.getBatch());
@@ -342,7 +306,7 @@
return R.ok();
}
// List<Order> orders = orderService.selectorderNoL(batch);
- OrderDetlPakout orderDetlPakout = orderDetlService.selectOne(new EntityWrapper<OrderDetlPakout>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no", combParam.getOrderNo()));
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectOne(new EntityWrapper<OrderDetlPakout>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no", combParam.getOrderNo()));
if (Cools.isEmpty(orderDetlPakout)) {
return R.error("鏈煡鍒版暟鎹�");
}
@@ -351,7 +315,7 @@
}
//澶嶆牳鏁�
orderDetlPakout.setSource(1);
- orderDetlService.updateById(orderDetlPakout);
+ orderDetlPakoutService.updateById(orderDetlPakout);
return R.ok();
}
--
Gitblit v1.9.1