Merge remote-tracking branch 'origin/master'

op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java

@@ -173,12 +173,32 @@ public class ProOrderWorkorder extends TreeEntity {
 
     // 物料名称（湿料计划模块使用）
     private String materialName;
+    // 供湿料计划使用
+    private String materialName1;
 
     // 计划日期（湿料计划模块使用）
     private Date planTime;
 
     // 料罐名称（湿料计划模块使用）
     private String bucketName;
+    // 供湿料计划使用
+    private String bucketName1;
+
+    public String getMaterialName1() {
+        return materialName1;
+    }
+
+    public void setMaterialName1(String materialName1) {
+        this.materialName1 = materialName1;
+    }
+
+    public String getBucketName1() {
+        return bucketName1;
+    }
+
+    public void setBucketName1(String bucketName1) {
+        this.bucketName1 = bucketName1;
+    }
 
     private String prepareId;
 
@@ -532,6 +552,8 @@ public class ProOrderWorkorder extends TreeEntity {
                 .append("routeName",getRouteName())
                 .append("prodLineName",getProdLineName())
                 .append("carNum",getCarNum())
+                .append("materialName1",getMaterialName1())
+                .append("bucketName",getBucketName1())
                 .toString();
     }
 }

op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductAttachedController.java

@@ -0,0 +1,97 @@
+package com.op.wms.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.op.common.log.annotation.Log;
+import com.op.common.log.enums.BusinessType;
+import com.op.common.security.annotation.RequiresPermissions;
+import com.op.wms.domain.BaseProductAttached;
+import com.op.wms.service.IBaseProductAttachedService;
+import com.op.common.core.web.controller.BaseController;
+import com.op.common.core.web.domain.AjaxResult;
+import com.op.common.core.utils.poi.ExcelUtil;
+import com.op.common.core.web.page.TableDataInfo;
+
+/**
+ * 物料附属信息Controller
+ * 
+ * @author Open Platform
+ * @date 2023-09-20
+ */
+@RestController
+@RequestMapping("/attached")
+public class BaseProductAttachedController extends BaseController {
+	@Autowired
+	private IBaseProductAttachedService baseProductAttachedService;
+
+	/**
+	 * 查询物料附属信息列表
+	 */
+	@RequiresPermissions("wms:attached:list")
+	@GetMapping("/list")
+	public TableDataInfo list(BaseProductAttached baseProductAttached) {
+		startPage();
+		List<BaseProductAttached> list = baseProductAttachedService.selectBaseProductAttachedList(baseProductAttached);
+		return getDataTable(list);
+	}
+
+	/**
+	 * 导出物料附属信息列表
+	 */
+	@RequiresPermissions("wms:attached:export")
+	@Log(title = "物料附属信息", businessType = BusinessType.EXPORT)
+	@PostMapping("/export")
+	public void export(HttpServletResponse response, BaseProductAttached baseProductAttached) {
+		List<BaseProductAttached> list = baseProductAttachedService.selectBaseProductAttachedList(baseProductAttached);
+		ExcelUtil<BaseProductAttached> util = new ExcelUtil<BaseProductAttached>(BaseProductAttached.class);
+		util.exportExcel(response, list, "物料附属信息数据");
+	}
+
+	/**
+	 * 获取物料附属信息详细信息
+	 */
+	@RequiresPermissions("wms:attached:query")
+	@GetMapping(value = "/{id}")
+	public AjaxResult getInfo(@PathVariable("id") String id) {
+		return success(baseProductAttachedService.selectBaseProductAttachedById(id));
+	}
+
+	/**
+	 * 新增物料附属信息
+	 */
+	@RequiresPermissions("wms:attached:add")
+	@Log(title = "物料附属信息", businessType = BusinessType.INSERT)
+	@PostMapping
+	public AjaxResult add(@RequestBody BaseProductAttached baseProductAttached) {
+		return toAjax(baseProductAttachedService.insertBaseProductAttached(baseProductAttached));
+	}
+
+	/**
+	 * 修改物料附属信息
+	 */
+	@RequiresPermissions("wms:attached:edit")
+	@Log(title = "物料附属信息", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@RequestBody BaseProductAttached baseProductAttached) {
+		return toAjax(baseProductAttachedService.updateBaseProductAttached(baseProductAttached));
+	}
+
+	/**
+	 * 删除物料附属信息
+	 */
+	@RequiresPermissions("wms:attached:remove")
+	@Log(title = "物料附属信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+	public AjaxResult remove(@PathVariable String[] ids) {
+		return toAjax(baseProductAttachedService.deleteBaseProductAttachedByIds(ids));
+	}
+}

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/java/com/op/wms/domain/BaseProductAttached.java

