'lxw'

he wei

2022-09-02 d69b38ae695ff86d265e84fb44e1b21217a97d5f

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

@@ -71,7 +71,7 @@
        wrapper.orderByAsc("id");
        List list=mapper.selectList(wrapper);
        PageInfo pageInfo=new PageInfo(list);
        return new Response().setII(1,list.size()>0?true:false,pageInfo,"返回产品信息");
        return new Response().setII(1,list.size()>0,pageInfo,"返回产品信息");
    }

    public Product getVersion(String parentCode, String customCode) {
@@ -414,38 +414,6 @@
                e.printStackTrace();
            }
        });
        //更新product/product_bom/product_history/product_bom_history
        // -> product
        product.setCreateTime(new Date());
        product.setVersion(nextVersion);
        deleteAndInsert(product);
        // -> product_history
        ProductHistory productHistory = new ProductHistory();
        productHistory.setParentCode(product.getParentCode());
        productHistory.setParentName(product.getParentName());
        productHistory.setParentModel(product.getParentModel());
        productHistory.setNotes(product.getNotes());
        productHistory.setCustomCode(product.getCustomCode());
        productHistory.setCreateTime(product.getCreateTime());
        productHistory.setVersion(product.getVersion());
        productHistory.setEnabled(1);
        phService.insertAndUpdateEnabled(productHistory);
        // -> product_bom
        bomList.forEach(bom->{
            bom.setCreateDate(new Date());
        });
        pbService.insertBatch(bomList);
        // -> product_bom_history
        List<ProductBomHistory> bomHistoryList = new LinkedList<>();
        bomList.forEach(bom->{
            ProductBomHistory bomHistory = new ProductBomHistory();
            bomHistory.setProductId(productHistory.getId());
            bomHistory.setSubCode(bom.getSubCode());
            bomHistory.setCreateDate(new Date());

            bomHistoryList.add(bomHistory);
        });
        pbhService.insertBatch(bomHistoryList);

        //物料表中不存在的(依据:物料编码+物料型号),则添加到物料表中去(包含product这个物料)
        List<Material> materialExistList = mService.getListByCodeAndModelList2(bomList);
@@ -487,6 +455,51 @@
            materialList.add(material);
        }
        mService.insertBatch(materialList);

        //更新product/product_bom/product_history/product_bom_history
        //根据编码和型号确定物料id,存入数据库
        List<Material> bomMaterialList = mService.getListByCodeAndModelList2(bomList);
        // -> product
        product.setCreateTime(new Date());
        product.setVersion(nextVersion);
        deleteAndInsert(product);
        // -> product_history
        ProductHistory productHistory = new ProductHistory();
        productHistory.setParentCode(product.getParentCode());
        productHistory.setParentName(product.getParentName());
        productHistory.setParentModel(product.getParentModel());
        productHistory.setNotes(product.getNotes());
        productHistory.setCustomCode(product.getCustomCode());
        productHistory.setCreateTime(product.getCreateTime());
        productHistory.setVersion(product.getVersion());
        productHistory.setEnabled(1);
        phService.insertAndUpdateEnabled(productHistory);
        // -> product_bom
        List<ProductBom> productBomList = new LinkedList<>();
        bomMaterialList.forEach(bomMaterial->{
            ProductBom bom = new ProductBom();
            bom.setProductId(product.getId());
            bom.setMaterialId(bomMaterial.getId());
            bom.setSubVersion(1);
            bom.setCreateDate(new Date());

            productBomList.add(bom);
        });
        pbService.insertBatch(productBomList);
        // -> product_bom_history
        List<ProductBomHistory> bomHistoryList = new LinkedList<>();
        bomMaterialList.forEach(bomMaterial->{
            ProductBomHistory bomHistory = new ProductBomHistory();
            bomHistory.setProductId(productHistory.getId());
            bomHistory.setMaterialId(bomMaterial.getId());
            bomHistory.setSubSVersion(1);
            bomHistory.setSubEVersion(1);
            bomHistory.setCreateDate(new Date());

            bomHistoryList.add(bomHistory);
        });
        pbhService.insertBatch(bomHistoryList);

        return new Response().setII(1,"新增完成");
    }