物料图纸图片历史

whycxzp

2023-10-20 9ac1c4a81b6ad9bbfe733adbd81af63b2c2a126a

物料图纸图片历史

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

@@ -14,6 +14,7 @@
public class MaterialHistory {

    private Integer id;
    private Integer productId;
    private Integer materialId;
    private String pictureUrl;
    private String dwgUrl;
@@ -23,6 +24,14 @@
    @TableField(exist = false)
    private String upUserName;

    public Integer getProductId() {
        return productId;
    }

    public void setProductId(Integer productId) {
        this.productId = productId;
    }

    public Integer getUpUserId() {
        return upUserId;
    }

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

@@ -937,23 +937,6 @@
            }
            if(materialUpdateList.size()!=0) {
                mService.updateDwgUrlAndPicUrl(materialUpdateList);
                //更新物料图纸图片的同时,添加新的图纸图片信息到物料历史表中
                List<MaterialHistory> materialHistoryList = new LinkedList<>();
                for (Material material : materialUpdateList) {
                    MaterialHistory materialHistory = new MaterialHistory();
                    materialHistory.setPictureUrl(material.getPictureUrl());
                    materialHistory.setDwgUrl(material.getDwgUrl());
                    materialHistory.setUpUserId(ActionUtil.getUser().getId().intValue());
                    materialHistory.setCreateTime(date);
                    for (Material materialInDB : materialExistList) {
                        if((material.getSubCode() + "/" +material.getSubModel()).equals(materialInDB.getSubCode() + "/" + materialInDB.getSubModel())){
                            materialHistory.setMaterialId(materialInDB.getId());
                            break;
                        }
                    }
                    materialHistoryList.add(materialHistory);
                }
                materialHistoryService.addBatch(materialHistoryList);
            }
            //更新product_history/product_bom_history/product/product_bom,
            // product的主键沿用对应product_history的
@@ -1035,6 +1018,26 @@
            });
            pbhService.insertBatch(bomHistoryList);

            if(materialUpdateList.size()>0) {
                //更新物料图纸图片的同时,添加新的图纸图片信息到物料历史表中
                List<MaterialHistory> materialHistoryList = new LinkedList<>();
                for (Material material : materialUpdateList) {
                    MaterialHistory materialHistory = new MaterialHistory();
                    materialHistory.setPictureUrl(material.getPictureUrl());
                    materialHistory.setProductId(productHistory.getId());
                    materialHistory.setDwgUrl(material.getDwgUrl());
                    materialHistory.setUpUserId(ActionUtil.getUser().getId().intValue());
                    materialHistory.setCreateTime(date);
                    for (Material materialInDB : materialExistList) {
                        if ((material.getSubCode() + "/" + material.getSubModel()).equals(materialInDB.getSubCode() + "/" + materialInDB.getSubModel())) {
                            materialHistory.setMaterialId(materialInDB.getId());
                            break;
                        }
                    }
                    materialHistoryList.add(materialHistory);
                }
                materialHistoryService.addBatch(materialHistoryList);
            }
        }
        //添加新增日志到tb_product_lock_log表
        ProductLockLog lockLog = new ProductLockLog();