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();