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

同步规程同步代码和录入监测代码

Browse Source
This commit is contained in:
wangyu
2026-05-23 19:34:52 +08:00
parent 6b58f37616
commit 35ad50a79d
29 changed files with 2357 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java
View File

@@ -210,5 +210,8 @@ public class WmsMaterialCoil extends BaseEntity {
* 调拨类型
*/
private String transferType;
private Long specId;
private Long versionId;
}

12
klp-wms/src/main/java/com/klp/domain/WmsProcessSpecVersion.java
View File

@@ -7,6 +7,8 @@ import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* 规程版本对象 wms_process_spec_version
*
@@ -46,4 +48,14 @@ public class WmsProcessSpecVersion extends BaseEntity {
private Integer delFlag;
private String remark;
private BigDecimal matchEntryThickMin;
private BigDecimal matchEntryThickMax;
private BigDecimal matchExitThickMin;
private BigDecimal matchExitThickMax;
private BigDecimal matchEntryWidthMin;
private BigDecimal matchEntryWidthMax;
private BigDecimal matchExitWidthMin;
private BigDecimal matchExitWidthMax;
private String matchSteelGrade;
}

5
klp-wms/src/main/java/com/klp/domain/WmsProductionLine.java
View File

@@ -50,4 +50,9 @@ public class WmsProductionLine extends BaseEntity {
*/
private String remark;
/**
* 产线支持的操作类型（逗号分隔，1=分卷，2=合卷，3=更新）
*/
private String actionType;
}

3
klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
View File

@@ -378,5 +378,8 @@ public class WmsMaterialCoilBo extends BaseEntity {
*/
@TableField(exist = false)
private Boolean onlyEmptyPackingStatus;
private Long specId;
private Long versionId;
}

11
klp-wms/src/main/java/com/klp/domain/bo/WmsProcessSpecVersionBo.java
View File

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
/**
* 规程版本业务对象 wms_process_spec_version
@@ -38,4 +39,14 @@ public class WmsProcessSpecVersionBo extends BaseEntity {
private String status;
private String remark;
private BigDecimal matchEntryThickMin;
private BigDecimal matchEntryThickMax;
private BigDecimal matchExitThickMin;
private BigDecimal matchExitThickMax;
private BigDecimal matchEntryWidthMin;
private BigDecimal matchEntryWidthMax;
private BigDecimal matchExitWidthMin;
private BigDecimal matchExitWidthMax;
private String matchSteelGrade;
}

5
klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
View File

@@ -334,5 +334,10 @@ public class WmsMaterialCoilVo extends BaseEntity {
* 关联的订单列表（通过wms_coil_contract_rel中间表JOIN crm_order）
*/
private List<com.klp.domain.vo.WmsCoilContractRelVo> orderList;
private Long specId;
private Long versionId;
private String specCode;
private String versionCode;
}

15
klp-wms/src/main/java/com/klp/domain/vo/WmsProcessSpecVersionVo.java
View File

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
@@ -41,4 +42,18 @@ public class WmsProcessSpecVersionVo {
@ExcelProperty(value = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
private BigDecimal matchEntryThickMin;
private BigDecimal matchEntryThickMax;
private BigDecimal matchExitThickMin;
private BigDecimal matchExitThickMax;
private BigDecimal matchEntryWidthMin;
private BigDecimal matchEntryWidthMax;
private BigDecimal matchExitWidthMin;
private BigDecimal matchExitWidthMax;
private String matchSteelGrade;
private String specCode;
private String specName;
private Long lineId;
}

5
klp-wms/src/main/java/com/klp/domain/vo/WmsProductionLineVo.java
View File

@@ -64,6 +64,11 @@ public class WmsProductionLineVo {
@ExcelProperty(value = "备注")
private String remark;
/**
* 产线支持的操作类型（逗号分隔，1=分卷，2=合卷，3=更新）
*/
private String actionType;
/**
* 关联的排产计划明细数量
*/