From 6f1b49a17e3fc93e66e0b5daf51cc4f2297558f4 Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 9 Apr 2024 17:17:52 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E9=87=8D=E5=A4=8D=E8=A1=A5?= =?UTF-8?q?=E6=89=93=E6=9D=A1=E7=A0=81=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E3=80=81=E8=B4=A8=E6=A3=80=E6=9D=90=E6=96=99=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aucma-api/src/main/resources/mapper/PdaBindingMapper.xml | 5 ++++- .../service/impl/RecordQualityMaterialServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) 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) {