| | |
| | | SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsService.getById(list.getMaterialsId()); |
| | | list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName()); |
| | | list.setIsConsume(slGoodsMaterials.getIsConsume()); |
| | | list.setErwmNum(slVolumeProductionRkService.getById(list.getScrkId()).getErwmNum()); |
| | | if (list.getScrkId() != null){ |
| | | SlVolumeProductionRk byId = slVolumeProductionRkService.getById(list.getScrkId()); |
| | | if (byId!=null){ |
| | | Integer erwmNum = byId.getErwmNum(); |
| | | list.setErwmNum(erwmNum); |
| | | } |
| | | } |
| | | } |
| | | // 将list2中的数据 如果字段erwmNum为空 优先展示在前面 |
| | | list2.sort((o1, o2) -> { |
| | |
| | | continue; |
| | | } |
| | | byId1.setErwmNum(updateQrCodeNumDTO.getErwmNum()); |
| | | byId1.setRkModel(getLetter(updateQrCodeNumDTO.getErwmNum())); |
| | | if (byId1.getErwmNum()>0){ |
| | | byId1.setRkModel(getLetter(updateQrCodeNumDTO.getErwmNum())); |
| | | } |
| | | slVolumeProductionRkService.updateById(byId1); |
| | | } |
| | | |