From 24b39a858545b192bbba4ee336af201b45f4d1dd Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 24 十二月 2024 16:04:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 639e1d4..7a8c84c 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -16,6 +16,7 @@
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -108,7 +109,8 @@
if (Cools.isEmpty(orderNo)){
orderNo=null;
}
- List<Order> orders = orderService.selectorderNoL(orderNo);
+// List<Order> orders = orderService.selectorderNoL(orderNo);
+ List<Order> orders = OrderInAndOutUtil.selectOrderNoL(null, orderNo);
if (Cools.isEmpty(orders)){
return R.ok();
}
@@ -126,7 +128,8 @@
if (order.getSettle() > 2) {
continue;
}
- List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
+// List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectWorkingDetls(order.getPakinPakoutStatus$(), order.getId());
if (!Cools.isEmpty(orderDetls)) {
LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
for (OrderDetl orderDetl:orderDetls){
@@ -232,7 +235,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()));
+// OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no",combParam.getOrderNo()));
+ Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, combParam.getOrderNo());
+ List<OrderDetl> orderDetlList = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
+ OrderDetl orderDetl = null;
+ for (OrderDetl orderDetl1 : orderDetlList){
+ if (combParam.getMatnr().equals(orderDetl1.getMatnr()) && combParam.getBatch().equals(orderDetl1.getBatch())){
+ orderDetl = orderDetl1;
+ break;
+ }
+ }
if (Cools.isEmpty(orderDetl)){
return R.error("鏈煡鍒版暟鎹�");
}
@@ -241,7 +253,8 @@
}
//澶嶆牳鏁�
orderDetl.setSource(1);
- orderDetlService.updateById(orderDetl);
+// orderDetlService.updateById(orderDetl);
+ OrderInAndOutUtil.updateOrderDetl(Boolean.FALSE,order,orderDetl);
return R.ok();
}
--
Gitblit v1.9.1