diff --git a/src/main/java/com/gaotao/modules/oa/dto/ProductionRoutingItemDto.java b/src/main/java/com/gaotao/modules/oa/dto/ProductionRoutingItemDto.java index 27b93bb..12d16f0 100644 --- a/src/main/java/com/gaotao/modules/oa/dto/ProductionRoutingItemDto.java +++ b/src/main/java/com/gaotao/modules/oa/dto/ProductionRoutingItemDto.java @@ -134,4 +134,6 @@ public class ProductionRoutingItemDto { * 外协物料编号(如委外加工半成品) */ private String outWorkPartNo; + + private String operationId; } diff --git a/src/main/java/com/gaotao/modules/oa/service/impl/ProductionRoutingServiceImpl.java b/src/main/java/com/gaotao/modules/oa/service/impl/ProductionRoutingServiceImpl.java index 30cef80..b0b1063 100644 --- a/src/main/java/com/gaotao/modules/oa/service/impl/ProductionRoutingServiceImpl.java +++ b/src/main/java/com/gaotao/modules/oa/service/impl/ProductionRoutingServiceImpl.java @@ -95,6 +95,7 @@ public class ProductionRoutingServiceImpl implements ProductionRoutingService { params.add(item.getPlanFinishTime() == null ? "" : DateUtils.format(item.getPlanFinishTime())); // @planFinishTime params.add(item.getRemark() == null ? "" : item.getRemark()); // @remark - 使用备注 params.add(item.getMethod()); // @method + params.add(item.getOperationId() == null ? "" : item.getOperationId()); // @operationId - 使用工序ID // 执行存储过程 List> resultList = procedureDao.getProcedureData("UspInsertSORouting", params); diff --git a/src/main/java/com/gaotao/modules/sop/dto/SopFileRequestDto.java b/src/main/java/com/gaotao/modules/sop/dto/SopFileRequestDto.java index 35ddc77..79304cd 100644 --- a/src/main/java/com/gaotao/modules/sop/dto/SopFileRequestDto.java +++ b/src/main/java/com/gaotao/modules/sop/dto/SopFileRequestDto.java @@ -107,4 +107,5 @@ public class SopFileRequestDto { private String orderRef1; private String orderRef2; private String orderRef3; + private String workCenterNo; } diff --git a/src/main/java/com/gaotao/modules/sop/entity/FileManagementEntity.java b/src/main/java/com/gaotao/modules/sop/entity/FileManagementEntity.java index db8a6e4..c39121b 100644 --- a/src/main/java/com/gaotao/modules/sop/entity/FileManagementEntity.java +++ b/src/main/java/com/gaotao/modules/sop/entity/FileManagementEntity.java @@ -50,5 +50,6 @@ public class FileManagementEntity { private String orderRef2; @TableField(exist = false) private String orderRef3; + private String workCenterNo; } diff --git a/src/main/java/com/gaotao/modules/sop/service/impl/SopFileServiceImpl.java b/src/main/java/com/gaotao/modules/sop/service/impl/SopFileServiceImpl.java index 06c93e7..25cc61c 100644 --- a/src/main/java/com/gaotao/modules/sop/service/impl/SopFileServiceImpl.java +++ b/src/main/java/com/gaotao/modules/sop/service/impl/SopFileServiceImpl.java @@ -117,6 +117,7 @@ public class SopFileServiceImpl implements SopFileService { entity.setOrderRef1(request.getOrderRef1()); entity.setOrderRef2(request.getOrderRef2()); entity.setOrderRef3(request.getOrderRef3()); + entity.setWorkCenterNo(request.getWorkCenterNo()); log.info("创建新文件记录"); // } @@ -236,6 +237,7 @@ public class SopFileServiceImpl implements SopFileService { params.add(item.getOrderRef1()); // params.add(item.getOrderRef2()); // params.add(item.getOrderRef3()); // + params.add(item.getWorkCenterNo()); // log.debug("调用存储过程UspInsertSOP参数 {}", params);