Merge remote-tracking branch 'origin/master'

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<MesDataMaintainLog> maintainLogList;
+
+}

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;
 
 }

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));
 	}
 

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<WorkPlan> {
 
     BindModelVO getCurrentWorkPlan(String cardNo);
 
-    boolean saveDataMaintainLog(MesDataMaintainLog mesDataMaintainLog);
+    boolean saveDataMaintainLog(MesDataMaintainLogDTO mesDataMaintainLog);
 }

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<WorkPlanMapper, WorkPlan
             inspectionTask.setCheckUserId(AuthUtil.getUserId());
             inspectionTask.setCheckDate(LocalDateTime.now());
         }
-        if(inspectionTask.getWpId() != null){
+        if (inspectionTask.getWpId() != null) {
             WorkPlan workPlan = workPlanService.getById(inspectionTask.getWpId());
-            if(workPlan != null){
+            if (workPlan != null) {
                 WorkOrder workOrder = workOrderService.getById(workPlan.getWoId());
-                if(workOrder != null){
+                if (workOrder != null) {
                     inspectionTask.setWoId(workOrder.getId());
                     inspectionTask.setWoCode(workOrder.getWoCode());
                 }
@@ -583,7 +584,7 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
     }
 
     @Override
-    public boolean saveDataMaintainLog(MesDataMaintainLog mesDataMaintainLog) {
+    public boolean saveDataMaintainLog(MesDataMaintainLogDTO mesDataMaintainLog) {
         if (mesDataMaintainLog.getYoId() == null) {
             throw new ServiceException("参数异常");
         }
@@ -592,32 +593,22 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         if (yieldOrder == null) {
             throw new ServiceException("生产订单不存在");
         }
-        // 修改单件面积
-        if (mesDataMaintainLog.getAreaAfter() != null) {
-            yieldOrder.setYpArea(mesDataMaintainLog.getAreaAfter());
-        }
-        // 修改镀种
-        if (StringUtils.isNotBlank(mesDataMaintainLog.getPlateAfter())) {
-            yieldOrder.setPlate(mesDataMaintainLog.getPlateAfter());
-        }
-        // 修改镀层厚度
-        if (mesDataMaintainLog.getPlateThicknessAfter() != null) {
-            yieldOrder.setPlateThickness1(mesDataMaintainLog.getPlateThicknessAfter());
-        }
-        // 修改涂色标
-        if (StringUtils.isNotBlank(mesDataMaintainLog.getTsbAfter())) {
-            yieldOrder.setTsbNum(mesDataMaintainLog.getTsbAfter());
-        }
-        // 修改涂色带
-        if (StringUtils.isNotBlank(mesDataMaintainLog.getTsdAfter())) {
-            yieldOrder.setTsdNum(mesDataMaintainLog.getTsdAfter());
-        }
-        // 修改涂箭头
-        if (StringUtils.isNotBlank(mesDataMaintainLog.getTjtAfter())) {
-            yieldOrder.setTjtNum(mesDataMaintainLog.getTjtAfter());
-        }
+        List<MesDataMaintainLog> 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 (mesDataMaintainLog.getQtyAfter() != null) {
+            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) {
@@ -628,8 +619,9 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
 //                } catch (Exception e) {
 //                    throw new ServiceException("erp接口调用修改订单加工数量失败：" + e.getMessage());
 //                }
-                double num = mesDataMaintainLog.getQtyAfter() - yieldOrder.getYpQty();
-                yieldOrder.setYpQty(mesDataMaintainLog.getQtyAfter());
+                    double numAfter = Double.parseDouble(dataMaintainLog.getAfterValue());
+                    double num = numAfter - yieldOrder.getYpQty();
+                    yieldOrder.setYpQty(numAfter);
                     workOrderService.update(Wrappers.lambdaUpdate(WorkOrder.class).eq(WorkOrder::getId, workOrder.getId()).set(WorkOrder::getMakeQty, workOrder.getMakeQty() + num));
                     // 修改作业计划接收数量、报工数量
                     baseMapper.updateWorkPlan(num, workOrder.getId());
@@ -639,10 +631,24 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
                     baseMapper.updateInspection(num, workOrder.getId());
                     // 修改镀前镀后记录
                     baseMapper.updatePlateAround(num, workOrder.getId());
+
+                }
+            } else if ("单件面积".equals(dataMaintainLog.getUpdateType())) {
+                yieldOrder.setYpArea(Double.parseDouble(dataMaintainLog.getAfterValue()));
+            } else if ("镀种".equals(dataMaintainLog.getUpdateType())) {
+                yieldOrder.setPlate(dataMaintainLog.getAfterValue());
+            } else if ("镀层厚度".equals(dataMaintainLog.getUpdateType())) {
+                yieldOrder.setPlateThickness1(Double.parseDouble(dataMaintainLog.getAfterValue()));
+            } else if ("涂色标".equals(dataMaintainLog.getUpdateType())) {
+                yieldOrder.setTsbNum(dataMaintainLog.getAfterValue());
+            } else if ("涂色带".equals(dataMaintainLog.getUpdateType())) {
+                yieldOrder.setTsdNum(dataMaintainLog.getAfterValue());
+            } else if ("涂箭头".equals(dataMaintainLog.getUpdateType())) {
+                yieldOrder.setTjtNum(dataMaintainLog.getAfterValue());
             }
         }
         yieldOrderService.updateById(yieldOrder);
-        return mesDataMaintainLogService.save(mesDataMaintainLog);
+        return mesDataMaintainLogService.saveBatch(maintainLogList);
     }
 
 }

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

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java

@@ -198,7 +198,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
 					R<String> 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<StBuyOrderMapper, StB
 //			updateRecord.setNextRoleId(Long.valueOf(roleId));
 			updateRecord.setNextUserName("厂长,副厂长");
 			updateRecord.setStatus(Integer.valueOf(approvalResult));
-			mesApprovalRecordClient.update(updateRecord);
+
 
 //		} else {
 //			throw new RuntimeException("仅保管员可执行审批操作！");
@@ -275,7 +275,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
 //			updateRecord.setNextRoleId(Long.valueOf(roleId));
 			updateRecord.setNextUserName("厂长,副厂长");
 			updateRecord.setStatus(Integer.valueOf(approvalResult));
-			mesApprovalRecordClient.update(updateRecord);
+
 		}
 
 	}

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StClassRequestServiceImpl.java

