diff --git a/.gitignore b/.gitignore index 0c0da3e0..e6a879e7 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,5 @@ nbdist/ !*/build/*.java !*/build/*.html !*/build/*.xml + +.cursor diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..7b016a89 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.compile.nullAnalysis.mode": "automatic" +} \ No newline at end of file diff --git a/ruoyi-mill/pom.xml b/ruoyi-mill/pom.xml index 7b241615..5a9ab45a 100644 --- a/ruoyi-mill/pom.xml +++ b/ruoyi-mill/pom.xml @@ -19,6 +19,11 @@ com.ruoyi ruoyi-framework + + org.projectlombok + lombok + provided + diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillProductionPlanController.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillProductionPlanController.java index 8ffd86d6..d0386c8b 100644 --- a/ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillProductionPlanController.java +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillProductionPlanController.java @@ -2,7 +2,6 @@ package com.ruoyi.mill.controller; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.mill.domain.MillProductionPlan; import com.ruoyi.mill.service.IMillProductionPlanService; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +9,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; @RestController -@RequestMapping("/mill/plan") +@RequestMapping("/mill/production-plan") public class MillProductionPlanController extends BaseController { @Autowired diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillPlan.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillPlan.java index dcfa5978..e62e1692 100644 --- a/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillPlan.java +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillPlan.java @@ -2,13 +2,18 @@ package com.ruoyi.mill.domain; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; + import java.math.BigDecimal; /** * 冷轧生产计划 — 对应 2FK101 作业命令信息 */ +@Data public class MillPlan extends BaseEntity { + private Long planId; + @Excel(name = "计划号") private String planNo; @@ -67,62 +72,5 @@ public class MillPlan extends BaseEntity { @Excel(name = "备注") private String remark; - // ---- getters / setters ---- - public String getPlanNo() { return planNo; } - public void setPlanNo(String v) { this.planNo = v; } - - public String getMatSeqNo() { return matSeqNo; } - public void setMatSeqNo(String v) { this.matSeqNo = v; } - - public String getUnitCode() { return unitCode; } - public void setUnitCode(String v) { this.unitCode = v; } - - public String getPlanType() { return planType; } - public void setPlanType(String v) { this.planType = v; } - - public Integer getPlanStatus() { return planStatus; } - public void setPlanStatus(Integer v) { this.planStatus = v; } - - public String getInMatNo() { return inMatNo; } - public void setInMatNo(String v) { this.inMatNo = v; } - - public BigDecimal getInMatThick() { return inMatThick; } - public void setInMatThick(BigDecimal v) { this.inMatThick = v; } - - public BigDecimal getInMatThickMax() { return inMatThickMax; } - public void setInMatThickMax(BigDecimal v) { this.inMatThickMax = v; } - - public BigDecimal getInMatThickMin() { return inMatThickMin; } - public void setInMatThickMin(BigDecimal v) { this.inMatThickMin = v; } - - public BigDecimal getInMatWidth() { return inMatWidth; } - public void setInMatWidth(BigDecimal v) { this.inMatWidth = v; } - - public BigDecimal getInMatWt() { return inMatWt; } - public void setInMatWt(BigDecimal v) { this.inMatWt = v; } - - public BigDecimal getInMatLen() { return inMatLen; } - public void setInMatLen(BigDecimal v) { this.inMatLen = v; } - - public BigDecimal getInMatInDia() { return inMatInDia; } - public void setInMatInDia(BigDecimal v) { this.inMatInDia = v; } - - public BigDecimal getInMatDia() { return inMatDia; } - public void setInMatDia(BigDecimal v) { this.inMatDia = v; } - - public String getPono() { return pono; } - public void setPono(String v) { this.pono = v; } - - public String getSgSign() { return sgSign; } - public void setSgSign(String v) { this.sgSign = v; } - - public String getOutMatNo() { return outMatNo; } - public void setOutMatNo(String v) { this.outMatNo = v; } - - public String getCustInMatNo() { return custInMatNo; } - public void setCustInMatNo(String v) { this.custInMatNo = v; } - - public String getRemark() { return remark; } - public void setRemark(String v) { this.remark = v; } } diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProcessPass.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProcessPass.java index 92c932f4..3d9168e4 100644 --- a/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProcessPass.java +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProcessPass.java @@ -2,11 +2,16 @@ package com.ruoyi.mill.domain; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; + import java.math.BigDecimal; /** 工艺方案道次详情 */ +@Data public class MillProcessPass extends BaseEntity { + private Long passId; + private Long recipeId; @Excel(name = "道次") @@ -47,32 +52,4 @@ public class MillProcessPass extends BaseEntity { private String delFlag; - public Long getRecipeId() { return recipeId; } - public void setRecipeId(Long v) { this.recipeId = v; } - public Integer getPassNo() { return passNo; } - public void setPassNo(Integer v) { this.passNo = v; } - public BigDecimal getInThick() { return inThick; } - public void setInThick(BigDecimal v) { this.inThick = v; } - public BigDecimal getOutThick() { return outThick; } - public void setOutThick(BigDecimal v) { this.outThick = v; } - public BigDecimal getWidth() { return width; } - public void setWidth(BigDecimal v) { this.width = v; } - public BigDecimal getRollForce() { return rollForce; } - public void setRollForce(BigDecimal v) { this.rollForce = v; } - public BigDecimal getInTension() { return inTension; } - public void setInTension(BigDecimal v) { this.inTension = v; } - public BigDecimal getOutTension() { return outTension; } - public void setOutTension(BigDecimal v) { this.outTension = v; } - public BigDecimal getMaxSpeed() { return maxSpeed; } - public void setMaxSpeed(BigDecimal v) { this.maxSpeed = v; } - public BigDecimal getInUnitTension() { return inUnitTension; } - public void setInUnitTension(BigDecimal v) { this.inUnitTension = v; } - public BigDecimal getOutUnitTension() { return outUnitTension; } - public void setOutUnitTension(BigDecimal v){ this.outUnitTension = v; } - public BigDecimal getReduction() { return reduction; } - public void setReduction(BigDecimal v) { this.reduction = v; } - public BigDecimal getTotalReduction() { return totalReduction; } - public void setTotalReduction(BigDecimal v){ this.totalReduction = v; } - public String getDelFlag() { return delFlag; } - public void setDelFlag(String v) { this.delFlag = v; } } diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProcessRecipe.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProcessRecipe.java index 7e9acb54..eba30962 100644 --- a/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProcessRecipe.java +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProcessRecipe.java @@ -2,12 +2,17 @@ package com.ruoyi.mill.domain; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; + import java.math.BigDecimal; import java.util.List; /** 工艺方案主表 */ +@Data public class MillProcessRecipe extends BaseEntity { + private Long recipeId; + @Excel(name = "方案记录号") private String recipeNo; @@ -34,23 +39,4 @@ public class MillProcessRecipe extends BaseEntity { /** 关联道次列表（非数据库字段） */ private List passList; - - public String getRecipeNo() { return recipeNo; } - public void setRecipeNo(String v) { this.recipeNo = v; } - public String getAlloyNo() { return alloyNo; } - public void setAlloyNo(String v) { this.alloyNo = v; } - public Integer getPassCount() { return passCount; } - public void setPassCount(Integer v) { this.passCount = v; } - public BigDecimal getInThick() { return inThick; } - public void setInThick(BigDecimal v) { this.inThick = v; } - public BigDecimal getOutThick() { return outThick; } - public void setOutThick(BigDecimal v) { this.outThick = v; } - public BigDecimal getOutWidth() { return outWidth; } - public void setOutWidth(BigDecimal v) { this.outWidth = v; } - public String getStatus() { return status; } - public void setStatus(String v) { this.status = v; } - public String getDelFlag() { return delFlag; } - public void setDelFlag(String v) { this.delFlag = v; } - public List getPassList() { return passList; } - public void setPassList(List v) { this.passList = v; } } diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProductionPlan.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProductionPlan.java index 7b819668..f3b114d3 100644 --- a/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProductionPlan.java +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProductionPlan.java @@ -2,11 +2,16 @@ package com.ruoyi.mill.domain; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; + import java.math.BigDecimal; /** 生产计划（轧制队列） */ +@Data public class MillProductionPlan extends BaseEntity { + private Long planId; + @Excel(name = "计划号") private String planNo; @@ -65,47 +70,4 @@ public class MillProductionPlan extends BaseEntity { private String recipeNo; private String delFlag; - - public String getPlanNo() { return planNo; } - public void setPlanNo(String v) { this.planNo = v; } - public String getMatSeqNo() { return matSeqNo; } - public void setMatSeqNo(String v) { this.matSeqNo = v; } - public String getUnitCode() { return unitCode; } - public void setUnitCode(String v) { this.unitCode = v; } - public String getPlanType() { return planType; } - public void setPlanType(String v) { this.planType = v; } - public String getPlanStatus() { return planStatus; } - public void setPlanStatus(String v) { this.planStatus = v; } - public String getProdStatus() { return prodStatus; } - public void setProdStatus(String v) { this.prodStatus = v; } - public Integer getSortNo() { return sortNo; } - public void setSortNo(Integer v) { this.sortNo = v; } - public String getInMatNo() { return inMatNo; } - public void setInMatNo(String v) { this.inMatNo = v; } - public BigDecimal getInMatThick() { return inMatThick; } - public void setInMatThick(BigDecimal v) { this.inMatThick = v; } - public BigDecimal getInMatWidth() { return inMatWidth; } - public void setInMatWidth(BigDecimal v) { this.inMatWidth = v; } - public BigDecimal getInMatWt() { return inMatWt; } - public void setInMatWt(BigDecimal v) { this.inMatWt = v; } - public BigDecimal getInMatLen() { return inMatLen; } - public void setInMatLen(BigDecimal v) { this.inMatLen = v; } - public BigDecimal getInMatInDia() { return inMatInDia; } - public void setInMatInDia(BigDecimal v) { this.inMatInDia = v; } - public BigDecimal getInMatDia() { return inMatDia; } - public void setInMatDia(BigDecimal v) { this.inMatDia = v; } - public String getPono() { return pono; } - public void setPono(String v) { this.pono = v; } - public String getSgSign() { return sgSign; } - public void setSgSign(String v) { this.sgSign = v; } - public String getOutMatNo() { return outMatNo; } - public void setOutMatNo(String v) { this.outMatNo = v; } - public BigDecimal getOutThick() { return outThick; } - public void setOutThick(BigDecimal v) { this.outThick = v; } - public Long getRecipeId() { return recipeId; } - public void setRecipeId(Long v) { this.recipeId = v; } - public String getRecipeNo() { return recipeNo; } - public void setRecipeNo(String v) { this.recipeNo = v; } - public String getDelFlag() { return delFlag; } - public void setDelFlag(String v) { this.delFlag = v; } } diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProcessRecipeServiceImpl.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProcessRecipeServiceImpl.java index e6ae5ac6..98a8edeb 100644 --- a/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProcessRecipeServiceImpl.java +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProcessRecipeServiceImpl.java @@ -48,7 +48,7 @@ public class MillProcessRecipeServiceImpl implements IMillProcessRecipeService { recipe.setUpdateBy(SecurityUtils.getUsername()); recipeMapper.update(recipe); // 先删除旧道次，再重新插入 - passMapper.deleteByRecipeId(recipe.getId()); + passMapper.deleteByRecipeId(recipe.getRecipeId()); savePassList(recipe); return 1; } @@ -67,7 +67,7 @@ public class MillProcessRecipeServiceImpl implements IMillProcessRecipeService { if (list == null || list.isEmpty()) return; String user = SecurityUtils.getUsername(); for (MillProcessPass p : list) { - p.setRecipeId(recipe.getId()); + p.setRecipeId(recipe.getRecipeId()); p.setCreateBy(user); p.setUpdateBy(user); } diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProductionPlanServiceImpl.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProductionPlanServiceImpl.java index 99d0e039..dfa42224 100644 --- a/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProductionPlanServiceImpl.java +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProductionPlanServiceImpl.java @@ -58,8 +58,8 @@ public class MillProductionPlanServiceImpl implements IMillProductionPlanService .filter(p -> p.getSortNo() == cur.getSortNo() - 1) .findFirst().orElse(null); if (prev == null) return 0; - planMapper.updateSortNo(cur.getId(), prev.getSortNo()); - planMapper.updateSortNo(prev.getId(), cur.getSortNo()); + planMapper.updateSortNo(cur.getPlanId(), prev.getSortNo()); + planMapper.updateSortNo(prev.getPlanId(), cur.getSortNo()); return 1; } @@ -73,8 +73,8 @@ public class MillProductionPlanServiceImpl implements IMillProductionPlanService .filter(p -> p.getSortNo() == cur.getSortNo() + 1) .findFirst().orElse(null); if (next == null) return 0; - planMapper.updateSortNo(cur.getId(), next.getSortNo()); - planMapper.updateSortNo(next.getId(), cur.getSortNo()); + planMapper.updateSortNo(cur.getPlanId(), next.getSortNo()); + planMapper.updateSortNo(next.getPlanId(), cur.getSortNo()); return 1; } } diff --git a/ruoyi-mill/src/main/resources/mapper/mill/MillProcessPassMapper.xml b/ruoyi-mill/src/main/resources/mapper/mill/MillProcessPassMapper.xml index 457b1426..c0822fe0 100644 --- a/ruoyi-mill/src/main/resources/mapper/mill/MillProcessPassMapper.xml +++ b/ruoyi-mill/src/main/resources/mapper/mill/MillProcessPassMapper.xml @@ -4,7 +4,7 @@ - + @@ -27,7 +27,7 @@ SELECT FROM mill_production_plan - WHERE id = #{id} AND del_flag = '0' + WHERE plan_id = #{planId} AND del_flag = '0'