kelvin/wms-gj-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

组装计划单

Browse Source
This commit is contained in:
Stang 2024-11-07 14:28:29 +08:00
parent f274691bad
commit 180f4dd995
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsZdTask.java
View File

@ -1,5 +1,6 @@
package com.ktg.mes.wm.domain; package com.ktg.mes.wm.domain;
import com.ktg.mes.md.domain.BaseTechnologyBom;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ktg.common.annotation.Excel; import com.ktg.common.annotation.Excel;
@ -53,6 +54,8 @@ public class WmsZdTask extends BaseEntity
@Excel(name = "预留字段1") @Excel(name = "预留字段1")
private Long attr1; private Long attr1;
private String planSheet;
/** 预留字段2 */ /** 预留字段2 */
@Excel(name = "预留字段2") @Excel(name = "预留字段2")
private String attr2; private String attr2;
@ -196,6 +199,14 @@ public class WmsZdTask extends BaseEntity
return status; return status;
} }
public String getPlanSheet() {
return planSheet;
}
public void setPlanSheet(String planSheet) {
this.planSheet = planSheet;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

5
ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml
View File

@ -83,7 +83,6 @@
BK.IS_LOCKED, BK.IS_LOCKED,
BK.LOCKED_START_TIME, BK.LOCKED_START_TIME,
BK.LOCKED_END_TIME, BK.LOCKED_END_TIME,
BK.PLAN_SHEET,
BK.RESET_COUNT, BK.RESET_COUNT,
BK.ITEM_OR_PRODUCT, BK.ITEM_OR_PRODUCT,
BK.REMARK, BK.REMARK,
@ -94,10 +93,12 @@
BK.CREATE_BY, BK.CREATE_BY,
BK.CREATE_TIME, BK.CREATE_TIME,
BK.UPDATE_BY, BK.UPDATE_BY,
BK.UPDATE_TIME BK.UPDATE_TIME,
BTB.FIGURE_CODE PLAN_SHEET
from BASE_KNIFE BK from BASE_KNIFE BK
LEFT JOIN MD_ITEM MI on BK.MBB_BD_MRL_ID = MI.ITEM_ID LEFT JOIN MD_ITEM MI on BK.MBB_BD_MRL_ID = MI.ITEM_ID
LEFT JOIN MD_ITEM_TYPE MIT ON MI.ITEM_TYPE_ID = MIT.ITEM_TYPE_ID LEFT JOIN MD_ITEM_TYPE MIT ON MI.ITEM_TYPE_ID = MIT.ITEM_TYPE_ID
LEFT JOIN BASE_TECHNOLOGY_BOM BTB ON BTB.TECHNOLOGY_BOM_ID = BK.PLAN_SHEET
</sql> </sql>
<select id="selectBaseKnifeList" parameterType="BaseKnife" resultMap="BaseKnifeResult"> <select id="selectBaseKnifeList" parameterType="BaseKnife" resultMap="BaseKnifeResult">

6
ktg-mes/src/main/resources/mapper/wm/WmsZdTaskMapper.xml
View File

@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="attr2" column="ATTR2" /> <result property="attr2" column="ATTR2" />
<result property="attr3" column="ATTR3" /> <result property="attr3" column="ATTR3" />
<result property="attr4" column="ATTR4" /> <result property="attr4" column="ATTR4" />
<result property="planSheet" column="plan_sheet" />
<result property="createBy" column="CREATE_BY" /> <result property="createBy" column="CREATE_BY" />
<result property="createTime" column="CREATE_TIME" /> <result property="createTime" column="CREATE_TIME" />
<result property="updateBy" column="UPDATE_BY" /> <result property="updateBy" column="UPDATE_BY" />
@ -28,10 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectWmsZdTaskVo"> <sql id="selectWmsZdTaskVo">
select wzt.WMS_ZD_TASK_ID, wzt.CODE, wzt."name", wzt.M_PRODUCT_ID, wzt."product_id_qty", wzt.QTY, wzt.PLAN_OUT_ID, select wzt.WMS_ZD_TASK_ID, wzt.CODE, wzt."name", wzt.M_PRODUCT_ID, wzt."product_id_qty", wzt.QTY, wzt.PLAN_OUT_ID,
wzt.PLAN_OUT_TYPE, wzt.QTY_OK, wzt.REMARK, wzt.ATTR1, wzt.ATTR3, wzt.ATTR4, wzt.CREATE_BY, wzt.CREATE_TIME, wzt.PLAN_OUT_TYPE, wzt.QTY_OK, wzt.REMARK, wzt.ATTR1, wzt.ATTR3, wzt.CREATE_BY, wzt.CREATE_TIME,
wzt.UPDATE_BY, wzt.UPDATE_TIME, wzt.STATUS, mi.item_name attr2 wzt.UPDATE_BY, wzt.UPDATE_TIME, wzt.STATUS, mi.item_name attr2, btb.figure_code attr4
from WMS_ZD_TASK wzt from WMS_ZD_TASK wzt
left join md_item mi on wzt.m_product_id = mi.item_id left join md_item mi on wzt.m_product_id = mi.item_id
left join base_technology_bom btb on btb.technology_bom_id = wzt.attr4
</sql> </sql>
<select id="selectWmsZdTaskList" parameterType="WmsZdTask" resultMap="WmsZdTaskResult"> <select id="selectWmsZdTaskList" parameterType="WmsZdTask" resultMap="WmsZdTaskResult">