Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增webcad生产单导入：1、新增生产单默认api数据类型；2、移除webcad数据类型，cad拆单为api类型；

Browse Source
This commit is contained in:
gaoqr
2025-03-13 19:00:39 +08:00
parent 6715324411
commit 5db69efc82
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/DataTypeEnum.java
+1 -2
View File
@@ -9,8 +9,7 @@ public enum DataTypeEnum {
FILE_IMPORT(0, "文件导入"), FILE_IMPORT(0, "文件导入"),
API_IMPORT(1, "API导入"), API_IMPORT(1, "API导入"),
SOURCE_IMPORT(2, "数据源导入"), SOURCE_IMPORT(2, "数据源导入");
WEBCAD_IMPORT(3, "webcad导入");
private final Integer status; private final Integer status;
private String description; private String description;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderSaveReqVO.java
+1 -2
View File
@@ -35,8 +35,7 @@ public class OrderSaveReqVO {
@Schema(description = "生产单排序号") @Schema(description = "生产单排序号")
private Integer orderSort; private Integer orderSort;
@Schema(description = "CAD数据类型，1CAD 2WebCAD 3Excel", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @Schema(description = "数据类型，0文件导入 1API 2数据源", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "CAD数据类型，1CAD 2WebCAD 3Excel不能为空")
private Integer dataType; private Integer dataType;
@Schema(description = "订单状态，订单状态，0空订单1新单2生产中3生产完成", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @Schema(description = "订单状态，订单状态，0空订单1新单2生产中3生产完成", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+5
View File
@@ -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.plate.PlateMapper;
import com.cf.imes.module.executor.dal.mysql.rawgoods.RawGoodsMapper; 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.CategoryEnum;
import com.cf.imes.module.executor.enums.DataTypeEnum;
import com.cf.imes.module.executor.enums.OrderDeletedEnum; import com.cf.imes.module.executor.enums.OrderDeletedEnum;
import com.cf.imes.module.executor.enums.OrderStatusEnum; import com.cf.imes.module.executor.enums.OrderStatusEnum;
import com.cf.imes.module.executor.service.customplateno.CustomPlateNoGenerateService; 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); OrderDO order = BeanUtils.toBean(createReqVO, OrderDO.class);
order.setId((Long)identifierGenerator.nextId(null)); order.setId((Long)identifierGenerator.nextId(null));
// 默认api类型生产单
if(ObjectUtil.isNull(order.getDataType())) {
order.setDataType(DataTypeEnum.API_IMPORT.getStatus());
}
orderMapper.insert(order); orderMapper.insert(order);
// 返回 // 返回
return order.getId(); return order.getId();
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+1 -1
View File
@@ -240,7 +240,7 @@ public class WebCadOrderImportFactory {
Integer status = orderDOFromOrderNo.getStatus(); Integer status = orderDOFromOrderNo.getStatus();
// 更新生产单来源为webcad // 更新生产单来源为webcad
LambdaUpdateWrapper<OrderDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<OrderDO>().eq(OrderDO::getId, orderDOFromOrderNo.getId()) LambdaUpdateWrapper<OrderDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<OrderDO>().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)) { if (OrderStatusEnum.EMPTY.getStatus().equals(status)) {
lambdaUpdateWrapper.set(OrderDO::getStatus, OrderStatusEnum.NEW_ORDER.getStatus()); lambdaUpdateWrapper.set(OrderDO::getStatus, OrderStatusEnum.NEW_ORDER.getStatus());