From 40caddc08252ad3276832a14a69cfaf9f71b08c8 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期二, 05 十一月 2024 08:53:41 +0800
Subject: [PATCH] 完善
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java | 72 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
index 1d8dacd..a84fb60 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
@@ -66,16 +66,28 @@
@Autowired
private MatService matService;
+
+ /**
+ * 骞冲韩涓婃灦
+ * @param locNo
+ * @param barcode
+ * @return
+ */
@RequestMapping("/pda/WarehouseIn")
@ManagerAuth
public R WarehouseIn(@RequestParam String locNo, @RequestParam String barcode) {
- return mobileService.WarehouseIn(locNo, barcode, getHostId());
+ return mobileService.WarehouseIn(locNo, barcode, getHostId(), getUserId());
}
+ /**
+ * 骞冲韩涓嬫灦
+ * @param combParam
+ * @return
+ */
@RequestMapping("/pda/WarehouseOut")
@ManagerAuth
public R WarehouseOut(@RequestBody CombParam combParam) {
- return mobileService.WarehouseOut(combParam, getHostId());
+ return mobileService.WarehouseOut(combParam, getHostId(), getUserId());
}
@RequestMapping("/outBound/mat/list")
@@ -520,6 +532,57 @@
return R.ok().add(maps);
}
+ @RequestMapping("/outBound/order/list")
+ @ManagerAuth(memo = "鑾峰彇鍑哄簱璁㈠崟")
+ public R outBound(@RequestParam(required = false) String matnr,@RequestParam(required = false) String orderNo){
+ List<DocType> docTypes = docTypeService.list(new LambdaQueryWrapper<DocType>().like(DocType::getPakout, 1));
+ ArrayList<Long> typeList = new ArrayList<>();
+ for (DocType docType : docTypes) {
+ typeList.add(docType.getDocId());
+ }
+
+ LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Order::getStatus, 1);
+ wrapper.eq(Order::getHostId, getHostId());
+ wrapper.in(Order::getDocType, typeList);
+ List<Order> orders = orderService.list(wrapper);
+
+ ArrayList<Long> orderIds = new ArrayList<>();
+ for (Order order : orders) {
+ orderIds.add(order.getId());
+ }
+
+ //鎼滅储鏄庣粏
+ LambdaQueryWrapper<OrderDetl> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(OrderDetl::getStatus, 1);
+ wrapper1.eq(OrderDetl::getHostId, getHostId());
+ wrapper1.in(OrderDetl::getOrderId, orderIds);
+ if (!Cools.isEmpty(matnr)) {
+ wrapper1.like(OrderDetl::getMatnr, matnr);
+ }
+
+ List<OrderDetl> list = orderDetlService.list(wrapper1);
+
+ ArrayList<PickMatParam> maps = new ArrayList<>();
+ for (OrderDetl orderDetl : list) {
+ //鍓╀綑鍙敤鏁伴噺
+ double count = orderDetl.getAnfme() - orderDetl.getWorkQty();
+ if (count <= 0) {
+ continue;
+ }
+
+ PickMatParam matParam = new PickMatParam();
+ matParam.setMatnr(orderDetl.getMatnr());
+ matParam.setBatch(orderDetl.getBatch());
+ matParam.setOrderNo(orderDetl.getOrderNo());
+ matParam.setOrderId(orderDetl.getOrderId());
+ matParam.setCount(count);
+ matParam.setUseCount(count);
+ maps.add(matParam);
+ }
+ return R.ok().add(maps);
+ }
+
@RequestMapping("/pick/in")
@ManagerAuth(memo = "骞舵澘鍏ュ簱")
@Transactional
@@ -620,8 +683,13 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
+ Order order = orderService.selectByNo(matParam.getOrderNo(), getHostId());
+ if (order == null) {
+ throw new CoolException("Order is not exits");
+ }
//鏇存柊璁㈠崟宸ヤ綔鏁伴噺
orderDetlService.increaseWorkQtyByOrderNo(matParam.getOrderNo(), matParam.getMatnr(), matParam.getBatch(), matParam.getUseCount(), getHostId());
+ orderService.updateSettle(order.getId(), 2L, getUserId(), getHostId());
}
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, param.getLocNo()).eq(LocMast::getHostId, getHostId()));
--
Gitblit v1.9.1