Merge remote-tracking branch 'origin/master'

zhangherong

3 天以前 8caf5f04be94d8f52fb291dd045663079d681c19

 src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialServiceImpl.java

@@ -88,7 +88,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean saveOrUpdateMaterial(Map<String, MesProductionOrder> orderMap, List<OrderBomDTO> orderBomDTOList) {
        List<LswMaterial> addList = new ArrayList<>();
        Map<String, LswMaterial> addMap = new HashMap<>();
        for (Map.Entry<String, MesProductionOrder> entry : orderMap.entrySet()) {
            MesProductionOrder order = entry.getValue();
            LswMaterial material = queryByMaterialNumber(order.getMaterialNumber());
@@ -100,7 +100,7 @@
                material.setMaterialName(order.getMaterialName());
                material.setMaterialUnit(order.getProductionUnit());
                material.setDelFlag(CommonConstant.DEL_FLAG_0);
                addList.add(material);
                addMap.put(material.getMaterialNumber(), material);
            }
        }
        for (OrderBomDTO bomDTO : orderBomDTOList) {
@@ -113,10 +113,11 @@
                material.setMaterialName(bomDTO.getMAKTX());
                material.setMaterialUnit(bomDTO.getMEINS());
                material.setDelFlag(CommonConstant.DEL_FLAG_0);
                addList.add(material);
                addMap.put(material.getMaterialNumber(), material);
            }
        }
        if (CollectionUtil.isEmpty(addList)) {
        if (CollectionUtil.isNotEmpty(addMap)) {
            Collection<LswMaterial> addList = addMap.values();
            super.saveBatch(addList);
        }
        return true;