基础信息产品附属详情

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

@@ -169,6 +169,183 @@ public class BaseProduct extends BaseEntity {
 	@Excel(name = "物料类型")
 	private String mtart;
 
+	/** 品类 */
+	@Excel(name = "品类")
+	private String category;
+
+	/** 每PC单圈 */
+	@Excel(name = "每PC单圈")
+	private String pc;
+
+	/** 标准效率 */
+	@Excel(name = "标准效率")
+	private BigDecimal iei;
+
+	/** 标准用人 */
+	@Excel(name = "标准用人")
+	private BigDecimal manStandar;
+
+	/** 喷药方式 */
+	@Excel(name = "喷药方式")
+	private String sprayWay;
+
+	/** 白坯直径 */
+	@Excel(name = "白坯直径")
+	private BigDecimal blankDiameter;
+
+	/** 白坯物料号 */
+	@Excel(name = "白坯物料号")
+	private String blankNo;
+
+	/** 标准喷药量（KG/PC） */
+	@Excel(name = "标准喷药量", readConverterExp = "K=G/PC")
+	private BigDecimal sprayVolume;
+
+	/** 药液料号 */
+	@Excel(name = "药液料号")
+	private String liquidNo;
+
+	/** 标准内膜用量（KG/PC） */
+	@Excel(name = "标准内膜用量", readConverterExp = "K=G/PC")
+	private BigDecimal endometrialDosage;
+
+	/** 标准外模用量(KG/PC) */
+	@Excel(name = "标准外模用量(KG/PC)")
+	private BigDecimal outerFilmDosage;
+
+	/** 支架 */
+	@Excel(name = "支架")
+	private Long support;
+
+	/** 支架物料号 */
+	@Excel(name = "支架物料号")
+	private String supportNo;
+
+	/** 吸塑 */
+	@Excel(name = "吸塑")
+	private Long pvc;
+
+	/** 支架盘 */
+	@Excel(name = "支架盘")
+	private Long supportPlate;
+
+	/** 其它 */
+	@Excel(name = "其它")
+	private String other;
+
+	public void setCategory(String category) {
+		this.category = category;
+	}
+
+	public String getCategory() {
+		return category;
+	}
+	public void setPc(String pc) {
+		this.pc = pc;
+	}
+
+	public String getPc() {
+		return pc;
+	}
+	public void setIei(BigDecimal iei) {
+		this.iei = iei;
+	}
+
+	public BigDecimal getIei() {
+		return iei;
+	}
+	public void setManStandar(BigDecimal manStandar) {
+		this.manStandar = manStandar;
+	}
+
+	public BigDecimal getManStandar() {
+		return manStandar;
+	}
+	public void setSprayWay(String sprayWay) {
+		this.sprayWay = sprayWay;
+	}
+
+	public String getSprayWay() {
+		return sprayWay;
+	}
+	public void setBlankDiameter(BigDecimal blankDiameter) {
+		this.blankDiameter = blankDiameter;
+	}
+
+	public BigDecimal getBlankDiameter() {
+		return blankDiameter;
+	}
+	public void setBlankNo(String blankNo) {
+		this.blankNo = blankNo;
+	}
+
+	public String getBlankNo() {
+		return blankNo;
+	}
+	public void setSprayVolume(BigDecimal sprayVolume) {
+		this.sprayVolume = sprayVolume;
+	}
+
+	public BigDecimal getSprayVolume() {
+		return sprayVolume;
+	}
+	public void setLiquidNo(String liquidNo) {
+		this.liquidNo = liquidNo;
+	}
+
+	public String getLiquidNo() {
+		return liquidNo;
+	}
+	public void setEndometrialDosage(BigDecimal endometrialDosage) {
+		this.endometrialDosage = endometrialDosage;
+	}
+
+	public BigDecimal getEndometrialDosage() {
+		return endometrialDosage;
+	}
+	public void setOuterFilmDosage(BigDecimal outerFilmDosage) {
+		this.outerFilmDosage = outerFilmDosage;
+	}
+
+	public BigDecimal getOuterFilmDosage() {
+		return outerFilmDosage;
+	}
+	public void setSupport(Long support) {
+		this.support = support;
+	}
+
+	public Long getSupport() {
+		return support;
+	}
+	public void setSupportNo(String supportNo) {
+		this.supportNo = supportNo;
+	}
+
+	public String getSupportNo() {
+		return supportNo;
+	}
+	public void setPvc(Long pvc) {
+		this.pvc = pvc;
+	}
+
+	public Long getPvc() {
+		return pvc;
+	}
+	public void setSupportPlate(Long supportPlate) {
+		this.supportPlate = supportPlate;
+	}
+
+	public Long getSupportPlate() {
+		return supportPlate;
+	}
+	public void setOther(String other) {
+		this.other = other;
+	}
+
+	public String getOther() {
+		return other;
+	}
+
 	public void setProductId(String productId) {
 		this.productId = productId;
 	}
@@ -488,6 +665,22 @@ public class BaseProduct extends BaseEntity {
 			.append("appendFlag", getAppendFlag())
 			.append("appendPercent", getAppendPercent())
 			.append("mtart", getMtart())
+			.append("category", getCategory())
+			.append("pc", getPc())
+			.append("iei", getIei())
+			.append("manStandar", getManStandar())
+			.append("sprayWay", getSprayWay())
+			.append("blankDiameter", getBlankDiameter())
+			.append("blankNo", getBlankNo())
+			.append("sprayVolume", getSprayVolume())
+			.append("liquidNo", getLiquidNo())
+			.append("endometrialDosage", getEndometrialDosage())
+			.append("outerFilmDosage", getOuterFilmDosage())
+			.append("support", getSupport())
+			.append("supportNo", getSupportNo())
+			.append("pvc", getPvc())
+			.append("supportPlate", getSupportPlate())
+			.append("other", getOther())
 			.toString();
 	}
 }

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

