From d3bf3d3917d8201d64e8e2c66e99afb7099487f9 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 17:01:23 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/MobileController.java | 114 +++++++++++++--------------------------------------------
1 files changed, 26 insertions(+), 88 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 5632924..30df6f5 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -9,7 +9,10 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.entity.param.ForwardAGVTaskParam;
+import com.zy.asrs.entity.param.GDYKConfirmGoodsParam;
+import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
@@ -41,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
@@ -53,20 +61,9 @@
@Autowired
private BasDevpService basDevpService;
@Autowired
- private PackService packService;
- @Autowired
private WrkDetlLogService wrkDetlLogService;
@Autowired
private CommonService commonService;
-
-
-// @PostMapping("/agv/start")
-// @ManagerAuth
-// public R pdaStockCheck(@RequestBody StockCheckParam param){
-//
-//
-//
-// }
@PostMapping("/agv/start")
@@ -78,16 +75,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")); // 鍏ュ簱绔欑偣
@@ -186,45 +173,19 @@
}
- // 缁勬墭 ----------------------------------------------------------------------------------------------------
-
- /**
- * 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
- * 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<Order> orders = orderService.selectorderNoL(orderNo);
+ List<OrderPakin> orders = orderPakinService.selectorderNoL(orderNo);
if (Cools.isEmpty(orders)) {
return R.ok();
}
LinkedList<CombParam> combParams = new LinkedList<>();
if (!Cools.isEmpty(orders)) {
- for (Order order : orders) {
+ for (OrderPakin order : orders) {
CombParam combParam = new CombParam();
if (order == null) {
continue;
@@ -236,16 +197,16 @@
if (order.getSettle() > 2) {
continue;
}
- List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
- if (!Cools.isEmpty(orderDetls)) {
+ List<OrderDetlPakin> orderDetlPakouts = orderPakinService.selectWorkingDetls(order.getId());
+ if (!Cools.isEmpty(orderDetlPakouts)) {
LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
- for (OrderDetl orderDetl : orderDetls) {
+ for (OrderDetlPakin orderDetlPakout : orderDetlPakouts) {
CombParam.CombMat combMat = new CombParam.CombMat();
- combMat.setMatnr(orderDetl.getMatnr());
- combMat.setBatch(orderDetl.getBatch());
- combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
- combMat.setMaktx(orderDetl.getMaktx());
- combMat.setSpecs(orderDetl.getSpecs());
+ combMat.setMatnr(orderDetlPakout.getMatnr());
+ combMat.setBatch(orderDetlPakout.getBatch());
+ combMat.setAnfme(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty());
+ combMat.setMaktx(orderDetlPakout.getMaktx());
+ combMat.setSpecs(orderDetlPakout.getSpecs());
combMats.add(combMat);
}
combParam.setCombMats(combMats);
@@ -277,27 +238,6 @@
}
- }
-
-
- @RequestMapping("/pack/get/auth")
- @ManagerAuth
- public R packGet(@RequestParam String barcode) {
- Pack pack = packService.selectByBarcode(barcode);
- if (pack == null) {
- return R.ok();
- }
- if (pack.getSettle() == 1L) {
- return R.ok().add(pack);
- }
- return R.ok("缁勬墭鎴愬姛");
- }
-
- @RequestMapping("/pack/comb/auth")
- @ManagerAuth(memo = "涓嬬嚎缁勬墭")
- public R packComb(@RequestBody CombParam combParam) {
- mobileService.packComb(combParam, getUserId());
- return R.ok("缁勬墭鎴愬姛");
}
@@ -358,16 +298,16 @@
return R.ok();
}
// List<Order> orders = orderService.selectorderNoL(batch);
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no", combParam.getOrderNo()));
- if (Cools.isEmpty(orderDetl)) {
+ 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("鏈煡鍒版暟鎹�");
}
- if (!orderDetl.getQty$().equals("宸插畬鎴�")) {
+ if (!orderDetlPakout.getQty$().equals("宸插畬鎴�")) {
return R.error("浠诲姟鏈畬鎴�");
}
//澶嶆牳鏁�
- orderDetl.setSource(1);
- orderDetlService.updateById(orderDetl);
+ orderDetlPakout.setSource(1);
+ orderDetlPakoutService.updateById(orderDetlPakout);
return R.ok();
}
@@ -519,7 +459,6 @@
}
-
@PostMapping("/order/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
@@ -529,7 +468,6 @@
mobileService.pakoutByOrder(param, getUserId());
return R.ok("鍑哄簱鎴愬姛");
}
-
@RequestMapping("/ddd/ddd")
--
Gitblit v1.9.1