物料属性和产品bom属性更新

whycxzp

2022-10-15 1036f6d81177acbaf740f8a9983431b6b6d23580

物料属性和产品bom属性更新

 src/main/java/com/whyc/controller/WorksheetMainController.java

@@ -49,6 +49,7 @@
        }
    }

    /**前端未传递过来物料文件所在路径,存在问题 TODO*/
    @PostMapping("materialSubmit")
    @ApiOperation(value="物料审批提交")
    public Response materialSubmit(@RequestBody WorksheetMain main){

 src/main/java/com/whyc/pojo/Material.java

@@ -19,8 +19,6 @@
    private Integer   id;
    @ApiModelProperty("母料编号")
    private String type;
    @ApiModelProperty("类别")
    private String     category;
    @ApiModelProperty("子件编码")
    private String     subCode;
    @ApiModelProperty("子件名称")
@@ -29,14 +27,8 @@
    private String     subModel;
    @ApiModelProperty("单位")
    private String     unit;
    @ApiModelProperty("生产商")
    private String     producer;
    @ApiModelProperty("封装类型/材质")
    private String     material;
    @ApiModelProperty("元件编号/料厚")
    private String     thickness;
    @ApiModelProperty("表面处理/物料详情")
    private String     surfaceDetail;

    @TableField(exist = false)
    @ApiModelProperty("备注")
    private String     notes;
    private String     pictureUrl;
@@ -81,14 +73,6 @@
        this.type = type;
    }

    public String getCategory() {
        return category;
    }

    public void setCategory(String category) {
        this.category = category;
    }

    public String getSubCode() {
        return subCode;
    }
