diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/MesDataMaintainLogDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/MesDataMaintainLogDTO.java new file mode 100644 index 000000000..5834018aa --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/MesDataMaintainLogDTO.java @@ -0,0 +1,22 @@ +package org.springblade.desk.produce.pojo.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springblade.desk.produce.pojo.entity.MesDataMaintainLog; + +import java.util.List; + +/** + * 数据维护记录 数据传输对象实体类 + * @author litao + */ +@Data +public class MesDataMaintainLogDTO { + + @Schema(description = "生产订单id") + private Long yoId; + + @Schema(description = "数据维护记录集合") + private List maintainLogList; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesDataMaintainLog.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesDataMaintainLog.java index 4ad592f6f..43685a523 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesDataMaintainLog.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesDataMaintainLog.java @@ -7,9 +7,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; -import java.io.Serial; -import java.util.Date; - /** * 数据维护记录 实体类 * @author litao @@ -23,62 +20,35 @@ public class MesDataMaintainLog extends BaseEntity { @Schema(description = "生产订单id") private Long yoId; - @Schema(description = "修改前数量") - private Double qtyFront; - - @Schema(description = "修改后数量") - private Double qtyAfter; - - @Schema(description = "修改前面积") - private Double areaFront; - - @Schema(description = "修改后面积") - private Double areaAfter; - - @Schema(description = "修改前镀种") - private String plateFront; - - @Schema(description = "修改后镀种") - private String plateAfter; - - @Schema(description = "修改前镀层厚度") - private Double plateThicknessFront; - - @Schema(description = "修改后镀层厚度") - private Double plateThicknessAfter; - - @Schema(description = "修改前涂色标") - private String tsbFront; + @Schema(description = "修改类型") + private String updateType; - @Schema(description = "修改后涂色标") - private String tsbAfter; + @Schema(description = "修改前") + private String frontValue; - @Schema(description = "修改前涂色带") - private String tsdFront; + @Schema(description = "修改后") + private String afterValue; - @Schema(description = "修改后涂色带") - private String tsdAfter; + @Schema(description = "修改原因") + private String memo; - @Schema(description = "修改前涂箭头") - private String tjtFront; + @Schema(description = "计划单号") + private String ypCode; - @Schema(description = "修改后涂箭头") - private String tjtAfter; + @Schema(description = "生产单号") + private String yoCode; @Schema(description = "流程卡号") private String cardNo; - @Schema(description = "零件号") - private String partCode; - @Schema(description = "批次号") private String batchNo; - @Schema(description = "备注") - private String memo; + @Schema(description = "零件号") + private String partCode; - @Schema(description = "维护人") @TableField(exist = false) + @Schema(description = "维护人") private String name; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/WorkProcessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/WorkProcessController.java index 2d8883483..6fa9d66df 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/WorkProcessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/WorkProcessController.java @@ -11,6 +11,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.produce.pojo.dto.MesDataMaintainLogDTO; import org.springblade.desk.produce.pojo.dto.MesMacToolUseDTO; import org.springblade.desk.produce.pojo.dto.SaveMacToolUseDto; import org.springblade.desk.produce.pojo.entity.MesDataMaintainLog; @@ -94,7 +95,7 @@ public class WorkProcessController extends BladeController { @PostMapping("/saveDataMaintainLog") @Operation(summary = "数据维护记录保存") - public R saveDataMaintainLog(@RequestBody MesDataMaintainLog mesDataMaintainLog) { + public R saveDataMaintainLog(@RequestBody MesDataMaintainLogDTO mesDataMaintainLog) { return R.status(pdaLoadService.saveDataMaintainLog(mesDataMaintainLog)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java index cc6845dd6..2ed7de649 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java @@ -7,6 +7,7 @@ import org.springblade.desk.device.pojo.entity.EquipmentEntity; import org.springblade.desk.device.pojo.entity.FeiBaSetEntity; import org.springblade.desk.device.pojo.entity.RackSetEntity; import org.springblade.desk.order.pojo.entity.YieldOrder; +import org.springblade.desk.produce.pojo.dto.MesDataMaintainLogDTO; import org.springblade.desk.produce.pojo.entity.MesDataMaintainLog; import org.springblade.desk.produce.pojo.entity.WorkOrder; import org.springblade.desk.produce.pojo.entity.WorkPlan; @@ -86,5 +87,5 @@ public interface IPdaLoadService extends BaseService { BindModelVO getCurrentWorkPlan(String cardNo); - boolean saveDataMaintainLog(MesDataMaintainLog mesDataMaintainLog); + boolean saveDataMaintainLog(MesDataMaintainLogDTO mesDataMaintainLog); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java index 687086d0c..9de695f8f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java @@ -31,6 +31,7 @@ import org.springblade.desk.energy.service.IBsSafePatrolInspectionService; import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springblade.desk.order.service.IYieldOrderService; import org.springblade.desk.produce.mapper.WorkPlanMapper; +import org.springblade.desk.produce.pojo.dto.MesDataMaintainLogDTO; import org.springblade.desk.produce.pojo.entity.*; import org.springblade.desk.produce.pojo.enums.WorkOrderEnum; import org.springblade.desk.produce.pojo.vo.BindModelVO; @@ -411,11 +412,11 @@ public class PdaLoadServiceImpl extends BaseServiceImpl maintainLogList = mesDataMaintainLog.getMaintainLogList(); + if (CollectionUtils.isEmpty(maintainLogList)) { + throw new ServiceException("修改记录为空"); + } + for (MesDataMaintainLog dataMaintainLog : maintainLogList) { + dataMaintainLog.setYoId(yieldOrder.getId()); + dataMaintainLog.setYpCode(yieldOrder.getYpCode()); + dataMaintainLog.setYoCode(yieldOrder.getYoCode()); + dataMaintainLog.setCardNo(yieldOrder.getCardNo()); + dataMaintainLog.setPartCode(yieldOrder.getPartCode()); + dataMaintainLog.setBatchNo(yieldOrder.getBatchNo()); + // 修改数量 + if ("订单数量".equals(dataMaintainLog.getUpdateType())) { + if (StringUtils.isBlank(dataMaintainLog.getAfterValue())) { + throw new ServiceException("订单数量修改值不能为空"); + } + // 修改车间订单数量 + WorkOrder workOrder = workOrderService.list(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getCardNo, yieldOrder.getCardNo())).get(0); + if (workOrder != null) { // WorkOrderRun workOrderRun = workOrderRunService.getById(workOrder.getWorId()); // try { // erp接口调用更新数量 @@ -628,21 +619,36 @@ public class PdaLoadServiceImpl extends BaseServiceImpl roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName()); String roleId = roleIdResp.getData(); approvalRecord.setNextRoleId(Long.valueOf(roleId)); - mesApprovalRecordClient.save(approvalRecord); + // 启动流程(原逻辑完全保留) @@ -253,7 +253,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName()); String roleId = roleIdResp.getData(); // approvalRecord.setNextRoleId(Long.valueOf(roleId)); - mesApprovalRecordClient.save(approvalRecord); + } return this.updateBatchById(list); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java index 5311a19a4..1dedde147 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java @@ -101,7 +101,7 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl