物料-产品审批

whycxzp

2022-08-25 802572535e54d8aadf548353eeeb382000226b44

物料-产品审批

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

@@ -71,4 +71,8 @@
        update.eq("parent_code",parentCode).eq("custom_code",customCode);
        mapper.delete(update);
    }

    public void insert(Product product) {
        mapper.insert(product);
    }
}

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

@@ -251,16 +251,26 @@
                ProductHistory productHistory = new ProductHistory();
                productHistory.setParentCode(parentCode);
                productHistory.setParentName(productApproving.getParentName());
                productApproving.setParentModel(parentModel);
                productHistory.setParentModel(parentModel);
                productHistory.setNotes(productApproving.getNotes());
                productHistory.setCustomCode(customCode);
                productHistory.setCreateTime(new Date());
                productHistory.setVersion(nextVersion);
                productHistory.setEnabled(1);

                Product productNew = new Product();
                productNew.setParentCode(parentCode);
                productNew.setParentName(productApproving.getParentName());
                productNew.setParentModel(parentModel);
                productNew.setNotes(productApproving.getNotes());
                productNew.setCustomCode(customCode);
                productNew.setCreateTime(new Date());
                productNew.setVersion(nextVersion);

                //实际生效的只有insert,因为状态设置为未启用已经在提交审批时变更了
                phService.insertAndUpdateEnabled(productHistory);
                int productId = productService.updateVersion(parentCode,customCode,nextVersion);

                productService.insert(productNew);

                List<ProductBomHistory> productBomHistoryList = new LinkedList<>();
                List<ProductBom> productBomList = new LinkedList<>();
@@ -268,7 +278,7 @@
                    ProductBomHistory bomHistory = new ProductBomHistory();
                    ProductBom bom = new ProductBom();

                    bom.setProductId(productId);
                    bom.setProductId(productNew.getId());
                    bom.setCategory(approving.getCategory());
                    bom.setCreateDate(new Date());
                    bom.setDwgUrl(approving.getDwgUrl());