diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/DataTypeEnum.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/DataTypeEnum.java index b335ab4e9..4a5399262 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/DataTypeEnum.java +++ b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/DataTypeEnum.java @@ -9,8 +9,7 @@ public enum DataTypeEnum { FILE_IMPORT(0, "文件导入"), API_IMPORT(1, "API导入"), - SOURCE_IMPORT(2, "数据源导入"), - WEBCAD_IMPORT(3, "webcad导入"); + SOURCE_IMPORT(2, "数据源导入"); private final Integer status; private String description; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderSaveReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderSaveReqVO.java index a3b8031e4..68d9931de 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderSaveReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderSaveReqVO.java @@ -35,8 +35,7 @@ public class OrderSaveReqVO { @Schema(description = "生产单排序号") private Integer orderSort; - @Schema(description = "CAD数据类型,1CAD 2WebCAD 3Excel", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "CAD数据类型,1CAD 2WebCAD 3Excel不能为空") + @Schema(description = "数据类型,0文件导入 1API 2数据源", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Integer dataType; @Schema(description = "订单状态,订单状态,0空订单1新单2生产中3生产完成", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index 170c1fbad..bb72e6e2a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -58,6 +58,7 @@ import com.cf.imes.module.executor.dal.mysql.plate.PlateGoodMapper; import com.cf.imes.module.executor.dal.mysql.plate.PlateMapper; import com.cf.imes.module.executor.dal.mysql.rawgoods.RawGoodsMapper; import com.cf.imes.module.executor.enums.CategoryEnum; +import com.cf.imes.module.executor.enums.DataTypeEnum; import com.cf.imes.module.executor.enums.OrderDeletedEnum; import com.cf.imes.module.executor.enums.OrderStatusEnum; import com.cf.imes.module.executor.service.customplateno.CustomPlateNoGenerateService; @@ -193,6 +194,10 @@ public class OrderServiceImpl implements OrderService { // 插入 OrderDO order = BeanUtils.toBean(createReqVO, OrderDO.class); order.setId((Long)identifierGenerator.nextId(null)); + // 默认api类型生产单 + if(ObjectUtil.isNull(order.getDataType())) { + order.setDataType(DataTypeEnum.API_IMPORT.getStatus()); + } orderMapper.insert(order); // 返回 return order.getId(); 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 16fe61c5d..b0e84b638 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 @@ -240,7 +240,7 @@ public class WebCadOrderImportFactory { Integer status = orderDOFromOrderNo.getStatus(); // 更新生产单来源为webcad LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper().eq(OrderDO::getId, orderDOFromOrderNo.getId()) - .set(OrderDO::getDataType, DataTypeEnum.WEBCAD_IMPORT.getStatus()); + .set(OrderDO::getDataType, DataTypeEnum.API_IMPORT.getStatus()); // 如果导入生产单为空单,则更新为新单 if (OrderStatusEnum.EMPTY.getStatus().equals(status)) { lambdaUpdateWrapper.set(OrderDO::getStatus, OrderStatusEnum.NEW_ORDER.getStatus());