refactor(入库任务): 连表查询库位信息

2024-11-13 17:06:23 +08:00 · 2024-11-13 17:06:23 +08:00 · 74fbddeffe
commit 74fbddeffe
parent a284ef3fa3
2 changed files with 174 additions and 126 deletions
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsInTask.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsInTask.java
@ -7,210 +7,251 @@ import com.ktg.common.core.domain.BaseEntity;

 /**
 * 入库任务对象 WMS_IN_TASK
- * 
+ *
 * @author yinjinlu
 * @date 2024-11-01
 */
-public class WmsInTask extends BaseEntity
-{
+public class WmsInTask extends BaseEntity {
    private static final long serialVersionUID = 1L;

-    /** 主键 */
+    /**
+     * 主键
+     */
    private Long id;

-    /** 任务编码 */
+    /**
+     * 任务编码
+     */
    @Excel(name = "任务编码")
    private String taskInCode;

-    /** 入库计划id */
+    /**
+     * 入库计划id
+     */
    @Excel(name = "入库计划id")
    private String planInId;

-    /** 任务数量 */
+    /**
+     * 任务数量
+     */
    @Excel(name = "任务数量")
    private Integer taskInQuantity;

-    /** 实际数量 */
+    /**
+     * 实际数量
+     */
    @Excel(name = "实际数量")
    private Integer actualInQuantity;

-    /** 目标库位 */
-    @Excel(name = "目标库位")
+    /**
+     * 目标库位
+     */
+    @Excel(name = "目标库位ID")
    private Long cellTgt;

-    /** 起始库位 */
+    /**
+     * 库位名称
+     */
+    private String cellName;
+
+    /**
+     * 库位编码
+     */
+    private String cellCode;
+
+    /**
+     * 起始库位
+     */
    @Excel(name = "起始库位")
    private String cellOrig;

-    /** 是否激活 */
+    /**
+     * 是否激活
+     */
    @Excel(name = "是否激活")
    private String isActive;

-    /** 是否删除 */
+    /**
+     * 是否删除
+     */
    @Excel(name = "是否删除")
    private String isDelete;

-    /** 批次 */
+    /**
+     * 批次
+     */
    @Excel(name = "批次")
    private String batch;

-    /** 物料 */
+    /**
+     * 物料
+     */
    @Excel(name = "物料")
    private String materialId;

-    /** 出入库类型 */
+    /**
+     * 出入库类型
+     */
    @Excel(name = "出入库类型")
    private String planTypeId;

-    /** 状态 */
+    /**
+     * 状态
+     */
    @Excel(name = "状态")
    private String planInStatus;

-    /** 入库计划编码 */
+    /**
+     * 入库计划编码
+     */
    @Excel(name = "入库计划编码")
    private String planInCode;

-    /** 物料编码 */
+    /**
+     * 物料编码
+     */
    @Excel(name = "物料编码")
    private String materialCode;

-    /** 入库明细ID */
+    /**
+     * 入库明细ID
+     */
    @Excel(name = "入库明细ID")
    private Long detailInId;

-    public void setId(Long id)
-    {
+    public void setId(Long id) {
        this.id = id;
    }

-    public Long getId()
-    {
+    public Long getId() {
        return id;
    }
-    public void setTaskInCode(String taskInCode) 
-    {
+
+    public void setTaskInCode(String taskInCode) {
        this.taskInCode = taskInCode;
    }

-    public String getTaskInCode() 
-    {
+    public String getTaskInCode() {
        return taskInCode;
    }
-    public void setPlanInId(String planInId) 
-    {
+
+    public void setPlanInId(String planInId) {
        this.planInId = planInId;
    }

-    public String getPlanInId() 
-    {
+    public String getPlanInId() {
        return planInId;
    }
-    public void setTaskInQuantity(Integer taskInQuantity)
-    {
+
+    public void setTaskInQuantity(Integer taskInQuantity) {
        this.taskInQuantity = taskInQuantity;
    }

-    public Integer getTaskInQuantity()
-    {
+    public Integer getTaskInQuantity() {
        return taskInQuantity;
    }
-    public void setActualInQuantity(Integer actualInQuantity)
-    {
+
+    public void setActualInQuantity(Integer actualInQuantity) {
        this.actualInQuantity = actualInQuantity;
    }

-    public Integer getActualInQuantity()
-    {
+    public Integer getActualInQuantity() {
        return actualInQuantity;
    }
-    public void setCellTgt(Long cellTgt)
-    {
+
+    public void setCellTgt(Long cellTgt) {
        this.cellTgt = cellTgt;
    }

-    public Long getCellTgt()
-    {
+    public Long getCellTgt() {
        return cellTgt;
    }
-    public void setCellOrig(String cellOrig) 
-    {
+
+    public void setCellOrig(String cellOrig) {
        this.cellOrig = cellOrig;
    }

-    public String getCellOrig() 
-    {
+    public String getCellOrig() {
        return cellOrig;
    }
-    public void setIsActive(String isActivy)
-    {
-        this.isActive = isActivy;
+
+    public String getCellName() {
+        return cellName;
    }

-    public String getIsActive()
-    {
+    public void setCellName(String cellName) {
+        this.cellName = cellName;
+    }
+
+    public String getCellCode() {
+        return cellCode;
+    }
+
+    public void setCellCode(String cellCode) {
+        this.cellCode = cellCode;
+    }
+
+    public void setIsActive(String isActive) {
+        this.isActive = isActive;
+    }
+
+    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 setBatch(String batch) 
-    {
+
+    public void setBatch(String batch) {
        this.batch = batch;
    }

-    public String getBatch() 
-    {
+    public String getBatch() {
        return batch;
    }
-    public void setMaterialId(String materialId) 
-    {
+
+    public void setMaterialId(String materialId) {
        this.materialId = materialId;
    }

-    public String getMaterialId() 
-    {
+    public String getMaterialId() {
        return materialId;
    }
-    public void setPlanTypeId(String planTypeId) 
-    {
+
+    public void setPlanTypeId(String planTypeId) {
        this.planTypeId = planTypeId;
    }

-    public String getPlanTypeId() 
-    {
+    public String getPlanTypeId() {
        return planTypeId;
    }
-    public void setPlanInStatus(String planInStatus) 
-    {
+
+    public void setPlanInStatus(String planInStatus) {
        this.planInStatus = planInStatus;
    }

-    public String getPlanInStatus() 
-    {
+    public String getPlanInStatus() {
        return planInStatus;
    }
-    public void setPlanInCode(String planInCode) 
-    {
+
+    public void setPlanInCode(String planInCode) {
        this.planInCode = planInCode;
    }

-    public String getPlanInCode() 
-    {
+    public String getPlanInCode() {
        return planInCode;
    }
-    public void setMaterialCode(String materialCode) 
-    {
+
+    public void setMaterialCode(String materialCode) {
        this.materialCode = materialCode;
    }

-    public String getMaterialCode() 
-    {
+    public String getMaterialCode() {
        return materialCode;
    }

@ -224,28 +265,30 @@ public class WmsInTask extends BaseEntity

    @Override
    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("taskInCode", getTaskInCode())
-            .append("planInId", getPlanInId())
-            .append("taskInQuantity", getTaskInQuantity())
-            .append("actualInQuantity", getActualInQuantity())
-            .append("cellTgt", getCellTgt())
-            .append("cellOrig", getCellOrig())
-            .append("remark", getRemark())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("isActive", getIsActive())
-            .append("isDelete", getIsDelete())
-            .append("batch", getBatch())
-            .append("materialId", getMaterialId())
-            .append("planTypeId", getPlanTypeId())
-            .append("planInStatus", getPlanInStatus())
-            .append("planInCode", getPlanInCode())
-            .append("materialCode", getMaterialCode())
-            .append("detailInId", getDetailInId())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("taskInCode", getTaskInCode())
+                .append("planInId", getPlanInId())
+                .append("taskInQuantity", getTaskInQuantity())
+                .append("actualInQuantity", getActualInQuantity())
+                .append("cellTgt", getCellTgt())
+                .append("cellName", getCellName())
+                .append("cellCode", getCellCode())
+                .append("cellOrig", getCellOrig())
+                .append("remark", getRemark())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("isActive", getIsActive())
+                .append("isDelete", getIsDelete())
+                .append("batch", getBatch())
+                .append("materialId", getMaterialId())
+                .append("planTypeId", getPlanTypeId())
+                .append("planInStatus", getPlanInStatus())
+                .append("planInCode", getPlanInCode())
+                .append("materialCode", getMaterialCode())
+                .append("detailInId", getDetailInId())
+                .toString();
    }
 }
--- a/ktg-mes/src/main/resources/mapper/wm/WmsInTaskMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/wm/WmsInTaskMapper.xml
@ -12,6 +12,8 @@
        <result property="actualInQuantity" column="ACTUAL_IN_QUANTITY"/>
        <result property="cellTgt" column="CELL_TGT"/>
        <result property="cellOrig" column="CELL_ORIG"/>
+        <result property="cellName" column="CELL_NAME"/>
+        <result property="cellCode" column="CELL_CODE"/>
        <result property="remark" column="REMARK"/>
        <result property="createBy" column="CREATE_BY"/>
        <result property="createTime" column="CREATE_TIME"/>
@ -29,28 +31,31 @@
    </resultMap>

    <sql id="selectWmsInTaskVo">
-        select ID,
-               TASK_IN_CODE,
-               PLAN_IN_ID,
-               TASK_IN_QUANTITY,
-               ACTUAL_IN_QUANTITY,
-               CELL_TGT,
-               CELL_ORIG,
-               REMARK,
-               CREATE_BY,
-               CREATE_TIME,
-               UPDATE_BY,
-               UPDATE_TIME,
-               IS_ACTIVE,
-               IS_DELETE,
-               BATCH,
-               MATERIAL_ID,
-               PLAN_TYPE_ID,
-               PLAN_IN_STATUS,
-               PLAN_IN_CODE,
-               MATERIAL_CODE,
-               DETAIL_IN_ID
-        from WMS_IN_TASK
+        select a.ID,
+               a.TASK_IN_CODE,
+               a.PLAN_IN_ID,
+               a.TASK_IN_QUANTITY,
+               a.ACTUAL_IN_QUANTITY,
+               a.CELL_TGT,
+               a.CELL_ORIG,
+               a.REMARK,
+               a.CREATE_BY,
+               a.CREATE_TIME,
+               a.UPDATE_BY,
+               a.UPDATE_TIME,
+               a.IS_ACTIVE,
+               a.IS_DELETE,
+               a.BATCH,
+               a.MATERIAL_ID,
+               a.PLAN_TYPE_ID,
+               a.PLAN_IN_STATUS,
+               a.PLAN_IN_CODE,
+               a.MATERIAL_CODE,
+               a.DETAIL_IN_ID,
+               b.AREA_CODE AS CELL_CODE,
+               b.AREA_NAME AS CELL_NAME
+        from WMS_IN_TASK a
+                 left join WM_STORAGE_AREA b on b.AREA_ID = a.CELL_TGT
    </sql>

    <select id="selectWmsInTaskList" parameterType="WmsInTask" resultMap="WmsInTaskResult">