From 65ecb84c1fa35543f69ac51a7f911f4edf0ab643 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Thu, 13 Mar 2025 16:10:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ewebcad=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=EF=BC=9A=E6=8B=86=E5=8D=95=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E7=A9=BA=E5=8D=95=E6=97=B6=E6=9B=B4=E6=96=B0=E4=B8=BA?= =?UTF-8?q?=E6=96=B0=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orderImport/factory/WebCadOrderImportFactory.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java index ab66c0919..12e52c16f 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java @@ -16,6 +16,7 @@ import com.cf.imes.framework.mybatis.core.injector.BaseBatchMapper; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.executor.enums.DataTypeEnum; import com.cf.imes.module.executor.enums.OrderItemTypeEnum; +import com.cf.imes.module.executor.enums.OrderStatusEnum; import com.cf.imes.module.plan.controller.admin.orderImport.webcad.vo.WebCadDataBlockReqVO; import com.cf.imes.module.plan.controller.admin.orderImport.webcad.vo.WebCadDataDoubleRoomTreeReqVO; import com.cf.imes.module.plan.controller.admin.orderImport.webcad.vo.WebCadDataMaterialReqVO; @@ -236,8 +237,15 @@ public class WebCadOrderImportFactory { if (ObjectUtil.isNull(orderDOFromOrderNo)) { throw ServiceExceptionUtil.exception(WEBCAD_ORDER_NOT_EXISTS_ERROR, orderNo); } else { + Integer status = orderDOFromOrderNo.getStatus(); // 更新生产单来源为webcad - orderMapper.update(new LambdaUpdateWrapper().eq(OrderDO::getId, orderDOFromOrderNo.getId()).set(OrderDO::getDataType, DataTypeEnum.WEBCAD_IMPORT.getStatus())); + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper().eq(OrderDO::getId, orderDOFromOrderNo.getId()) + .set(OrderDO::getDataType, DataTypeEnum.WEBCAD_IMPORT.getStatus()); + // 如果导入生产单为空单，则更新为新单 + if (OrderStatusEnum.EMPTY.getStatus().equals(status)) { + lambdaUpdateWrapper.set(OrderDO::getStatus, OrderStatusEnum.NEW_ORDER.getStatus()); + } + orderMapper.update(lambdaUpdateWrapper); } orderDO = orderDOFromOrderNo; orderId = orderDOFromOrderNo.getId();