aps-作业明细修改时增加日志表数据

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsEquLogDao.java

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.ApsEquLogDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Entity generator.domain.ApsEquLog
+ */
+public interface ApsEquLogDao extends BaseMapper<ApsEquLogDo> {
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsEquLogService.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsEquLogDo;
+import com.rongwei.bsentity.domain.ApsProcessOperationProcessEquDo;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+
+import java.util.List;
+
+/**
+ *
+ */
+public interface ApsEquLogService extends IService<ApsEquLogDo> {
+    void saveEquLog(ApsProcessOperationProcessEquDo oldEqu, ApsProcessOperationProcessEquDo newEqu, SysUserVo currentUser, String url);
+    void saveEquLogBatch(List<ApsProcessOperationProcessEquDo> oldEquList, List<ApsProcessOperationProcessEquDo> newEquList, SysUserVo currentUser, String url);
+}

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsEquLogServiceImpl.java

@@ -0,0 +1,80 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApsEquLogDao;
+import com.rongwei.bsentity.domain.ApsEquLogDo;
+import com.rongwei.bscommon.sys.service.ApsEquLogService;
+import com.rongwei.bsentity.domain.ApsProcessOperationProcessEquDo;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+import com.rongwei.rwcommon.utils.SecurityUtil;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *
+ */
+@Service
+public class ApsEquLogServiceImpl extends ServiceImpl<ApsEquLogDao, ApsEquLogDo> implements ApsEquLogService{
+
+    @Async
+    public void saveEquLog(ApsProcessOperationProcessEquDo oldEqu, ApsProcessOperationProcessEquDo newEqu, SysUserVo currentUser, String url) {
+        ApsEquLogDo apsEquLogDo = new ApsEquLogDo();
+        apsEquLogDo.setId(SecurityUtil.getUUID());
+        apsEquLogDo.setOwnedfactory(oldEqu.getOwnedfactory());
+        apsEquLogDo.setBlankid(oldEqu.getBlankid());
+        apsEquLogDo.setProcessid(oldEqu.getProcessid());
+        apsEquLogDo.setEquid(oldEqu.getId());
+        apsEquLogDo.setUrl(url);
+
+        apsEquLogDo.setProcessworkshopid(oldEqu.getProcessworkshopid());
+        apsEquLogDo.setProcessworkshop(oldEqu.getProcessworkshop());
+        apsEquLogDo.setProcessdevicecode(oldEqu.getProcessdevicecode());
+        apsEquLogDo.setProcessdevice(oldEqu.getProcessdevice());
+        apsEquLogDo.setProcessdeviceid(oldEqu.getProcessdeviceid());
+        apsEquLogDo.setRollerid(oldEqu.getRollerid());
+        apsEquLogDo.setPlanstartdate(oldEqu.getPlanstartdate());
+        apsEquLogDo.setPlanenddate(oldEqu.getPlanenddate());
+
+        apsEquLogDo.setNewprocessworkshopid(newEqu.getProcessworkshopid());
+        apsEquLogDo.setNewprocessworkshop(newEqu.getProcessworkshop());
+        apsEquLogDo.setNewprocessdevicecode(newEqu.getProcessdevicecode());
+        apsEquLogDo.setNewprocessdevice(newEqu.getProcessdevice());
+        apsEquLogDo.setNewprocessdeviceid(newEqu.getProcessdeviceid());
+        apsEquLogDo.setNewplanstartdate(newEqu.getPlanstartdate());
+        apsEquLogDo.setNewplanenddate(newEqu.getPlanenddate());
+
+        DateTime now = DateUtil.date();
+        apsEquLogDo.setCreatedate(now);
+        apsEquLogDo.setCreateuserid(currentUser.getId());
+        apsEquLogDo.setCreateusername(currentUser.getName());
+        apsEquLogDo.setModifydate(now);
+        apsEquLogDo.setModifyuserid(currentUser.getId());
+        apsEquLogDo.setModifyusername(currentUser.getName());
+
+        this.save(apsEquLogDo);
+    }
+
+    @Async
+    public void saveEquLogBatch(List<ApsProcessOperationProcessEquDo> oldEquList,List<ApsProcessOperationProcessEquDo> newEquList,SysUserVo currentUser, String url){
+        for (ApsProcessOperationProcessEquDo newEqu : newEquList) {
+            ApsProcessOperationProcessEquDo oldEqu = oldEquList.stream().filter(item -> item.getId().equals(newEqu.getId())).findFirst().orElse(null);
+            if (oldEqu == null) {
+                oldEqu = new ApsProcessOperationProcessEquDo();
+                oldEqu.setId(newEqu.getId());
+                oldEqu.setOwnedfactory(newEqu.getOwnedfactory());
+                oldEqu.setBlankid(newEqu.getBlankid());
+                oldEqu.setProcessid(newEqu.getProcessid());
+            }
+            saveEquLog(oldEqu,newEqu,currentUser,url);
+        }
+    }
+
+}
+
+
+
+

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java

@@ -137,6 +137,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
     private CXCommonFeginClient cxCommonFeginClient;
     @Autowired
     private SysGeneralCRUDService sysGeneralCRUDService;
+    @Autowired
+    private ApsEquLogService apsEquLogService;
 
 //    /**
 //     * 更新工序的待加工批次号信息
@@ -572,6 +574,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
 
                     if (!saveList.isEmpty()) {
                         apsProcessOperationProcessEquService.updateBatchById(saveList);
+                        apsEquLogService.saveEquLogBatch(apsProcessOperationProcessEquDos, saveList, nowWorkUser, httpServletRequest.getRequestURI());
                         needUpdateProcessIdList.addAll(saveList.stream().map(ApsProcessOperationProcessEquDo::getProcessid).collect(Collectors.toList()));
                     }
                     if (!needUpdateProcessIdList.isEmpty()) {
@@ -1272,6 +1275,19 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     .set(ApsProcessOperationProcessEquDo::getModifyuserid, currentUser.getId())
                     .set(ApsProcessOperationProcessEquDo::getModifyusername, currentUser.getName())
             );
+            //明细日志
+            ApsProcessOperationProcessEquDo newEquDo = new ApsProcessOperationProcessEquDo();
+            newEquDo.setId(id);
+            newEquDo.setPlanstartdate(changeStartTimeVo.getPlanStartTime());
+            newEquDo.setPlanenddate(changeStartTimeVo.getPlanEndTime());
+            if (StringUtils.isNotBlank(changeStartTimeVo.getEquId())){
+                newEquDo.setProcessdeviceid(changeStartTimeVo.getEquId());
+                newEquDo.setProcessdevicecode(equCode);
+            }
+            if (StringUtils.isNotBlank(changeStartTimeVo.getEquName())){
+                newEquDo.setProcessdevice(changeStartTimeVo.getEquName());
+            }
+            apsEquLogService.saveEquLog(processEquDo, newEquDo, currentUser, httpServletRequest.getRequestURI());
         }
         updateConflictVos.forEach(data -> {
             ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo = data.getApsProcessOperationProcessEquDo();
@@ -2602,6 +2618,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 nextStartDate = needUpdate.getPlanenddate();
 //            needUpdateList.add(needUpdate);
                 apsProcessOperationProcessEquService.updateById(needUpdate);
+                apsEquLogService.saveEquLog(apsProcessOperationProcessEquDo, needUpdate, currentUser,httpServletRequest.getRequestURI());
                 if (StringUtils.isNotBlank(needInsert.getId())) {
                     apsProcessOperationEquService.save(needInsert);
                     ApsProcessOperationDo needUpdateProcess = new ApsProcessOperationDo();
@@ -3021,6 +3038,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     throw e;
                 }
             }
+            List<ApsProcessOperationProcessEquDo> oldEquList = new LinkedList<>(apsProcessOperationProcessEquDoList);
+            apsEquLogService.saveEquLogBatch(oldEquList, allNeedUpdateList, currentUser, httpServletRequest.getRequestURI());
 
             // 开始事务
             TransactionStatus status = transactionManager.getTransaction(definition);

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsEquLogDo.java

@@ -0,0 +1,166 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 作业明细日志
+ * @TableName aps_equ_log
+ */
+@TableName(value ="aps_equ_log")
+@Data
+public class ApsEquLogDo extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId(value = "ID")
+    private String id;
+
+    /**
+     * 
+     */
+    @TableField(value = "TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    @TableField(value = "ROPTION")
+    private String roption;
+
+    /**
+     * 接口名称
+     */
+    @TableField(value = "URL")
+    private String url;
+
+    /**
+     * 所属工厂
+     */
+    @TableField(value = "OWNEDFACTORY")
+    private String ownedfactory;
+
+    /**
+     * 坯料计划ID
+     */
+    @TableField(value = "BLANKID")
+    private String blankid;
+
+    /**
+     * 工序作业ID
+     */
+    @TableField(value = "PROCESSID")
+    private String processid;
+
+    /**
+     * 工序作业明细ID
+     */
+    @TableField(value = "EQUID")
+    private String equid;
+
+    /**
+     * 加工车间ID
+     */
+    @TableField(value = "PROCESSWORKSHOPID")
+    private String processworkshopid;
+
+    /**
+     * 加工车间
+     */
+    @TableField(value = "PROCESSWORKSHOP")
+    private String processworkshop;
+
+    /**
+     * 加工设备编号
+     */
+    @TableField(value = "PROCESSDEVICECODE")
+    private String processdevicecode;
+
+    /**
+     * 加工设备ID
+     */
+    @TableField(value = "PROCESSDEVICEID")
+    private String processdeviceid;
+
+    /**
+     * 加工设备
+     */
+    @TableField(value = "PROCESSDEVICE")
+    private String processdevice;
+
+    /**
+     * 轧机辊ID
+     */
+    @TableField(value = "ROLLERID")
+    private String rollerid;
+
+    /**
+     * 计划开工时间
+     */
+    @TableField(value = "PLANSTARTDATE")
+    private Date planstartdate;
+
+    /**
+     * 计划完工时间
+     */
+    @TableField(value = "PLANENDDATE")
+    private Date planenddate;
+
+    /**
+     * 新加工车间ID
+     */
+    @TableField(value = "NEWPROCESSWORKSHOPID")
+    private String newprocessworkshopid;
+
+    /**
+     * 新加工车间
+     */
+    @TableField(value = "NEWPROCESSWORKSHOP")
+    private String newprocessworkshop;
+
+    /**
+     * 新加工设备编号
+     */
+    @TableField(value = "NEWPROCESSDEVICECODE")
+    private String newprocessdevicecode;
+
+    /**
+     * 新加工设备ID
+     */
+    @TableField(value = "NEWPROCESSDEVICEID")
+    private String newprocessdeviceid;
+
+    /**
+     * 新加工设备
+     */
+    @TableField(value = "NEWPROCESSDEVICE")
+    private String newprocessdevice;
+
+    /**
+     * 新轧机辊ID
+     */
+    @TableField(value = "NEWROLLERID")
+    private String newrollerid;
+
+    /**
+     * 新计划开工时间
+     */
+    @TableField(value = "NEWPLANSTARTDATE")
+    private Date newplanstartdate;
+
+    /**
+     * 新计划完工时间
+     */
+    @TableField(value = "NEWPLANENDDATE")
+    private Date newplanenddate;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}