From 68b29d3f9b68db4894d903e146a3eb6a3bbbbae7 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Thu, 28 May 2026 15:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug#1585=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/orderImport/WebCadOrderImportServiceImpl.java    | 5 +++++
 .../orderImport/factory/WebCadOrderImportAsyncFactory.java   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java
index b4ace6970..3f2379418 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java
@@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.cf.imes.framework.common.enums.OrderPackageStatusEnum;
 import com.cf.imes.framework.common.exception.ErrorCode;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.common.util.Assert.AssertUtils;
@@ -232,6 +233,10 @@ public class WebCadOrderImportServiceImpl implements WebCadOrderImportService {
             if (OrderStatusEnum.EMPTY.getStatus().equals(status)) {
                 lambdaUpdateWrapper.set(OrderDO::getStatus, OrderStatusEnum.NEW_ORDER.getStatus());
             }
+            // 已封包的订单修改为未封包
+            if (OrderPackageStatusEnum.PACKAGED.getStatus().equals(orderDOFromOrderNo.getPackaged())) {
+                lambdaUpdateWrapper.set(OrderDO::getPackaged, OrderPackageStatusEnum.UNPACKED.getStatus());
+            }
             orderMapper.update(lambdaUpdateWrapper);
         }
 
diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
index c78b50032..036d6cddd 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONReader;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.cf.imes.framework.common.enums.OrderPackageStatusEnum;
 import com.cf.imes.framework.common.exception.ErrorCode;
 import com.cf.imes.framework.common.exception.ServiceException;
 import com.cf.imes.framework.common.pojo.CommonResult;
@@ -387,6 +388,10 @@ public class WebCadOrderImportAsyncFactory {
             if (OrderStatusEnum.EMPTY.getStatus().equals(status)) {
                 lambdaUpdateWrapper.set(OrderDO::getStatus, OrderStatusEnum.NEW_ORDER.getStatus());
             }
+            // 已封包的订单修改为未封包
+            if (OrderPackageStatusEnum.PACKAGED.getStatus().equals(orderDOFromOrderNo.getPackaged())) {
+                lambdaUpdateWrapper.set(OrderDO::getPackaged, OrderPackageStatusEnum.UNPACKED.getStatus());
+            }
             orderMapper.update(lambdaUpdateWrapper);
         }
         orderDO = orderDOFromOrderNo;