@@ -0,0 +1,239 @@
+package com.op.wms.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.op.common.core.annotation.Excel;
+import com.op.common.core.web.domain.BaseEntity;
+
+/**
+ * 物料附属信息对象 base_product_attached
+ * 
+ * @author Open Platform
+ * @date 2023-09-20
+ */
+public class BaseProductAttached extends BaseEntity {
+	private static final long serialVersionUID = 1L;
+
+	/** 主键ID */
+	private String id;
+
+	/** 产品编号 */
+	@Excel(name = "产品编号")
+	private String productCode;
+
+	/** 品类 */
+	@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 setId(String id) {
+		this.id = id;
+	}
+
+	public String getId() {
+		return id;
+	}
+	public void setProductCode(String productCode) {
+		this.productCode = productCode;
+	}
+
+	public String getProductCode() {
+		return productCode;
+	}
+	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;
+	}
+
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+			.append("id", getId())
+			.append("productCode", getProductCode())
+			.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/java/com/op/wms/mapper/BaseProductAttachedMapper.java

@@ -0,0 +1,61 @@
+package com.op.wms.mapper;
+
+import java.util.List;
+
+import com.op.wms.domain.BaseProductAttached;
+
+/**
+ * 物料附属信息Mapper接口
+ * 
+ * @author Open Platform
+ * @date 2023-09-20
+ */
+public interface BaseProductAttachedMapper {
+	/**
+	 * 查询物料附属信息
+	 * 
+	 * @param id 物料附属信息主键
+	 * @return 物料附属信息
+	 */
+	public BaseProductAttached selectBaseProductAttachedById(String id);
+
+	/**
+	 * 查询物料附属信息列表
+	 * 
+	 * @param baseProductAttached 物料附属信息
+	 * @return 物料附属信息集合
+	 */
+	public List<BaseProductAttached> selectBaseProductAttachedList(BaseProductAttached baseProductAttached);
+
+	/**
+	 * 新增物料附属信息
+	 * 
+	 * @param baseProductAttached 物料附属信息
+	 * @return 结果
+	 */
+	public int insertBaseProductAttached(BaseProductAttached baseProductAttached);
+
+	/**
+	 * 修改物料附属信息
+	 * 
+	 * @param baseProductAttached 物料附属信息
+	 * @return 结果
+	 */
+	public int updateBaseProductAttached(BaseProductAttached baseProductAttached);
+
+	/**
+	 * 删除物料附属信息
+	 * 
+	 * @param id 物料附属信息主键
+	 * @return 结果
+	 */
+	public int deleteBaseProductAttachedById(String id);
+
+	/**
+	 * 批量删除物料附属信息
+	 * 
+	 * @param ids 需要删除的数据主键集合
+	 * @return 结果
+	 */
+	public int deleteBaseProductAttachedByIds(String[] ids);
+}

op-modules/op-wms/src/main/java/com/op/wms/service/IBaseProductAttachedService.java

@@ -0,0 +1,60 @@
+package com.op.wms.service;
+
+import java.util.List;
+import com.op.wms.domain.BaseProductAttached;
+
+/**
+ * 物料附属信息Service接口
+ * 
+ * @author Open Platform
+ * @date 2023-09-20
+ */
+public interface IBaseProductAttachedService {
+	/**
+	 * 查询物料附属信息
+	 * 
+	 * @param id 物料附属信息主键
+	 * @return 物料附属信息
+	 */
+	public BaseProductAttached selectBaseProductAttachedById(String id);
+
+	/**
+	 * 查询物料附属信息列表
+	 * 
+	 * @param baseProductAttached 物料附属信息
+	 * @return 物料附属信息集合
+	 */
+	public List<BaseProductAttached> selectBaseProductAttachedList(BaseProductAttached baseProductAttached);
+
+	/**
+	 * 新增物料附属信息
+	 * 
+	 * @param baseProductAttached 物料附属信息
+	 * @return 结果
+	 */
+	public int insertBaseProductAttached(BaseProductAttached baseProductAttached);
+
+	/**
+	 * 修改物料附属信息
+	 * 
+	 * @param baseProductAttached 物料附属信息
+	 * @return 结果
+	 */
+	public int updateBaseProductAttached(BaseProductAttached baseProductAttached);
+
+	/**
+	 * 批量删除物料附属信息
+	 * 
+	 * @param ids 需要删除的物料附属信息主键集合
+	 * @return 结果
+	 */
+	public int deleteBaseProductAttachedByIds(String[] ids);
+
+	/**
+	 * 删除物料附属信息信息
+	 * 
+	 * @param id 物料附属信息主键
+	 * @return 结果
+	 */
+	public int deleteBaseProductAttachedById(String id);
+}

