From df325bcf7aabda3e879fbf86c85b3fd5047cffe0 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 05 十二月 2025 15:34:31 +0800
Subject: [PATCH] #出库单
---
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index d79066f..c941727 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);
// 淇濈暀鍑哄簱鍗�
@@ -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);
--
Gitblit v1.9.1