From afe9f011522d1511019fe4e0471c686438845e11 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 09 十二月 2025 19:22:37 +0800
Subject: [PATCH] 入库功能
---
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 23fbfff..01902fb 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.WrkTraceVo;
+import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -51,6 +52,37 @@
wrapper.like("order_no", orderNo);
}
wrapper.le("settle", 2).eq("status", 1);
+ // 绛涢�夊嚭搴撳崟,涓嶄负OrderTypeEnum.STOCK
+ wrapper.ne("doc_type", OrderTypeEnum.STOCK.type);
+ wrapper.orderBy("create_time", false);
+ List<OrderPakout> orders = orderService.selectList(wrapper);
+ // 淇濈暀鍑哄簱鍗�
+ if (!Cools.isEmpty(orders)) {
+ Iterator<OrderPakout> iterator = orders.iterator();
+ while (iterator.hasNext()) {
+ OrderPakout order = iterator.next();
+ if (order.getDocType() != null) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (docType != null) {
+ if (docType.getPakout() == 0) {
+ iterator.remove();
+ }
+ }
+ }
+ }
+ }
+ return R.ok().add(orders);
+ }
+
+ @RequestMapping(value = "/order/AGV/nav/list/auth")
+ @ManagerAuth
+ public R AGVnavList(@RequestParam(required = false) String orderNo){
+ EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(orderNo)) {
+ wrapper.like("order_no", orderNo);
+ }
+ wrapper.le("settle", 2).eq("status", 1);
+ wrapper.eq("doc_type", OrderTypeEnum.STOCK.type);
wrapper.orderBy("create_time", false);
List<OrderPakout> orders = orderService.selectList(wrapper);
// 淇濈暀鍑哄簱鍗�
@@ -117,7 +149,7 @@
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
param.getDocType(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
- null, //
+ param.getItemName(), // 鍖哄煙ID
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
@@ -154,7 +186,7 @@
for (OrderDetlPakout orderDetl : param.getOrderDetlPakoutList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getThreeCode());
if (DetlDto.has(list, dto)) {
OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
@@ -191,7 +223,8 @@
Date now = new Date();
Long userId = getUserId();
// 淇敼涓绘。
- if (!param.getDocType().equals(order.getDocType())) {
+ if (!param.getDocType().equals(order.getDocType()) || !param.getItemName().equals(order.getItemName())) {
+ order.setItemName(param.getItemName());
order.setDocType(param.getDocType());
order.setUpdateBy(userId);
order.setUpdateTime(now);
@@ -210,7 +243,7 @@
for (OrderDetlPakout orderDetl : param.getOrderDetlPakoutList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getThreeCode());
if (DetlDto.has(list, dto)) {
OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),
orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
--
Gitblit v1.9.1