refactor(入库计划): 实体修改

ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java

@@ -753,7 +753,7 @@ public class BaseKnifeController extends BaseController
         // 入库任务
         MdItem mdItem = mdItemService.selectMdItemById(zdTask.getmProductId());
         WmsInTask wmsInTask = new WmsInTask();
-        wmsInTask.setPlanInId(wmsInPlan.getPlanId());
+        wmsInTask.setPlanInId(wmsInPlan.getPlanId().toString());
         wmsInTask.setPlanInCode(generateTaskCode(wmsInPlan.getPlanCode()));
         wmsInTask.setMaterialCode(mdItem.getItemCode());
         wmsInTask.setTaskInQuantity(zdTask.getProductIdQty());

ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsInPlan.java

@@ -1,6 +1,7 @@
 package com.ktg.mes.wm.domain;
 
 import java.util.List;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ktg.common.annotation.Excel;
@@ -8,358 +9,379 @@ import com.ktg.common.core.domain.BaseEntity;
 
 /**
  * 入库计划对象 WMS_IN_PLAN
- * 
+ *
  * @author yinjinlu
  * @date 2024-10-31
  */
-public class WmsInPlan extends BaseEntity
-{
+public class WmsInPlan extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 主键 */
-    private String planId;
+    /**
+     * 主键
+     */
+    private Long planId;
 
-    /** 状态[00-新建 20-执行中 40-关闭 45-手工关闭] */
+    /**
+     * 状态[00-新建 20-执行中 40-关闭 45-手工关闭]
+     */
     @Excel(name = "状态[00-新建 20-执行中 40-关闭 45-手工关闭]")
     private String state;
 
-    /** 来源类型[10-接口 20-手工 30-导入] */
+    /**
+     * 来源类型[10-接口 20-手工 30-导入]
+     */
     @Excel(name = "来源类型[10-接口 20-手工 30-导入]")
     private String sourceType;
 
-    /** 仓库ID */
+    /**
+     * 仓库ID
+     */
     @Excel(name = "仓库ID")
     private String wareId;
 
-    /** 库位编码 */
+    /**
+     * 库位编码
+     */
     @Excel(name = "库位编码")
     private String cellCode;
 
-    /** 工单号 */
+    /**
+     * 工单号
+     */
     @Excel(name = "工单号")
     private String workOrderCode;
 
-    /** 计划日期 */
+    /**
+     * 计划日期
+     */
     @Excel(name = "计划日期")
     private String expectDate;
 
-    /** 发布人 */
+    /**
+     * 发布人
+     */
     @Excel(name = "发布人")
     private String publishName;
 
-    /** 发布时间 */
+    /**
+     * 发布时间
+     */
     @Excel(name = "发布时间")
     private String publishTime;
 
-    /** 关闭人(暂不可用) */
+    /**
+     * 关闭人(暂不可用)
+     */
     @Excel(name = "关闭人(暂不可用)")
     private String closerId;
 
-    /** 关闭日期(暂不可用) */
+    /**
+     * 关闭日期(暂不可用)
+     */
     @Excel(name = "关闭日期(暂不可用)")
     private String closeTime;
 
-    /** 关联单据号 */
+    /**
+     * 关联单据号
+     */
     @Excel(name = "关联单据号")
     private String relBillCode;
 
-    /** 客户ID. */
+    /**
+     * 客户ID.
+     */
     @Excel(name = "客户ID.")
     private String customerId;
 
-    /** 采购单号. */
+    /**
+     * 采购单号.
+     */
     @Excel(name = "采购单号.")
     private String poCode;
 
-    /** 部门ID. */
+    /**
+     * 部门ID.
+     */
     @Excel(name = "部门ID.")
     private String departmentId;
 
-    /** 合同号. */
+    /**
+     * 合同号.
+     */
     @Excel(name = "合同号.")
     private String contractNo;
 
-    /** 供应商ID. */
+    /**
+     * 供应商ID.
+     */
     @Excel(name = "供应商ID.")
     private String supplierId;
 
-    /** 业务类型id. */
+    /**
+     * 业务类型id.
+     */
     @Excel(name = "业务类型id.")
     private String businessTypeId;
 
-    /** 来源出库任务. */
+    /**
+     * 来源出库任务.
+     */
     @Excel(name = "来源出库任务.")
     private String srcOutTaskId;
 
-    /** 激活标识(0激活1冻结) */
+    /**
+     * 激活标识(0激活1冻结)
+     */
     @Excel(name = "激活标识(0激活1冻结)")
     private String isActive;
 
-    /** 删除标识(0未删除1删除) */
+    /**
+     * 删除标识(0未删除1删除)
+     */
     @Excel(name = "删除标识(0未删除1删除)")
     private String isDelete;
 
-    /** 计划编码 */
+    /**
+     * 计划编码
+     */
     @Excel(name = "计划编码")
     private String planCode;
 
-    /** 入库类型 */
+    /**
+     * 入库类型
+     */
     @Excel(name = "入库类型")
     private String planTypeId;
 
-    /** 入库计划明细信息 */
+    /**
+     * 入库计划明细信息
+     */
     private List<WmsInPlanDetails> wmsInPlanDetailsList;
 
-    public void setPlanId(String planId) 
-    {
+    public void setPlanId(Long planId) {
         this.planId = planId;
     }
 
-    public String getPlanId() 
-    {
+    public Long getPlanId() {
         return planId;
     }
-    public void setState(String state) 
-    {
+
+    public void setState(String state) {
         this.state = state;
     }
 
-    public String getState() 
-    {
+    public String getState() {
         return state;
     }
-    public void setSourceType(String sourceType) 
-    {
+
+    public void setSourceType(String sourceType) {
         this.sourceType = sourceType;
     }
 
-    public String getSourceType() 
-    {
+    public String getSourceType() {
         return sourceType;
     }
-    public void setWareId(String wareId) 
-    {
+
+    public void setWareId(String wareId) {
         this.wareId = wareId;
     }
 
-    public String getWareId() 
-    {
+    public String getWareId() {
         return wareId;
     }
-    public void setCellCode(String cellCode) 
-    {
+
+    public void setCellCode(String cellCode) {
         this.cellCode = cellCode;
     }
 
-    public String getCellCode() 
-    {
+    public String getCellCode() {
         return cellCode;
     }
-    public void setWorkOrderCode(String workOrderCode) 
-    {
+
+    public void setWorkOrderCode(String workOrderCode) {
         this.workOrderCode = workOrderCode;
     }
 
-    public String getWorkOrderCode() 
-    {
+    public String getWorkOrderCode() {
         return workOrderCode;
     }
-    public void setExpectDate(String expectDate) 
-    {
+
+    public void setExpectDate(String expectDate) {
         this.expectDate = expectDate;
     }
 
-    public String getExpectDate() 
-    {
+    public String getExpectDate() {
         return expectDate;
     }
-    public void setPublishName(String publishName) 
-    {
+
+    public void setPublishName(String publishName) {
         this.publishName = publishName;
     }
 
-    public String getPublishName() 
-    {
+    public String getPublishName() {
         return publishName;
     }
-    public void setPublishTime(String publishTime) 
-    {
+
+    public void setPublishTime(String publishTime) {
         this.publishTime = publishTime;
     }
 
-    public String getPublishTime() 
-    {
+    public String getPublishTime() {
         return publishTime;
     }
-    public void setCloserId(String closerId) 
-    {
+
+    public void setCloserId(String closerId) {
         this.closerId = closerId;
     }
 
-    public String getCloserId() 
-    {
+    public String getCloserId() {
         return closerId;
     }
-    public void setCloseTime(String closeTime) 
-    {
+
+    public void setCloseTime(String closeTime) {
         this.closeTime = closeTime;
     }
 
-    public String getCloseTime() 
-    {
+    public String getCloseTime() {
         return closeTime;
     }
-    public void setRelBillCode(String relBillCode) 
-    {
+
+    public void setRelBillCode(String relBillCode) {
         this.relBillCode = relBillCode;
     }
 
-    public String getRelBillCode() 
-    {
+    public String getRelBillCode() {
         return relBillCode;
     }
-    public void setCustomerId(String customerId) 
-    {
+
+    public void setCustomerId(String customerId) {
         this.customerId = customerId;
     }
 
-    public String getCustomerId() 
-    {
+    public String getCustomerId() {
         return customerId;
     }
-    public void setPoCode(String poCode) 
-    {
+
+    public void setPoCode(String poCode) {
         this.poCode = poCode;
     }
 
-    public String getPoCode() 
-    {
+    public String getPoCode() {
         return poCode;
     }
-    public void setDepartmentId(String departmentId) 
-    {
+
+    public void setDepartmentId(String departmentId) {
         this.departmentId = departmentId;
     }
 
-    public String getDepartmentId() 
-    {
+    public String getDepartmentId() {
         return departmentId;
     }
-    public void setContractNo(String contractNo) 
-    {
+
+    public void setContractNo(String contractNo) {
         this.contractNo = contractNo;
     }
 
-    public String getContractNo() 
-    {
+    public String getContractNo() {
         return contractNo;
     }
-    public void setSupplierId(String supplierId) 
-    {
+
+    public void setSupplierId(String supplierId) {
         this.supplierId = supplierId;
     }
 
-    public String getSupplierId() 
-    {
+    public String getSupplierId() {
         return supplierId;
     }
-    public void setBusinessTypeId(String businessTypeId) 
-    {
+
+    public void setBusinessTypeId(String businessTypeId) {
         this.businessTypeId = businessTypeId;
     }
 
-    public String getBusinessTypeId() 
-    {
+    public String getBusinessTypeId() {
         return businessTypeId;
     }
-    public void setSrcOutTaskId(String srcOutTaskId) 
-    {
+
+    public void setSrcOutTaskId(String srcOutTaskId) {
         this.srcOutTaskId = srcOutTaskId;
     }
 
-    public String getSrcOutTaskId() 
-    {
+    public String getSrcOutTaskId() {
         return srcOutTaskId;
     }
-    public void setIsActive(String isActive) 
-    {
+
+    public void setIsActive(String isActive) {
         this.isActive = isActive;
     }
 
-    public String getIsActive() 
-    {
+    public String getIsActive() {
         return isActive;
     }
-    public void setIsDelete(String isDelete) 
-    {
+
+    public void setIsDelete(String isDelete) {
         this.isDelete = isDelete;
     }
 
-    public String getIsDelete() 
-    {
+    public String getIsDelete() {
         return isDelete;
     }
-    public void setPlanCode(String planCode) 
-    {
+
+    public void setPlanCode(String planCode) {
         this.planCode = planCode;
     }
 
-    public String getPlanCode() 
-    {
+    public String getPlanCode() {
         return planCode;
     }
-    public void setPlanTypeId(String planTypeId) 
-    {
+
+    public void setPlanTypeId(String planTypeId) {
         this.planTypeId = planTypeId;
     }
 
-    public String getPlanTypeId() 
-    {
+    public String getPlanTypeId() {
         return planTypeId;
     }
 
-    public List<WmsInPlanDetails> getWmsInPlanDetailsList()
-    {
+    public List<WmsInPlanDetails> getWmsInPlanDetailsList() {
         return wmsInPlanDetailsList;
     }
 
-    public void setWmsInPlanDetailsList(List<WmsInPlanDetails> wmsInPlanDetailsList)
-    {
+    public void setWmsInPlanDetailsList(List<WmsInPlanDetails> wmsInPlanDetailsList) {
         this.wmsInPlanDetailsList = wmsInPlanDetailsList;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("planId", getPlanId())
-            .append("state", getState())
-            .append("sourceType", getSourceType())
-            .append("wareId", getWareId())
-            .append("cellCode", getCellCode())
-            .append("workOrderCode", getWorkOrderCode())
-            .append("expectDate", getExpectDate())
-            .append("publishName", getPublishName())
-            .append("publishTime", getPublishTime())
-            .append("closerId", getCloserId())
-            .append("closeTime", getCloseTime())
-            .append("relBillCode", getRelBillCode())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .append("updateBy", getUpdateBy())
-            .append("remark", getRemark())
-            .append("customerId", getCustomerId())
-            .append("poCode", getPoCode())
-            .append("departmentId", getDepartmentId())
-            .append("contractNo", getContractNo())
-            .append("supplierId", getSupplierId())
-            .append("businessTypeId", getBusinessTypeId())
-            .append("srcOutTaskId", getSrcOutTaskId())
-            .append("isActive", getIsActive())
-            .append("isDelete", getIsDelete())
-            .append("planCode", getPlanCode())
-            .append("planTypeId", getPlanTypeId())
-            .append("wmsInPlanDetailsList", getWmsInPlanDetailsList())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("planId", getPlanId())
+                .append("state", getState())
+                .append("sourceType", getSourceType())
+                .append("wareId", getWareId())
+                .append("cellCode", getCellCode())
+                .append("workOrderCode", getWorkOrderCode())
+                .append("expectDate", getExpectDate())
+                .append("publishName", getPublishName())
+                .append("publishTime", getPublishTime())
+                .append("closerId", getCloserId())
+                .append("closeTime", getCloseTime())
+                .append("relBillCode", getRelBillCode())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateTime", getUpdateTime())
+                .append("updateBy", getUpdateBy())
+                .append("remark", getRemark())
+                .append("customerId", getCustomerId())
+                .append("poCode", getPoCode())
+                .append("departmentId", getDepartmentId())
+                .append("contractNo", getContractNo())
+                .append("supplierId", getSupplierId())
+                .append("businessTypeId", getBusinessTypeId())
+                .append("srcOutTaskId", getSrcOutTaskId())
+                .append("isActive", getIsActive())
+                .append("isDelete", getIsDelete())
+                .append("planCode", getPlanCode())
+                .append("planTypeId", getPlanTypeId())
+                .append("wmsInPlanDetailsList", getWmsInPlanDetailsList())
+                .toString();
     }
 }