Merge remote-tracking branch 'origin/master'

op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBom.java

@@ -94,6 +94,51 @@ public class BaseBom extends BaseEntity {
 	@Excel(name = "是否在用")
 	private String currentVersion;
 
+	//虚拟字段
+	/** 物料编码 */
+	@Excel(name = "产品编码")
+	private String productCode;
+
+	/** 物料编码 */
+	@Excel(name = "产品名称")
+	private String productDescZh;
+
+	/** 物料编码 */
+	@Excel(name = "组件名称")
+	private String componentDescZh;
+
+	/** 组件上层物料编码 */
+	@Excel(name = "组件上层物料编码")
+	private String cumc;
+
+	/** 组件编码 */
+	@Excel(name = "组件编码")
+	private String component;
+
+	/** BOM层次 */
+	@Excel(name = "BOM层次")
+	private String bomHierarchy;
+
+	/** 项目编号 */
+	@Excel(name = "项目编号")
+	private String projectNo;
+
+	/** 标准用量 */
+	@Excel(name = "标准用量")
+	private Long standardDosage;
+
+	/** 损耗率 */
+	@Excel(name = "损耗率")
+	private Long lossRate;
+
+	/** 损耗额 */
+	@Excel(name = "损耗额")
+	private Long lossAmount;
+
+	/** 含损耗用量 */
+	@Excel(name = "含损耗用量")
+	private Long cilosses;
+
 	public void setFactoryCode(String factoryCode) {
 		this.factoryCode = factoryCode;
 	}
@@ -229,6 +274,83 @@ public class BaseBom extends BaseEntity {
 		return currentVersion;
 	}
 
+	public void setComponentDescZh(String componentDescZh) {
+		this.componentDescZh = componentDescZh;
+	}
+	public String getComponentDescZh() {
+		return componentDescZh;
+	}
+
+	public void setProductDescZh(String productDescZh) {
+		this.productDescZh = productDescZh;
+	}
+	public String getProductDescZh() {
+		return productDescZh;
+	}
+
+	public void setProductCode(String productCode) {
+		this.productCode = productCode;
+	}
+	public String getProductCode() {
+		return productCode;
+	}
+
+	public void setCumc(String cumc) {
+		this.cumc = cumc;
+	}
+
+	public String getCumc() {
+		return cumc;
+	}
+	public void setComponent(String component) {
+		this.component = component;
+	}
+
+	public String getComponent() {
+		return component;
+	}
+	public void setBomHierarchy(String bomHierarchy) {
+		this.bomHierarchy = bomHierarchy;
+	}
+
+	public String getBomHierarchy() {
+		return bomHierarchy;
+	}
+	public void setProjectNo(String projectNo) {
+		this.projectNo = projectNo;
+	}
+
+	public String getProjectNo() {
+		return projectNo;
+	}
+	public void setStandardDosage(Long standardDosage) {
+		this.standardDosage = standardDosage;
+	}
+
+	public Long getStandardDosage() {
+		return standardDosage;
+	}
+	public void setLossRate(Long lossRate) {
+		this.lossRate = lossRate;
+	}
+
+	public Long getLossRate() {
+		return lossRate;
+	}
+	public void setLossAmount(Long lossAmount) {
+		this.lossAmount = lossAmount;
+	}
+
+	public Long getLossAmount() {
+		return lossAmount;
+	}
+	public void setCilosses(Long cilosses) {
+		this.cilosses = cilosses;
+	}
+
+	public Long getCilosses() {
+		return cilosses;
+	}
 	@Override
 	public String toString() {
 		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -256,6 +378,17 @@ public class BaseBom extends BaseEntity {
 			.append("updateTime", getUpdateTime())
 			.append("remark", getRemark())
 			.append("currentVersion", getCurrentVersion())
+			.append("productCode", getProductCode())
+			.append("productDescZh", getProductDescZh())
+			.append("componentDescZh", getComponentDescZh())
+			.append("cumc", getCumc())
+			.append("component", getComponent())
+			.append("bomHierarchy", getBomHierarchy())
+			.append("projectNo", getProjectNo())
+			.append("standardDosage", getStandardDosage())
+			.append("lossRate", getLossRate())
+			.append("lossAmount", getLossAmount())
+			.append("cilosses", getCilosses())
 			.toString();
 	}
 }

op-modules/op-wms/src/main/resources/mapper/wms/BaseBomMapper.xml

@@ -35,28 +35,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select factory_code, production_version, bom_code, optional_bom, optional_bom_text, pvvd, pved, bom_calculate_number, bom_calculate_unit, bom_base_number, bom_base_unit, component_unit, component_pro_flag, msi, sanka, attr1, attr2, attr3, create_by, create_time, update_by, update_time, remark, current_version from base_bom
 	</sql>
 
-	<select id="selectBaseBomList" parameterType="BaseBom" resultMap="BaseBomResult">
+	<select id="selectBaseBomList" parameterType="BaseBom" resultType="com.op.wms.domain.BaseBom">
-		<include refid="selectBaseBomVo"/>
+		select
+		bb.factory_code as factoryCode,
+		bb.production_version as productionVersion,
+		bb.bom_code as bomCode,
+		bb.optional_bom as optionalBom,
+		bb.optional_bom_text as optionalBomText,
+		bb.pvvd as pvvd,
+		bb.pved as pved,
+		bb.bom_calculate_number as bomCalculateNumber,
+		bb.bom_calculate_unit as bomCalculateUnit,
+		bb.bom_base_number as bomBaseNumber,
+		bb.bom_base_unit as bomBaseUnit,
+		bb.component_unit as componentUnit,
+		bb.component_pro_flag as componentProFlag,
+		bb.msi as msi,
+		bb.sanka as sanka,
+		bb.attr1 as attr1,
+		bb.attr2 as attr2,
+		bb.attr3 as attr3,
+		bb.create_by as createBy,
+		bb.create_time as createTime,
+		bb.update_by as updateBy,
+		bb.update_time,
+		bb.remark as remark,
+		bb.current_version as currentVersion,
+		bbc.product_code as productCode,
+		b1.product_desc_zh as productDescZh,
+		bp.product_desc_zh as componentDescZh,
+		bbc.cumc as cumc,
+		bbc.component as component,
+		bbc.bom_hierarchy as bomHierarchy,
+		bbc.project_no as projectNo,
+		bbc.standard_dosage as standardDosage,
+		bbc.loss_rate as lossRate,
+		bbc.loss_amount as lossAmount,
+		bbc.cilosses as cilosses
+		from base_bom bb
+		left join base_bom_component bbc on bb.bom_code = bbc.bom_code
+		left join base_product b1 on right(b1.product_code,11) = bbc.product_code
+		left join base_product bp on right(bp.product_code,11) = bbc.component
 		<where>
 			<if test="factoryCode != null  and factoryCode != ''"> and factory_code = #{factoryCode}</if>
-			<if test="productionVersion != null  and productionVersion != ''"> and production_version = #{productionVersion}</if>
 			<if test="bomCode != null  and bomCode != ''"> and bom_code = #{bomCode}</if>
-			<if test="optionalBom != null  and optionalBom != ''"> and optional_bom = #{optionalBom}</if>
-			<if test="optionalBomText != null  and optionalBomText != ''"> and optional_bom_text = #{optionalBomText}</if>
-			<if test="pvvd != null "> and pvvd = #{pvvd}</if>
-			<if test="pved != null "> and pved = #{pved}</if>
-			<if test="bomCalculateNumber != null "> and bom_calculate_number = #{bomCalculateNumber}</if>
-			<if test="bomCalculateUnit != null  and bomCalculateUnit != ''"> and bom_calculate_unit = #{bomCalculateUnit}</if>
-			<if test="bomBaseNumber != null "> and bom_base_number = #{bomBaseNumber}</if>
-			<if test="bomBaseUnit != null  and bomBaseUnit != ''"> and bom_base_unit = #{bomBaseUnit}</if>
-			<if test="componentUnit != null  and componentUnit != ''"> and component_unit = #{componentUnit}</if>
-			<if test="componentProFlag != null  and componentProFlag != ''"> and component_pro_flag = #{componentProFlag}</if>
-			<if test="msi != null  and msi != ''"> and msi = #{msi}</if>
-			<if test="sanka != null  and sanka != ''"> and sanka = #{sanka}</if>
-			<if test="attr1 != null  and attr1 != ''"> and attr1 = #{attr1}</if>
-			<if test="attr2 != null  and attr2 != ''"> and attr2 = #{attr2}</if>
-			<if test="attr3 != null  and attr3 != ''"> and attr3 = #{attr3}</if>
-			<if test="currentVersion != null  and currentVersion != ''"> and current_version = #{currentVersion}</if>
 		</where>
 	</select>