diff --git a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml index 43f5ae7..d57884b 100644 --- a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml +++ b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml @@ -66,12 +66,15 @@ PB.MATERIAL_CODE, PB.MATERIAL_NAME, PB.MATERIAL_BARCODE, + PB.PRINT_BARTYPE, + OI.PRINT_NAME, NVL(MIN(PS.IS_PRINT), 1) IS_PRINT FROM BASE_ORDERINFO OI JOIN C##AUCMA_SCADA.PRINT_BARCODE PB ON PB.ORDER_CODE = OI.ORDER_CODE LEFT JOIN C##AUCMA_SCADA.PRINT_SUPPLEMENTBARCODE PS ON PS.MATERIAL_BARCODE = PB.MATERIAL_BARCODE WHERE PB.MATERIAL_BARCODE = #{boxCode} - GROUP BY PB.ORDER_CODE, PB.MATERIAL_CODE, PB.MATERIAL_NAME, PB.MATERIAL_BARCODE + GROUP BY PB.ORDER_CODE, PB.MATERIAL_CODE, PB.MATERIAL_NAME, PB.MATERIAL_BARCODE, PB.PRINT_BARTYPE, + OI.PRINT_NAME diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/RecordQualityMaterialServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/RecordQualityMaterialServiceImpl.java index a9bfa43..175a8dd 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/RecordQualityMaterialServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/RecordQualityMaterialServiceImpl.java @@ -65,7 +65,7 @@ public class RecordQualityMaterialServiceImpl implements IRecordQualityMaterialS throw new ServiceException("此SAP计划未维护!"); } RecordQualityMaterial material = new RecordQualityMaterial(); - material.setMaterialCode(baseOrderInfos.get(0).getMaterialCode()); + material.setOrderCode(baseOrderInfos.get(0).getOrderCode()); material.setInfoType(recordQualityMaterial.getInfoType()); List qualityMaterials = recordQualityMaterialMapper.selectRecordQualityMaterialList(material); if (qualityMaterials.size() > 0) {