DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2025-12-08 14:54:52 +08:00
parent 86eac22d5f cff1bdc46b
commit d1b722b672
5 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
klp-wms/src/main/java/com/klp/domain/WmsDeliveryPlan.java
View File

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 发货计划对象 wms_delivery_plan
@@ -51,4 +52,13 @@ public class WmsDeliveryPlan extends BaseEntity {
// 钢卷集合
private String coil;
//-- 1. 新增审核状态字段（核心）
private Integer auditStatus;
//-- 2. 新增审核人字段
private String auditBy;
//-- 3. 新增审核时间字段
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditTime;
}

10
klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryPlanBo.java
View File

@@ -7,6 +7,7 @@ import javax.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 发货计划业务对象 wms_delivery_plan
@@ -46,5 +47,12 @@ public class WmsDeliveryPlanBo extends BaseEntity {
// 钢卷集合
private String coil;
//-- 1. 新增审核状态字段（核心）
private Integer auditStatus;
//-- 2. 新增审核人字段
private String auditBy;
//-- 3. 新增审核时间字段
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditTime;
}

10
klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryPlanVo.java
View File

@@ -10,6 +10,7 @@ import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
/**
@@ -74,4 +75,13 @@ public class WmsDeliveryPlanVo extends BaseEntity {
// 钢卷集合
private String coil;
//-- 1. 新增审核状态字段（核心）
private Integer auditStatus;
//-- 2. 新增审核人字段
private String auditBy;
//-- 3. 新增审核时间字段
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditTime;
}

1
klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java
View File

@@ -91,6 +91,7 @@ public class WmsDeliveryPlanServiceImpl implements IWmsDeliveryPlanService {
lqw.like(StringUtils.isNotBlank(bo.getPlanName()), WmsDeliveryPlan::getPlanName, bo.getPlanName());
lqw.eq(bo.getPlanDate() != null, WmsDeliveryPlan::getPlanDate, bo.getPlanDate());
lqw.eq(bo.getPlanType() != null, WmsDeliveryPlan::getPlanType, bo.getPlanType());
lqw.eq(bo.getAuditStatus() != null, WmsDeliveryPlan::getAuditStatus, bo.getAuditStatus());
return lqw;
}

3
klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml
View File

@@ -10,6 +10,9 @@
<result property="planDate" column="plan_date"/>
<result property="planType" column="plan_type"/>
<result property="coil" column="coil"/>
<result property="auditStatus" column="audit_status"/>
<result property="auditBy" column="audit_by"/>
<result property="auditTime" column="audit_time"/>
<result property="remark" column="remark"/>
<result property="delFlag" column="del_flag"/>
<result property="createTime" column="create_time"/>