From 5db69efc82ca9653ba218eeb0b47aead01465be9 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Thu, 13 Mar 2025 19:00:39 +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=9A1=E3=80=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=94=9F=E4=BA=A7=E5=8D=95=E9=BB=98=E8=AE=A4api?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=EF=BC=9B2=E3=80=81?= =?UTF-8?q?=E7=A7=BB=E9=99=A4webcad=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=8Ccad=E6=8B=86=E5=8D=95=E4=B8=BAapi=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cf/imes/module/executor/enums/DataTypeEnum.java | 3 +-- .../controller/admin/order/vo/order/OrderSaveReqVO.java | 3 +-- .../imes/module/executor/service/order/OrderServiceImpl.java | 5 +++++ .../orderImport/factory/WebCadOrderImportFactory.java | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) 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());