| | |
| | | List<ProductBomHistory> baseBomHistoryList = getLatestBomListByProductId(preProductId); |
| | | List<ProductBomHistory> bomHistoryList = getLatestBomListByProductId(productId); |
| | | |
| | | //List<ProductBomHistory> diffList = new LinkedList<>(); |
| | | List<ProductBomHistory> diffList = new LinkedList<>(); |
| | | List<ProductBomHistory> addList = new LinkedList<>(); |
| | | List<ProductBomHistory> deleteList = new LinkedList<>(); |
| | | //通过物料编码定位,对比字段:物料型号/数量/材质/料厚/表面处理/生产商/备注,无法实现,物料没有历史记录 |
| | | //物料id,对比字段:数量 |
| | | baseBomHistoryList.forEach(baseBom->{ |
| | | bomHistoryList.forEach(bom->{ |
| | | if(bom.getSubCode().equals(baseBom.getSubCode())){ |
| | | ProductBomHistory history = new ProductBomHistory(); |
| | | if(!bom.getSubModel().equals(baseBom.getSubModel())){ |
| | | String diffSubModel = "原物料型号:"+baseBom.getSubModel()+"/新物料型号:"+bom.getSubModel(); |
| | | history.setSubModel(diffSubModel); |
| | | if(bom.getMaterialId().equals(baseBom.getMaterialId())){ |
| | | if(!bom.getQuantity().equals(baseBom.getQuantity())){ |
| | | ProductBomHistory history = new ProductBomHistory(); |
| | | String diffSubModel = "原数量:"+baseBom.getQuantity()+"/新数量:"+bom.getQuantity(); |
| | | history.setNotes(diffSubModel); |
| | | history.setMaterialObj(bom.getMaterialObj()); |
| | | diffList.add(history); |
| | | } |
| | | } |
| | | }); |
| | |
| | | deleteList.add(baseBom); |
| | | } |
| | | }); |
| | | return new Response().setII(1,addList,deleteList,"对比完成"); |
| | | return new Response().setIII(1,diffList,addList,deleteList,"对比完成"); |
| | | } |
| | | |
| | | /**关联查询到具体的bom内物料信息*/ |