MES 齐套检查——>BOM检查质检关联更新

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/mesorderday/vo/MesOrderDayBaseVO.java

@@ -72,9 +72,15 @@ public class MesOrderDayBaseVO {
     @Schema(description = "批次码")
     private String batchCode;
 
+    @Schema(description = "质检模板号")
+    private String qualityFormNo;
+
     @Schema(description = "齐套检查状态")
     private String completeInspect;
 
     @Schema(description = "Bom检查状态")
     private String bomInspect;
+
+    @Schema(description = "未通过原因")
+    private String reason;
 }

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/qmsqualityformlog/vo/QmsQualityformlogBaseVO.java

@@ -59,4 +59,10 @@ public class QmsQualityformlogBaseVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime operateTime;
 
+    @Schema(description = "日计划单号")
+    private String planNoDay;
+
+    @Schema(description = "未通过原因")
+    private String reason;
+
 }

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/qmsqualityformlog/vo/QmsQualityformlogExcelVO.java

@@ -45,9 +45,12 @@ public class QmsQualityformlogExcelVO {
 //    @ExcelProperty("主表编号")
 //    private Integer masterId;
 
-    @ExcelProperty("表单编号")
+    @ExcelProperty("表单模板编号")
     private String formNo;
 
+    @ExcelProperty("日计划单号")
+    private String planNoDay;
+
     @ExcelProperty("操作类型")
     private String operation;
 
@@ -60,4 +63,7 @@ public class QmsQualityformlogExcelVO {
     @ExcelProperty("操作时间")
     private LocalDateTime operateTime;
 
+    @ExcelProperty("原因")
+    private String reason;
+
 }

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/dal/dataobject/qmsqualityformlog/QmsQualityformlogDO.java

@@ -77,4 +77,14 @@ public class QmsQualityformlogDO extends BaseDO {
      */
     private LocalDateTime operateTime;
 
+    /**
+     * 日计划单号
+     */
+    private String planNoDay;
+
+    /**
+     * 未通过原因
+     */
+    private String reason;
+
 }

win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/completeInspection/CompleteInspectServiceImpl.java

@@ -1,6 +1,7 @@
 package com.win.module.mes.service.completeInspection;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.security.core.LoginUser;
 import com.win.framework.security.core.util.SecurityFrameworkUtils;
@@ -17,6 +18,7 @@ import com.win.module.mes.controller.mesorderdayworker.vo.MesOrderDayWorkerRespV
 import com.win.module.mes.controller.mesworkscheduling.vo.MesWorkSchedulingBaseVO;
 import com.win.module.mes.controller.mesworkscheduling.vo.MesWorkSchedulingExportReqVO;
 import com.win.module.mes.controller.mesworkscheduling.vo.MesWorkSchedulingPageReqVO;
+import com.win.module.mes.controller.qmsqualityform.vo.QmsQualityformCreateReqVO;
 import com.win.module.mes.convert.mesorderday.MesOrderDayConvert;
 import com.win.module.mes.convert.mesorderdaybom.MesOrderDayBomConvert;
 import com.win.module.mes.dal.dataobject.completeInspection.MesConfigInfoDO;
@@ -25,6 +27,7 @@ import com.win.module.mes.dal.dataobject.mesorderdaybom.MesOrderDayBomDO;
 import com.win.module.mes.dal.dataobject.mesorderdayequipment.MesOrderDayEquipmentDO;
 import com.win.module.mes.dal.dataobject.mesorderdayworker.MesOrderDayWorkerDO;
 import com.win.module.mes.dal.dataobject.mesworkscheduling.MesWorkSchedulingDO;
+import com.win.module.mes.dal.dataobject.qmsqualityform.QmsQualityformDO;
 import com.win.module.mes.dal.dataobject.qmsqualityformlog.QmsQualityformlogDO;
 import com.win.module.mes.dal.mysql.completeInspection.MesConfigInfoMapper;
 import com.win.module.mes.dal.mysql.mesorderday.MesOrderDayMapper;
@@ -32,15 +35,20 @@ import com.win.module.mes.dal.mysql.mesorderdaybom.MesOrderDayBomMapper;
 import com.win.module.mes.dal.mysql.mesorderdayequipment.MesOrderDayEquipmentMapper;
 import com.win.module.mes.dal.mysql.mesorderdayworker.MesOrderDayWorkerMapper;
 import com.win.module.mes.dal.mysql.mesworkscheduling.MesWorkSchedulingMapper;
+import com.win.module.mes.dal.mysql.qmsqualityform.QmsQualityformMapper;
+import com.win.module.mes.dal.mysql.qmsqualityformlog.QmsQualityformlogMapper;
 import com.win.module.system.dal.dataobject.user.AdminUserDO;
+import com.win.module.system.dal.mysql.user.AdminUserMapper;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.module.mes.enums.ErrorCodeConstants.*;
 
 @Service
@@ -65,6 +73,15 @@ public class CompleteInspectServiceImpl implements CompleteInspectService{
     @Resource
     private MesOrderDayWorkerMapper mesOrderDayWorkerMapper;
 
+    @Resource
+    private AdminUserMapper userMapper;
+
+    @Resource
+    private QmsQualityformlogMapper qualityformlogMapper;
+
+    @Resource
+    private QmsQualityformMapper qualityformMapper;
+
     @Override
     public List<MesConfigInfoDO> getMesConfigList(MesConfigInfoBaseVO baseVO) {
         List<MesConfigInfoDO> mesConfigInfoDOS = mesConfigInfoMapper.selectList(baseVO);
@@ -207,6 +224,7 @@ public class CompleteInspectServiceImpl implements CompleteInspectService{
     }
 
     @Override
+    @Transactional
     public Integer updateOrderDay(MesOrderDayUpdateReqVO updateReqVO) {
         // 校验存在
         //validateOrderDayExists(updateReqVO.getId());
@@ -218,20 +236,32 @@ public class CompleteInspectServiceImpl implements CompleteInspectService{
         updateReqVO.setId(mesOrderDayDOS.get(0).getId());
         MesOrderDayDO updateObj = MesOrderDayConvert.INSTANCE.convert(updateReqVO);
 
-        //更新日志
         //增加日志
-//        QmsQualityformlogDO qmsQualityformlogDO = new QmsQualityformlogDO();
+        QmsQualityformlogDO qmsQualityformlogDO = new QmsQualityformlogDO();
-//        //qmsQualityformlogDO.setMasterId(qualityform.getId());
+        QmsQualityformCreateReqVO createReqVO = new QmsQualityformCreateReqVO();
-//        qmsQualityformlogDO.setFormNo(number);
+        createReqVO.setFormNo(updateReqVO.getQualityFormNo());
-//        qmsQualityformlogDO.setOperation("create");
+        List<QmsQualityformDO> qmsQualityformDOS = qualityformMapper.selectListByCode(createReqVO);
-//        qmsQualityformlogDO.setOperateContent("新增质检表单-质检项目："+createReqVO.getItemCode());
+        qmsQualityformlogDO.setMasterId(qmsQualityformDOS.get(0).getId());
-//        qmsQualityformlogDO.setOperateTime(this.localDateTime());
+        qmsQualityformlogDO.setFormNo(updateReqVO.getQualityFormNo());
-//        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        qmsQualityformlogDO.setPlanNoDay(updateReqVO.getPlanNoDay());
-//
+        qmsQualityformlogDO.setOperation("齐套检查");
-//        AdminUserDO adminUserDO = userMapper.selectById(loginUser.getId());
+        qmsQualityformlogDO.setOperateContent("齐套检查-科目质检："+updateReqVO.getRemark()+"|"+updateReqVO.getBomInspect());
-//        qmsQualityformlogDO.setOperator(adminUserDO.getUsername());
+        qmsQualityformlogDO.setOperateTime(this.localDateTime());
-//        qualityformlogMapper.insert(qmsQualityformlogDO);
+        qmsQualityformlogDO.setReason(updateReqVO.getReason());
-
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+
+        AdminUserDO adminUserDO = userMapper.selectById(loginUser.getId());
+        qmsQualityformlogDO.setOperator(adminUserDO.getUsername());
+        qualityformlogMapper.insert(qmsQualityformlogDO);
+
+        //清空remark
+        updateObj.setRemark(null);
         return orderDayMapper.updateById(updateObj);
     }
+
+    private LocalDateTime localDateTime(){
+        String now = DateUtil.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return LocalDateTime.parse(now, formatter);
+    }
 }