From 125ce9df9c4453fe259f84232181564db7c14f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Thu, 11 Jun 2026 14:57:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/dto/MesDataMaintainLogDTO.java | 22 +++++ .../pojo/entity/MesDataMaintainLog.java | 60 +++--------- .../controller/WorkProcessController.java | 3 +- .../desk/produce/service/IPdaLoadService.java | 3 +- .../service/impl/PdaLoadServiceImpl.java | 96 ++++++++++--------- 5 files changed, 92 insertions(+), 92 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/MesDataMaintainLogDTO.java 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 Date: Thu, 11 Jun 2026 15:10:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/mapper/StOtherOutRecordMapper.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml index d2f526cb8..511eca71a 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml @@ -36,10 +36,20 @@ WHEN soor.bf_type = -1 THEN NULL ELSE soor.bf_type END AS bfType, + g.goods_code , -- 物料编码 + g.goods_name , -- 物料名称 + g.material_model , -- 型号牌号 + g.specifications , -- 物料规格 + g.unit_name , + l.location , + l.id AS slId, -- 出库凭证表：出库单号、出库日期、出库原因、领料人ID sir.sir_code , sir.in_out_date , sir.in_out_reason , + sir.quantity, + sir.pi_no, + sir.stove_pi_no, -- 库房表：出库仓库名称 sh.sh_name AS shName, -- 制单人姓名（主表create_by关联用户表） @@ -52,6 +62,8 @@ -- 左关联出库凭证表：主表sirId关联凭证表主键，过滤已删除 LEFT JOIN ST_STOCK_INOUT_RECORD sir ON soor.sir_id = sir.id AND sir.is_deleted = 0 -- 左关联库房表：主表shId关联库房表主键，过滤已删除 + LEFT JOIN st_goods g ON sir.goods_id = g.id AND g.is_deleted = 0 + LEFT JOIN ST_STORAGE_LOCATION l ON sir.sl_id = l.id AND l.is_deleted = 0 LEFT JOIN ST_STOREHOUSE sh ON soor.sh_id = sh.id AND sh.is_deleted = 0 LEFT JOIN ST_CLASS_REQUEST c ON sir.sir_code = c.sir_code AND c.is_deleted = 0 -- 左关联制单人用户表：主表create_by关联用户表id From 020bcc4b18b7502924956eca57d791b3498654ba Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Thu, 11 Jun 2026 15:18:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/wms/service/impl/StBuyOrderServiceImpl.java | 6 +++--- .../wms/service/impl/StClassRequestServiceImpl.java | 4 ++-- .../wms/service/impl/StMoldApplyForServiceImpl.java | 2 +- .../wms/service/impl/StOtherOutRecordServiceImpl.java | 4 ++-- .../wms/service/impl/StWmsRequestServiceImpl.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java index 4f278a030..c1770ae04 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java @@ -198,7 +198,7 @@ public class StBuyOrderServiceImpl 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