@@ -115,7 +115,7 @@ public class StClassRequestServiceImpl extends BaseServiceImpl<StClassRequestMap
 						approvalRecord.setNextUserId(ccr.getApprover());
 						approvalRecord.setNextUserName(ruser.getRealName());
 
-						mesApprovalRecordClient.save(approvalRecord);
+
 					} else {
 						// 普通物料：无需审批，状态设为【无需审批】+ 直接发布
 						ccr.setApprovalStatus(StClassRequest.APPROVAL_STATUS_NONE);
@@ -204,7 +204,7 @@ public class StClassRequestServiceImpl extends BaseServiceImpl<StClassRequestMap
 //			updateRecord.setNextRoleId(Long.valueOf(roleId));
 			updateRecord.setNextUserId(ccr.getApprover());
 			updateRecord.setStatus(Integer.valueOf(approvalResult));
-			mesApprovalRecordClient.update(updateRecord);
+
 
 		}else {
 			throw new RuntimeException("仅工艺员可执行审批操作！");

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StMoldApplyForServiceImpl.java

@@ -139,7 +139,7 @@ public class StMoldApplyForServiceImpl extends BaseServiceImpl<StMoldApplyForMap
 			R<String> roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName());
 			String roleId = roleIdResp.getData();
 //			approvalRecord.setNextRoleId(Long.valueOf(roleId));
-			mesApprovalRecordClient.save(approvalRecord);
+
 		}
 		return this.updateBatchById(list);
 	}

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java

@@ -101,7 +101,7 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
 		approvalRecord.setNextUserId(stOtherOutRecord.getApprover());
 		approvalRecord.setNextUserName(ruser.getRealName());
 
-		mesApprovalRecordClient.save(approvalRecord);
+
 
 	}
 
@@ -131,7 +131,7 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
 //			updateRecord.setNextRoleId(Long.valueOf(roleId));
 			updateRecord.setNextUserId(stOtherOutRecord.getApprover());
 			updateRecord.setStatus(Integer.valueOf(approvalResult));
-			mesApprovalRecordClient.update(updateRecord);
+
 
 			this.addOtherOutRecord(stOtherOutRecord, approver);
 		}else {

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java

@@ -158,7 +158,7 @@ public class StWmsRequestServiceImpl extends BaseServiceImpl<StWmsRequestMapper,
 			updateRecord.setOpinion("");
 			updateRecord.setNextRoleId(Long.valueOf(roleId));
 			updateRecord.setStatus(Integer.valueOf(approvalResult));
-			mesApprovalRecordClient.update(updateRecord);
+
 
 			bo.setDrawQuantity(afterQty);
 			bo.setSurDrawQty(bo.getBuyQty() - afterQty);