Browse Source

创建时间

master
han\hanst 2 weeks ago
parent
commit
012dd60939
  1. 12
      src/main/java/com/xujie/sys/modules/erf/entity/ErfExpTriConfirm.java
  2. 4
      src/main/java/com/xujie/sys/modules/erf/service/impl/ErfTriConfirmServiceImpl.java

12
src/main/java/com/xujie/sys/modules/erf/entity/ErfExpTriConfirm.java

@ -1,5 +1,6 @@
package com.xujie.sys.modules.erf.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -82,7 +83,7 @@ public class ErfExpTriConfirm implements Serializable {
private Boolean sampleOk;
/**
* 三方确认完成时间
* 三方确认完成时间所有三方都确认完成时的时间
*/
@TableField("confirm_time")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ -100,4 +101,13 @@ public class ErfExpTriConfirm implements Serializable {
*/
@TableField("remark")
private String remark;
/**
* 创建时间
*/
@TableField("create_time")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
}

4
src/main/java/com/xujie/sys/modules/erf/service/impl/ErfTriConfirmServiceImpl.java

@ -290,6 +290,7 @@ public class ErfTriConfirmServiceImpl implements ErfTriConfirmService {
confirm.setProcessStep(processStep);
confirm.setProcessSeq(processSeq); // 设置工序顺序
confirm.setStatus("待确认");
confirm.setCreateTime(new Date());
erfExpTriConfirmMapper.insert(confirm);
log.info("创建工序记录:第{}道 - {}", processSeq, processStep);
}
@ -325,7 +326,7 @@ public class ErfTriConfirmServiceImpl implements ErfTriConfirmService {
process.setApplyNo(data.getApplyNo());
process.setProcessStep(data.getProcessStep().trim());
process.setStatus("待确认");
process.setCreateTime(new Date());
// 自动计算工序顺序查询当前最大顺序号 + 1
QueryWrapper<ErfExpTriConfirm> maxSeqQuery = new QueryWrapper<>();
maxSeqQuery.eq("apply_no", data.getApplyNo())
@ -643,6 +644,7 @@ public class ErfTriConfirmServiceImpl implements ErfTriConfirmService {
newMain.setApplyNo(targetApplyNo);
newMain.setStatus("待确认");
newMain.setConfirmTime(null);
newMain.setCreateTime(new Date());
erfExpTriConfirmMapper.insert(newMain);
log.info("复制工序主记录: {} - {}", newMain.getProcessSeq(), newMain.getProcessStep());
}

Loading…
Cancel
Save