@@ -48,6 +48,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="appendFlag"	column="append_flag"	/>
 		<result property="appendPercent"	column="append_percent"	/>
 		<result property="mtart"	column="mtart"	/>
+		<result property="category"	column="category"	/>
+		<result property="pc"	column="pc"	/>
+		<result property="iei"	column="iei"	/>
+		<result property="manStandar"	column="man_standar"	/>
+		<result property="sprayWay"	column="spray_way"	/>
+		<result property="blankDiameter"	column="blank_diameter"	/>
+		<result property="blankNo"	column="blank_no"	/>
+		<result property="sprayVolume"	column="spray_volume"	/>
+		<result property="liquidNo"	column="liquid_no"	/>
+		<result property="endometrialDosage"	column="endometrial_dosage"	/>
+		<result property="outerFilmDosage"	column="outer_film_dosage"	/>
+		<result property="support"	column="support"	/>
+		<result property="supportNo"	column="support_no"	/>
+		<result property="pvc"	column="pvc"	/>
+		<result property="supportPlate"	column="support_plate"	/>
+		<result property="other"	column="other"	/>
 	</resultMap>
 
 	<sql id="selectBaseProductVo">
@@ -99,7 +115,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectBaseProductByProductId" parameterType="String" resultMap="BaseProductResult">
-		<include refid="selectBaseProductVo"/>
+		select
+		bp.product_id,
+		bp.product_code,
+		bp.product_desc_zh,
+		bp.product_model,
+		bp.product_desc_en,
+		bp.rule_code,
+		bp.old_product_code,
+		bp.parts_product_code,
+		bp.sku_barcode,
+		bp.length,
+		bp.width,
+		bp.height,
+		bp.gross_weight,
+		bp.net_weight,
+		bp.tare_weight,
+		bp.volume,
+		bp.unit_price,
+		bp.product_group,
+		bp.product_group_name,
+		bp.user_defined1,
+		bp.user_defined2,
+		bp.user_defined3,
+		bp.user_defined4,
+		bp.user_defined5,
+		bp.user_defined6,
+		bp.create_by,
+		bp.create_time,
+		bp.update_by,
+		bp.update_time,
+		bp.factory_code,
+		bp.active_flag,
+		bp.sync_flag,
+		bp.primary_uom,
+		bp.del_flag,
+		bp.bstme,
+		bp.basic_order,
+		bp.conv_order,
+		bp.ausme,
+		bp.basic_issue,
+		bp.conv_issue,
+		bp.append_flag,
+		bp.append_percent,
+		bp.mtart,
+		bpa.category,
+		bpa.pc,
+		bpa.iei,
+		bpa.man_standar,
+		bpa.spray_way,
+		bpa.blank_diameter,
+		bpa.blank_no,
+		bpa.spray_volume,
+		bpa.liquid_no,
+		bpa.endometrial_dosage,
+		bpa.outer_film_dosage,
+		bpa.support,
+		bpa.support_no,
+		bpa.pvc,
+		bpa.support_plate,
+		bpa.other
+		from base_product bp
+		left join base_product_attached bpa on bpa.product_code = right(bp.product_code,11)
 		where product_id = #{productId}
 		and del_flag = '0'
 	</select>