From 469d41fe09ceec3dc5259d01a4060aac1448e09f Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 03 九月 2025 09:59:34 +0800
Subject: [PATCH] 完善订单组托可用数据显示功能
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 160 insertions(+), 15 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 9d45c2a..29de0a6 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
@@ -1,6 +1,7 @@
package com.zy.asrs.wms.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.common.domain.dto.LocDetlDto;
import com.zy.asrs.common.domain.dto.WrkDto;
import com.zy.asrs.common.domain.entity.MobileAdjustResult;
@@ -22,10 +23,7 @@
import com.zy.asrs.framework.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.stream.Collectors;
@@ -66,16 +64,30 @@
@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")
@@ -116,8 +128,8 @@
.eq(OrderDetl::getMatnr, matnr)
.like(OrderDetl::getOrderNo, orderNo)
.orderByDesc(OrderDetl::getCreateTime));
- for (OrderDetl orderDetl:list
- ) {
+ for (OrderDetl orderDetl : list
+ ) {
double count = orderDetl.getAnfme() - orderDetl.getWorkQty();
PickMatParam matParam = new PickMatParam();
matParam.setMatnr(orderDetl.getMatnr());
@@ -153,18 +165,19 @@
@RequestMapping("/pda/WarehouseOutPickMerge/v1")
@ManagerAuth
public R WarehouseOutPickMergeV1(@RequestBody WarehouseOutPickMergeParam param) {
- return mobileService.WarehouseOutPickMergeV1(param, getHostId(),getUserId());
+ return mobileService.WarehouseOutPickMergeV1(param, getHostId(), getUserId());
}
/**
* 澶氭骞舵澘
+ *
* @param param
* @return
*/
@RequestMapping("/pda/WarehouseOutMergeBoardMany/v1")
@ManagerAuth
public R WarehouseOutMergeBoardManyV1(@RequestBody WarehouseOutMergeBoardManyParam param) {
- return mobileService.WarehouseOutMergeBoardMany(param, getHostId(),getUserId());
+ return mobileService.WarehouseOutMergeBoardMany(param, getHostId(), getUserId());
}
@RequestMapping("/menu/pda/auth")
@@ -476,14 +489,25 @@
}
LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Order::getStatus, 1);
+ wrapper.in(Order::getStatus, 1,2);
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());
+ Date currentDate = new Date();
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(currentDate);
+ calendar.add(Calendar.MONTH, -1);
+
+ Date previousMonthDate = calendar.getTime();
+ int result=previousMonthDate.compareTo(order.getCreateTime());
+ if(result<0){
+ orderIds.add(order.getId());
+ }
+
}
//鎼滅储鏄庣粏
@@ -492,6 +516,7 @@
wrapper1.eq(OrderDetl::getHostId, getHostId());
wrapper1.in(OrderDetl::getOrderId, orderIds);
wrapper1.orderByDesc(OrderDetl::getCreateTime);
+// wrapper1.last("LIMIT 1000");
if (!Cools.isEmpty(matnr)) {
wrapper1.like(OrderDetl::getMatnr, matnr);
}
@@ -510,6 +535,7 @@
PickMatParam matParam = new PickMatParam();
matParam.setMatnr(orderDetl.getMatnr());
+ matParam.setMaktx(orderDetl.getMaktx());
matParam.setBatch(orderDetl.getBatch());
matParam.setOrderNo(orderDetl.getOrderNo());
matParam.setOrderId(orderDetl.getOrderId());
@@ -520,9 +546,9 @@
return R.ok().add(maps);
}
- @RequestMapping("/outBound/mat/list")
+ @RequestMapping("/outBound/order/list")
@ManagerAuth(memo = "鑾峰彇鍑哄簱璁㈠崟")
- public R outBound(@RequestParam(required = false) String matnr,@RequestParam(required = false) String orderNo){
+ 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) {
@@ -667,12 +693,20 @@
wrkDetl.setHostId(getHostId());
wrkDetl.setWrkMastId(wrkMast.getId());
wrkDetl.setZpallet(wrkMast.getBarcode());
+ if(Cools.isEmpty(matParam.getBatch())){
+ wrkDetl.setBatch("");
+ }
if (!wrkDetlService.save(wrkDetl)) {
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()));
@@ -727,7 +761,7 @@
@RequestMapping("/barcode/list/pick")
@ManagerAuth(memo = "鎷ｆ枡鍏ュ簱閫斾腑骞舵澘")
@Transactional
- public R orderOutListOrderPick(@RequestBody String barcode) {
+ public R orderOutListOrderPick(@RequestBody(required = false) String barcode) {
ArrayList<WrkMast> wrkMastArrayList = new ArrayList<>();
if (Cools.isEmpty(barcode) || barcode.isEmpty()) {
List<WrkMast> wrkMasts = wrkMastService.list(new LambdaQueryWrapper<WrkMast>()
@@ -759,4 +793,115 @@
return R.ok().add(wrkMastArrayList);
}
+ @PostMapping("/pda/OutLocNo")
+ @ManagerAuth(memo = "鑾峰緱骞冲簱鍑哄簱鐨勫搴斿簱浣嶅彿")
+ @Transactional
+ public R OutLocNo(@RequestParam Long orderId) {
+ List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>()
+ .eq(OrderDetl::getOrderId, orderId)
+ .eq(OrderDetl::getHostId, getHostId())
+ );
+ if (Cools.isEmpty(orderDetls)) {
+ return R.error("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+ }
+ List<String> list = new ArrayList<>();
+ for (OrderDetl o : orderDetls
+ ) {
+ if (o.getAnfme() <= o.getWorkQty()) {
+ continue;
+ } else {
+ //鏌ョ湅搴撲綅鏄庣粏涓湁鐨勭墿鏂�
+ List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
+ .eq(LocDetl::getMatnr, o.getMatnr()).eq(LocDetl::getHostId, getHostId())
+ );
+ if (Cools.isEmpty(locDetls)) {
+ continue;
+ } else {
+ for (LocDetl l : locDetls
+ ) {
+ String s = l.getLocNo().substring(1, 2);
+ if (Integer.valueOf(s) > 4) {
+ list.add(l.getLocNo());
+ }
+ }
+
+ }
+ }
+ }
+ List<String> myList = list.stream().distinct().collect(Collectors.toList());
+ return R.ok(myList);
+ }
+
+ @PostMapping("/pda/OrderDetlContrastLocDetl")
+ @ManagerAuth(memo = "鑾峰緱璁㈠崟鏄庣粏瀵瑰簲鐨勫簱瀛樻槑缁�")
+ @Transactional
+ public R OrderDetlContrastLocDetl(@RequestParam Long orderId, @RequestParam String locNo) {
+ List<LocDetl> locDetlList = new ArrayList<LocDetl>();
+ List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>()
+ .eq(OrderDetl::getOrderId, orderId)
+ .eq(OrderDetl::getHostId, getHostId())
+ );
+ if (Cools.isEmpty(orderDetls)) {
+ return R.error("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+ }
+ List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
+ .eq(LocDetl::getLocNo, locNo));
+ if (Cools.isEmpty(locDetls)) {
+ return R.error("搴撲綅涓虹┖");
+ }
+ for (OrderDetl o : orderDetls
+ ) {
+ if(o.getAnfme().equals(o.getQty())){
+ continue;
+ }
+ for (LocDetl l : locDetls
+ ) {
+ if (o.getMatnr().equals(l.getMatnr())) {
+ if (o.getAnfme() - o.getWorkQty() >= l.getAnfme()) {
+
+ } else {
+ l.setAnfme(o.getAnfme() - o.getWorkQty());
+ }
+ locDetlList.add(l);
+ break;
+ }
+ }
+ }
+ return R.ok(locDetlList);
+ }
+
+ @PostMapping("/pda/OutOrder")
+ @ManagerAuth(memo = "鑾峰緱鍑哄簱鍗�")
+ @Transactional
+ public R OutOrder(@RequestParam String orderNo) {
+ List<Order> orders=new ArrayList<Order>();
+ List<Order> OrderList=new ArrayList<Order>();
+ if(Cools.isEmpty(orderNo)){
+ orders= orderService.list(new LambdaQueryWrapper<Order>()
+ .between(Order::getSettle,1,2)
+ .eq(Order::getHostId, getHostId())
+ );
+ }else{
+ orders= orderService.list(new LambdaQueryWrapper<Order>()
+ .like(Order::getOrderNo, orderNo)
+ .between(Order::getSettle,1,2)
+ .eq(Order::getHostId, getHostId())
+ );
+ }
+ if(Cools.isEmpty(orders)){
+ return R.ok();
+ }
+ for (Order o:orders
+ ) {
+ DocType docType=docTypeService.getOne(new LambdaQueryWrapper<DocType>()
+ .eq(DocType::getDocId,o.getDocType()));
+ if(docType.getPakout()==1){
+ OrderList.add(o);
+ }
+ }
+
+
+ return R.ok(OrderList);
+ }
+
}
--
Gitblit v1.9.1