From 1b4b84241538334b4475ba25f117decdc15e26ca Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 18 十二月 2024 08:50:20 +0800
Subject: [PATCH] 修正并板入库，批号不使用Mat中的
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 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 0f9375b..e1ca50a 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;
@@ -679,6 +680,9 @@
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("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
@@ -834,6 +838,9 @@
}
for (OrderDetl o : orderDetls
) {
+ if(o.getAnfme().equals(o.getQty())){
+ continue;
+ }
for (LocDetl l : locDetls
) {
if (o.getMatnr().equals(l.getMatnr())) {
@@ -850,4 +857,38 @@
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