@@ -119,38 +103,6 @@

    public void setUnit(String unit) {
        this.unit = unit;
    }

    public String getProducer() {
        return producer;
    }

    public void setProducer(String producer) {
        this.producer = producer;
    }

    public String getMaterial() {
        return material;
    }

    public void setMaterial(String material) {
        this.material = material;
    }

    public String getThickness() {
        return thickness;
    }

    public void setThickness(String thickness) {
        this.thickness = thickness;
    }

    public String getSurfaceDetail() {
        return surfaceDetail;
    }

    public void setSurfaceDetail(String surfaceDetail) {
        this.surfaceDetail = surfaceDetail;
    }

    public String getNotes() {

 src/main/java/com/whyc/pojo/ProductBom.java

@@ -33,7 +33,6 @@
    private String type;

    @ApiModelProperty("类别")
    @TableField(exist = false)
    private String     category;

    @ApiModelProperty("子件编码")
@@ -56,23 +55,18 @@
    private Integer   quantity;

    @ApiModelProperty("生产商")
    @TableField(exist = false)
    private String     producer;

    @ApiModelProperty("封装类型/材质")
    @TableField(exist = false)
    private String     material;

    @ApiModelProperty("元件编号/料厚")
    @TableField(exist = false)
    private String     thickness;

    @ApiModelProperty("表面处理/物料详情")
    @TableField(exist = false)
    private String     surfaceDetail;

    @ApiModelProperty("备注")
    @TableField(exist = false)
    private String     notes;

    @TableField(exist = false)

 src/main/java/com/whyc/pojo/ProductBomHistory.java

@@ -34,7 +34,6 @@
    private String type;

    @ApiModelProperty("类别")
    @TableField(exist = false)
    private String     category;

    @ApiModelProperty("子件编码")
@@ -57,23 +56,18 @@
    private Integer   quantity;

    @ApiModelProperty("生产商")
    @TableField(exist = false)
    private String     producer;

    @ApiModelProperty("封装类型/材质")
    @TableField(exist = false)
    private String     material;

    @ApiModelProperty("元件编号/料厚")
    @TableField(exist = false)
    private String     thickness;

    @ApiModelProperty("表面处理/物料详情")
    @TableField(exist = false)
    private String     surfaceDetail;

    @ApiModelProperty("备注")
    @TableField(exist = false)
    private String     notes;

    @TableField(exist = false)

 src/main/java/com/whyc/service/MaterialService.java

@@ -274,15 +274,15 @@
                        cellValue = cell.getStringCellValue();

                        switch (m){
                            case 2:{material.setCategory(cellValue);}break;
                            //case 2:{material.setCategory(cellValue);}break;
                            case 3:{material.setSubCode(cellValue);}break;
                            case 4:{material.setSubName(cellValue);}break;
                            case 5:{material.setSubModel(cellValue);}break;
                            case 6:{material.setMaterial(cellValue);}break;
                            case 7:{material.setThickness(cellValue);}break;
                            //case 6:{material.setMaterial(cellValue);}break;
                            //case 7:{material.setThickness(cellValue);}break;
                            //case 8:{material.setProducer(cellValue);}break;
                            case 9:{material.setSurfaceDetail(cellValue);}break;
                            case 10:{material.setNotes(cellValue);}break;
                            //case 9:{material.setSurfaceDetail(cellValue);}break;
                            //case 10:{material.setNotes(cellValue);}break;
                            case 11:{
                                //图片从1开始,0是yc logo
                                PictureData pictureData = allPictures.get(l - 7);

 src/main/java/com/whyc/service/ProductBomHistoryService.java

@@ -415,16 +415,16 @@
    private ProductBomHistory copyMaterialToBomHis(Material m) {
        ProductBomHistory bomHis=new ProductBomHistory();
        bomHis.setType(m.getType());
        bomHis.setCategory(m.getCategory());
        //bomHis.setCategory(m.getCategory());
        bomHis.setSubCode(m.getSubCode());
        bomHis.setSubName(m.getSubName());
        bomHis.setSubModel(m.getSubModel());
        bomHis.setUnit(m.getUnit());
        bomHis.setProducer(m.getProducer());
        bomHis.setMaterial(m.getMaterial());
        bomHis.setThickness(m.getThickness());
        bomHis.setSurfaceDetail(m.getSurfaceDetail());
        bomHis.setNotes(m.getNotes());
        //bomHis.setProducer(m.getProducer());
        //bomHis.setMaterial(m.getMaterial());
        //bomHis.setThickness(m.getThickness());
        //bomHis.setSurfaceDetail(m.getSurfaceDetail());
        //bomHis.setNotes(m.getNotes());
        bomHis.setPictureUrl(m.getPictureUrl());
        bomHis.setDwgUrl(m.getDwgUrl());
        bomHis.setFileUrl(m.getFileUrl());

 src/main/java/com/whyc/service/ProductBomService.java

@@ -559,17 +559,17 @@
    private ProductBom copyMaterialToBom(Material m) {
        ProductBom bom=new ProductBom();
        bom.setType(m.getType());
        bom.setCategory(m.getCategory());
        //bom.setCategory(m.getCategory());
        bom.setSubCode(m.getSubCode());
        bom.setSubName(m.getSubName());
        bom.setSubModel(m.getSubModel());
        bom.setUnit(m.getUnit());
        //bom.setQuantity(m.getQuantity());
        bom.setProducer(m.getProducer());
        bom.setMaterial(m.getMaterial());
        bom.setThickness(m.getThickness());
        bom.setSurfaceDetail(m.getSurfaceDetail());
        bom.setNotes(m.getNotes());
        //bom.setProducer(m.getProducer());
        //bom.setMaterial(m.getMaterial());
        //bom.setThickness(m.getThickness());
        //bom.setSurfaceDetail(m.getSurfaceDetail());
        //bom.setNotes(m.getNotes());
        bom.setPictureUrl(m.getPictureUrl());
        bom.setDwgUrl(m.getDwgUrl());
        bom.setFileUrl(m.getFileUrl());

 src/main/java/com/whyc/service/ProductService.java

@@ -464,6 +464,12 @@
                bomHistory.setProductId(his.getId());
                bomHistory.setMaterialId(bom.getMaterialId());
                bomHistory.setQuantity(bom.getQuantity());
                bomHistory.setCategory(bom.getCategory());
                bomHistory.setMaterial(bom.getMaterial());
                bomHistory.setNotes(bom.getNotes());
                bomHistory.setProducer(bom.getProducer());
                bomHistory.setSurfaceDetail(bom.getSurfaceDetail());
                bomHistory.setThickness(bom.getThickness());
                bomHistory.setSubSVersion(1);
                bomHistory.setSubEVersion(1);
                bomHistoryList.add(bomHistory);
@@ -587,21 +593,15 @@
            bomList.forEach(bom -> {
                if (!subCodeList.contains(bom.getSubCode()+"/"+bom.getSubModel())) {
                    Material material = new Material();
                    material.setCategory(bom.getCategory());
                    material.setCreateDate(date);
                    material.setDwgUrl(bom.getDwgUrl());
                    material.setFileUrl(bom.getFileUrl());
                    material.setMaterial(bom.getMaterial());
                    material.setNotes(bom.getNotes());
                    material.setPictureUrl(bom.getPictureUrl());
                    material.setProducer(bom.getProducer());
                    // TODO 是否要更新同物料编码的老物料状态为0?
                    material.setStatus(1);
                    material.setSubCode(bom.getSubCode());
                    material.setSubModel(bom.getSubModel());
                    material.setSubName(bom.getSubName());
                    material.setSurfaceDetail(bom.getSurfaceDetail());
                    material.setThickness(bom.getThickness());
                    material.setType(bom.getType());
                    material.setUnit(bom.getUnit());

@@ -654,6 +654,12 @@
                bom.setProductId(product.getId());
                bom.setMaterialId(bomMaterial.getId());
                bom.setQuantity(bomMaterial.getQuantity());
                bom.setCategory(bomMaterial.getCategory());
                bom.setMaterial(bomMaterial.getMaterial());
                bom.setNotes(bomMaterial.getNotes());
                bom.setProducer(bomMaterial.getProducer());
                bom.setSurfaceDetail(bomMaterial.getSurfaceDetail());
                bom.setThickness(bomMaterial.getThickness());
                bom.setSubVersion(1);
                bom.setCreateDate(date);

@@ -667,6 +673,12 @@
                bomHistory.setProductId(productHistory.getId());
                bomHistory.setMaterialId(bomMaterial.getId());
                bomHistory.setQuantity(bomMaterial.getQuantity());
                bomHistory.setCategory(bomMaterial.getCategory());
                bomHistory.setMaterial(bomMaterial.getMaterial());
                bomHistory.setNotes(bomMaterial.getNotes());
                bomHistory.setProducer(bomMaterial.getProducer());
                bomHistory.setSurfaceDetail(bomMaterial.getSurfaceDetail());
                bomHistory.setThickness(bomMaterial.getThickness());
                bomHistory.setSubSVersion(1);
                bomHistory.setSubEVersion(1);
                bomHistory.setCreateDate(date);

 src/main/java/com/whyc/service/WorksheetLinkService.java

@@ -358,22 +358,22 @@
                approvingList.forEach(approving->{
                    if(!existCodeList.contains(approving.getSubCode())){ //这个审批bom中的物料不在物料管理内
                        Material temp = new Material();
                        temp.setCategory(approving.getCategory());
                        //temp.setCategory(approving.getCategory());
                        temp.setCreateDate(new Date());
                        temp.setDwgUrl(approving.getDwgUrl());
                        temp.setFileUrl(approving.getFileUrl());
                        temp.setMaterial(approving.getMaterial());
                        //temp.setMaterial(approving.getMaterial());
                        temp.setNotes(approving.getNotes());
                        temp.setPictureUrl(approving.getPictureUrl());
                        temp.setProducer(approving.getProducer());
                        //temp.setProducer(approving.getProducer());
                        //TODO quantity
                        //temp.setQuantity(approving.getQuantity());
                        temp.setStatus(1);
                        temp.setSubCode(approving.getSubCode());
                        temp.setSubModel(approving.getSubModel());
                        temp.setSubName(approving.getSubName());
                        temp.setSurfaceDetail(approving.getSurfaceDetail());
                        temp.setThickness(approving.getThickness());
                        //temp.setSurfaceDetail(approving.getSurfaceDetail());
                        //temp.setThickness(approving.getThickness());
                        temp.setType(approving.getType());
                        temp.setUnit(approving.getUnit());
                        materialList.add(temp);
@@ -473,14 +473,14 @@
                    //将物料从审批表中转移到正式表
                    approvingList.forEach(approve -> {
                        Material material = new Material();
                        material.setCategory(approve.getCategory());
                        //material.setCategory(approve.getCategory());
                        material.setSubCode(approve.getSubCode());
                        material.setSubName(approve.getSubName());
                        material.setSubModel(approve.getSubModel());
                        material.setUnit(approve.getUnit());
                        //TODO quantity
                        //material.setQuantity(approve.getQuantity());
                        material.setProducer(approve.getProducer());
                        //material.setProducer(approve.getProducer());
                        material.setNotes(approve.getNotes());
                        material.setCreateDate(new Date());
                        material.setStatus(1);

 src/main/resources/mapper/MaterialMapper.xml

@@ -148,16 +148,16 @@
    <resultMap id="materialList" type="Material">
        <id property="id" column="id"></id>
        <result property="type" column="type"></result>
        <result property="category" column="category"></result>
        <!--<result property="category" column="category"></result>-->
        <result property="subCode" column="sub_code"></result>
        <result property="subName" column="sub_name"></result>
        <result property="subModel" column="sub_model"></result>
        <result property="unit" column="unit"></result>
        <result property="producer" column="producer"></result>
        <!--<result property="producer" column="producer"></result>
        <result property="material" column="material"></result>
        <result property="thickness" column="thickness"></result>
        <result property="surfaceDetail" column="surface_detail"></result>
        <result property="notes" column="notes"></result>
        <result property="notes" column="notes"></result>-->
        <result property="pictureUrl" column="picture_url"></result>
        <result property="fileUrl" column="file_url"></result>
        <result property="upUserId" column="up_user_id"></result>
@@ -249,16 +249,16 @@
    <resultMap id="materialInfo" type="Material">
        <id property="id" column="id"></id>
        <result property="type" column="type"></result>
        <result property="category" column="category"></result>
        <!--<result property="category" column="category"></result>-->
        <result property="subCode" column="sub_code"></result>
        <result property="subName" column="sub_name"></result>
        <result property="subModel" column="sub_model"></result>
        <result property="unit" column="unit"></result>
        <result property="producer" column="producer"></result>
        <!--<result property="producer" column="producer"></result>
        <result property="material" column="material"></result>
        <result property="thickness" column="thickness"></result>
        <result property="surfaceDetail" column="surface_detail"></result>
        <result property="notes" column="notes"></result>
        <result property="notes" column="notes"></result>-->
        <result property="pictureUrl" column="picture_url"></result>
        <result property="fileUrl" column="file_url"></result>
        <result property="upUserId" column="up_user_id"></result>

 src/main/resources/mapper/ProductBomMapper.xml

@@ -4,20 +4,20 @@

    <resultMap id="Map_ProductBom" type="ProductBom">
        <result property="quantity" column="b_quantity"/>
        <result property="category" column="category"/>
        <result property="producer" column="producer"/>
        <result property="material" column="material"/>
        <result property="thickness" column="thickness"/>
        <result property="surfaceDetail" column="surface_detail"/>
        <result property="notes" column="notes"/>
        <result property="materialId" column="id"/>
        <association property="materialObj" javaType="com.whyc.pojo.Material">
            <id property="id" column="id" />
            <result property="type" column="type" />
            <result property="category" column="category"/>
            <result property="subCode" column="sub_code"/>
            <result property="subName" column="sub_name"/>
            <result property="subModel" column="sub_model"/>
            <result property="unit" column="unit"/>
            <result property="producer" column="producer"/>
            <result property="material" column="material"/>
            <result property="thickness" column="thickness"/>
            <result property="surfaceDetail" column="surface_detail"/>
            <result property="notes" column="notes"/>
            <result property="pictureUrl" column="picture_url"/>
            <result property="fileUrl" column="file_url"/>
            <result property="dwgUrl" column="dwg_url"/>
@@ -190,7 +190,7 @@
    </select>
    <select id="getListByCodeAndModelList2" resultType="com.whyc.pojo.ProductBom">
        <foreach collection="list" item="item" separator=" union ">
            select id,#{item.quantity} as quantity from tb_material where sub_code = #{item.subCode} and sub_model = #{item.subModel}
            select id,#{item.quantity} as quantity,#{item.category} category,#{item.producer} producer,#{item.material} material,#{item.surfaceDetail} surfaceDetail,#{item.thickness} thickness,#{item.notes} notes from tb_material where sub_code = #{item.subCode} and sub_model = #{item.subModel}
        </foreach>
    </select>
    <select id="getEnabledBomListByParentCodeAndCustomCode" resultMap="Map_ProductBom">