op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java

@@ -0,0 +1,86 @@
+package com.op.wms.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.op.wms.mapper.BaseProductAttachedMapper;
+import com.op.wms.domain.BaseProductAttached;
+import com.op.wms.service.IBaseProductAttachedService;
+
+/**
+ * 物料附属信息Service业务层处理
+ * 
+ * @author Open Platform
+ * @date 2023-09-20
+ */
+@Service
+public class BaseProductAttachedServiceImpl implements IBaseProductAttachedService {
+	@Autowired
+	private BaseProductAttachedMapper baseProductAttachedMapper;
+
+	/**
+	 * 查询物料附属信息
+	 * 
+	 * @param id 物料附属信息主键
+	 * @return 物料附属信息
+	 */
+	@Override
+	public BaseProductAttached selectBaseProductAttachedById(String id) {
+		return baseProductAttachedMapper.selectBaseProductAttachedById(id);
+	}
+
+	/**
+	 * 查询物料附属信息列表
+	 * 
+	 * @param baseProductAttached 物料附属信息
+	 * @return 物料附属信息
+	 */
+	@Override
+	public List<BaseProductAttached> selectBaseProductAttachedList(BaseProductAttached baseProductAttached) {
+		return baseProductAttachedMapper.selectBaseProductAttachedList(baseProductAttached);
+	}
+
+	/**
+	 * 新增物料附属信息
+	 * 
+	 * @param baseProductAttached 物料附属信息
+	 * @return 结果
+	 */
+	@Override
+	public int insertBaseProductAttached(BaseProductAttached baseProductAttached) {
+		return baseProductAttachedMapper.insertBaseProductAttached(baseProductAttached);
+	}
+
+	/**
+	 * 修改物料附属信息
+	 * 
+	 * @param baseProductAttached 物料附属信息
+	 * @return 结果
+	 */
+	@Override
+	public int updateBaseProductAttached(BaseProductAttached baseProductAttached) {
+		return baseProductAttachedMapper.updateBaseProductAttached(baseProductAttached);
+	}
+
+	/**
+	 * 批量删除物料附属信息
+	 * 
+	 * @param ids 需要删除的物料附属信息主键
+	 * @return 结果
+	 */
+	@Override
+	public int deleteBaseProductAttachedByIds(String[] ids) {
+		return baseProductAttachedMapper.deleteBaseProductAttachedByIds(ids);
+	}
+
+	/**
+	 * 删除物料附属信息信息
+	 * 
+	 * @param id 物料附属信息主键
+	 * @return 结果
+	 */
+	@Override
+	public int deleteBaseProductAttachedById(String id) {
+		return baseProductAttachedMapper.deleteBaseProductAttachedById(id);
+	}
+}

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

