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

1完成酸轧轧辊调整

Browse Source 
2完成双机架工艺规格串联
3完成双机架计划串联
4完成双机架wip快捷录入检索
5完成双机架实绩串联
This commit is contained in:
wangyu
2026-05-19 17:13:37 +08:00
parent 417783e64a
commit 53a180787b
46 changed files with 5592 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
klp-wms/src/main/java/com/klp/domain/DrMillProcessPass.java Normal file
View File

@@ -0,0 +1,33 @@
package com.klp.domain;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/** 双机架工艺方案道次（对应 double-rack.mill_process_pass） */
@Data
public class DrMillProcessPass {
private Long passId;
private Long recipeId;
/** 所属版本 ID */
private Long versionId;
private Integer passNo;
private BigDecimal inThick;
private BigDecimal outThick;
private BigDecimal width;
private BigDecimal rollForce;
private BigDecimal inTension;
private BigDecimal outTension;
private BigDecimal maxSpeed;
private BigDecimal inUnitTension;
private BigDecimal outUnitTension;
private BigDecimal reduction;
private BigDecimal totalReduction;
private String delFlag;
private String createBy;
private Date createTime;
private String updateBy;
private Date updateTime;
private String remark;
}

31
klp-wms/src/main/java/com/klp/domain/DrMillProcessRecipe.java Normal file
View File

@@ -0,0 +1,31 @@
package com.klp.domain;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/** 双机架工艺方案主表（对应 double-rack.mill_process_recipe） */
@Data
public class DrMillProcessRecipe {
private Long recipeId;
private String recipeNo;
private String alloyNo;
private Integer passCount;
private BigDecimal inThick;
private BigDecimal outThick;
private BigDecimal outWidth;
/** 0-正常 1-停用 */
private String status;
/** 0-存在 2-删除 */
private String delFlag;
private String createBy;
private Date createTime;
private String updateBy;
private Date updateTime;
private String remark;
/** 关联道次（非数据库字段） */
private List<DrMillProcessPass> passList;
}

28
klp-wms/src/main/java/com/klp/domain/DrMillProcessRecipeVersion.java Normal file
View File

@@ -0,0 +1,28 @@
package com.klp.domain;
import lombok.Data;
import java.util.Date;
import java.util.List;
/** 双机架工艺方案版本（double-rack.mill_process_recipe_version） */
@Data
public class DrMillProcessRecipeVersion {
private Long versionId;
private Long recipeId;
/** 版本号，如 V1.0 */
private String versionCode;
/** 1=已激活 0=未激活 */
private Integer isActive;
/** 0=草稿 1=已发布 */
private String status;
private String createBy;
private Date createTime;
private String updateBy;
private Date updateTime;
private String remark;
private String delFlag;
/** 关联道次（非数据库字段） */
private List<DrMillProcessPass> passList;
}

66
klp-wms/src/main/java/com/klp/domain/DrMillProductionPlan.java Normal file
View File

@@ -0,0 +1,66 @@
package com.klp.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 双机架生产计划（对应 double-rack.mill_production_plan）。
* enterCoilNo / currentCoilNo 用于绑定三级 WMS 钢卷数据。
*/
@Data
public class DrMillProductionPlan {
private Long planId;
private String planNo;
/** 0-待生产 1-生产中 2-完成 3-撤销 */
private String planStatus;
/** Idle / Rolling / NextCoil / Done */
private String prodStatus;
private Integer sortNo;
private String inMatNo;
private String alloyNo;
private BigDecimal inMatThick;
private BigDecimal inMatWidth;
private BigDecimal inMatWeight;
private BigDecimal inMatLength;
private BigDecimal inMatId;
private BigDecimal inMatOd;
private BigDecimal outThick;
private Integer passCount;
private Long recipeId;
private String recipeNo;
/** 绑定的工艺版本 ID */
private Long versionId;
/** 关联三级 WMS 入场钢卷号 */
private String enterCoilNo;
/** 关联三级 WMS 当前钢卷号 */
private String currentCoilNo;
/** 绑定方案的道次列表（非DB字段，按需填充） */
private List<DrMillProcessPass> passList;
private String delFlag;
private String createBy;
private Date createTime;
private String updateBy;
private Date updateTime;
private String remark;
// ── 非 DB 查询字段（分页 + 时间范围） ──────────────
@TableField(exist = false)
private Integer pageNum;
@TableField(exist = false)
private Integer pageSize;
@TableField(exist = false)
private String createStartTime;
@TableField(exist = false)
private String createEndTime;
public int getOffset() {
int num = (pageNum != null && pageNum > 0) ? pageNum : 1;
int size = (pageSize != null && pageSize > 0) ? pageSize : 50;
return (num - 1) * size;
}
}