From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后，wms订单跟着删除功能 3.新增订单完成后，上报erp，erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 0d57944..332145e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -8,6 +8,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+import com.zy.asrs.mapper.OrderDetl1Mapper;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.service.*;
@@ -38,6 +39,8 @@
private WrkDetlService wrkDetlService;
@Autowired
private Order1ServiceImpl order1Service;
+ @Autowired
+ private OrderDetl1Mapper orderDetl1Mapper;
@Override
public Order selectByNo(String orderNo) {
@@ -60,33 +63,31 @@
@Override
public void checkComplete(String orderNo) {
- String orderNo1= orderNo.split("-")[0];
+ String orderNo1 = orderNo.split("-")[0];
//涓昏〃
Order order1 = this.selectByNo(orderNo1);
//瀛愯〃鏇存柊鐘舵��
- DocType docType = docTypeService.selectById(order1.getDocType());
- if (!Cools.isEmpty(docType)&&docType.getPakout()==1) {
- Order1 order11 = order1Service.selectByNo(orderNo);
- if (Cools.isEmpty(order11)||order11.getSettle()>4) {
- return;
- }
+ Order1 order11 = order1Service.selectByNo(orderNo);
+ if (Cools.isEmpty(order11) || order11.getSettle() > 4) {
+ return;
+ }
- List<OrderDetl> orderDetls1 = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order1.getId()));
- boolean complete1 = true;
- for (OrderDetl orderDetl : orderDetls1) {
- if (orderDetl.getAnfme() > orderDetl.getQty()) {
- complete1 = false;
- break;
- }
- }
- if (complete1) {
-
- if (!order1Service.updateSettle(order11.getId(), 4L, null)) {
- throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order1.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
- }
+ List<OrderDetl1> orderDetls1 = orderDetl1Mapper.selectList(new EntityWrapper<OrderDetl1>().eq("order_id", order1.getId()));
+ boolean complete1 = true;
+ for (OrderDetl1 orderDetl : orderDetls1) {
+ if (orderDetl.getAnfme() > orderDetl.getQty()) {
+ complete1 = false;
+ break;
}
}
+ if (complete1) {
+
+ if (!order1Service.updateSettle(order11.getId(), 4L, null)) {
+ throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order1.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
+ }
+ }
+
//涓昏〃鏇存柊鐘舵��
if (Cools.isEmpty(order1) || order1.getSettle() >= 4L) {
--
Gitblit v1.9.1