@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.op.wms.mapper.BaseProductAttachedMapper">
+	
+	<resultMap type="BaseProductAttached" id="BaseProductAttachedResult">
+		<result property="id"	column="id"	/>
+		<result property="productCode"	column="product_code"	/>
+		<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="selectBaseProductAttachedVo">
+		select id, product_code, category, pc, iei, man_standar, spray_way, blank_diameter, blank_no, spray_volume, liquid_no, endometrial_dosage, outer_film_dosage, support, support_no, pvc, support_plate, other from base_product_attached
+	</sql>
+
+	<select id="selectBaseProductAttachedList" parameterType="BaseProductAttached" resultMap="BaseProductAttachedResult">
+		<include refid="selectBaseProductAttachedVo"/>
+		<where>  
+			<if test="productCode != null  and productCode != ''"> and product_code = #{productCode}</if>
+			<if test="category != null  and category != ''"> and category = #{category}</if>
+			<if test="pc != null  and pc != ''"> and pc = #{pc}</if>
+			<if test="iei != null "> and iei = #{iei}</if>
+			<if test="manStandar != null "> and man_standar = #{manStandar}</if>
+			<if test="sprayWay != null  and sprayWay != ''"> and spray_way = #{sprayWay}</if>
+			<if test="blankDiameter != null "> and blank_diameter = #{blankDiameter}</if>
+			<if test="blankNo != null  and blankNo != ''"> and blank_no = #{blankNo}</if>
+			<if test="sprayVolume != null "> and spray_volume = #{sprayVolume}</if>
+			<if test="liquidNo != null  and liquidNo != ''"> and liquid_no = #{liquidNo}</if>
+			<if test="endometrialDosage != null "> and endometrial_dosage = #{endometrialDosage}</if>
+			<if test="outerFilmDosage != null "> and outer_film_dosage = #{outerFilmDosage}</if>
+			<if test="support != null "> and support = #{support}</if>
+			<if test="supportNo != null  and supportNo != ''"> and support_no = #{supportNo}</if>
+			<if test="pvc != null "> and pvc = #{pvc}</if>
+			<if test="supportPlate != null "> and support_plate = #{supportPlate}</if>
+			<if test="other != null  and other != ''"> and other = #{other}</if>
+		</where>
+	</select>
+	
+	<select id="selectBaseProductAttachedById" parameterType="String" resultMap="BaseProductAttachedResult">
+		select
+		bpa.id,
+		bpa.product_code,
+		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_attached bpa
+		where id = #{id}
+	</select>
+		
+	<insert id="insertBaseProductAttached" parameterType="BaseProductAttached">
+		insert into base_product_attached
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="id != null">id,</if>
+			<if test="productCode != null">product_code,</if>
+			<if test="category != null">category,</if>
+			<if test="pc != null">pc,</if>
+			<if test="iei != null">iei,</if>
+			<if test="manStandar != null">man_standar,</if>
+			<if test="sprayWay != null">spray_way,</if>
+			<if test="blankDiameter != null">blank_diameter,</if>
+			<if test="blankNo != null">blank_no,</if>
+			<if test="sprayVolume != null">spray_volume,</if>
+			<if test="liquidNo != null">liquid_no,</if>
+			<if test="endometrialDosage != null">endometrial_dosage,</if>
+			<if test="outerFilmDosage != null">outer_film_dosage,</if>
+			<if test="support != null">support,</if>
+			<if test="supportNo != null">support_no,</if>
+			<if test="pvc != null">pvc,</if>
+			<if test="supportPlate != null">support_plate,</if>
+			<if test="other != null">other,</if>
+		 </trim>
+		<trim prefix="values (" suffix=")" suffixOverrides=",">
+			<if test="id != null">#{id},</if>
+			<if test="productCode != null">#{productCode},</if>
+			<if test="category != null">#{category},</if>
+			<if test="pc != null">#{pc},</if>
+			<if test="iei != null">#{iei},</if>
+			<if test="manStandar != null">#{manStandar},</if>
+			<if test="sprayWay != null">#{sprayWay},</if>
+			<if test="blankDiameter != null">#{blankDiameter},</if>
+			<if test="blankNo != null">#{blankNo},</if>
+			<if test="sprayVolume != null">#{sprayVolume},</if>
+			<if test="liquidNo != null">#{liquidNo},</if>
+			<if test="endometrialDosage != null">#{endometrialDosage},</if>
+			<if test="outerFilmDosage != null">#{outerFilmDosage},</if>
+			<if test="support != null">#{support},</if>
+			<if test="supportNo != null">#{supportNo},</if>
+			<if test="pvc != null">#{pvc},</if>
+			<if test="supportPlate != null">#{supportPlate},</if>
+			<if test="other != null">#{other},</if>
+		 </trim>
+	</insert>
+
+	<update id="updateBaseProductAttached" parameterType="BaseProductAttached">
+		update base_product_attached
+		<trim prefix="SET" suffixOverrides=",">
+			<if test="productCode != null">product_code = #{productCode},</if>
+			<if test="category != null">category = #{category},</if>
+			<if test="pc != null">pc = #{pc},</if>
+			<if test="iei != null">iei = #{iei},</if>
+			<if test="manStandar != null">man_standar = #{manStandar},</if>
+			<if test="sprayWay != null">spray_way = #{sprayWay},</if>
+			<if test="blankDiameter != null">blank_diameter = #{blankDiameter},</if>
+			<if test="blankNo != null">blank_no = #{blankNo},</if>
+			<if test="sprayVolume != null">spray_volume = #{sprayVolume},</if>
+			<if test="liquidNo != null">liquid_no = #{liquidNo},</if>
+			<if test="endometrialDosage != null">endometrial_dosage = #{endometrialDosage},</if>
+			<if test="outerFilmDosage != null">outer_film_dosage = #{outerFilmDosage},</if>
+			<if test="support != null">support = #{support},</if>
+			<if test="supportNo != null">support_no = #{supportNo},</if>
+			<if test="pvc != null">pvc = #{pvc},</if>
+			<if test="supportPlate != null">support_plate = #{supportPlate},</if>
+			<if test="other != null">other = #{other},</if>
+		</trim>
+		where id = #{id}
+	</update>
+
+	<delete id="deleteBaseProductAttachedById" parameterType="String">
+		delete from base_product_attached where id = #{id}
+	</delete>
+
+	<delete id="deleteBaseProductAttachedByIds" parameterType="String">
+		delete from base_product_attached where id in 
+		<foreach item="id" collection="array" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</delete>
+</mapper>

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>