From 7fea4c187ca1c594c81def94b1dd457bb874dbc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 11 Apr 2023 15:22:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A0=81=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E7=89=A9=E8=B5=84=E6=94=B9=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8F=B7=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/basic/UdiRelevanceController.java | 2 +- .../glxp/api/controller/inv/InvInnerOrderPrintController.java | 4 ++-- .../com/glxp/api/req/inout/InspectionPDFTemplateRequest.java | 1 + .../api/req/inv/InnerOrderQRCodeTextPDFTemplateRequest.java | 1 + .../mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index a10e444a..a257594c 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -341,7 +341,7 @@ public class UdiRelevanceController extends BaseController { udiProductEntity.setAllowNoBatch(udiRelevanceSaveRequest.getAllowNoBatch()); udiProductEntity.setAllowNoExpire(udiRelevanceSaveRequest.getAllowNoExpire()); udiProductEntity.setAllowNoProduct(udiRelevanceSaveRequest.getAllowNoProduct()); - udiProductEntity.setAllowNoSerial(udiRelevanceSaveRequest.getAllowNoBatch()); + udiProductEntity.setAllowNoSerial(udiRelevanceSaveRequest.getAllowNoSerial()); udiProductEntity.setZxxsbzbhsydysl(udiRelevanceEntity.getUseNum()); udiProductEntity.setBasicPrductRemak1(udiRelevanceSaveRequest.getBasicPrductRemak1()); udiProductEntity.setBasicPrductRemak2(udiRelevanceSaveRequest.getBasicPrductRemak2()); diff --git a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java index 6b2f8c2e..5069c077 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java @@ -89,7 +89,7 @@ public class InvInnerOrderPrintController { public BaseResponse inspectionStockQRCodeTextPDFFromTemplateFile( @RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception { - SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(inspectionPDFTemplateRequest.getId() + ""); + SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(inspectionPDFTemplateRequest.getLabelId() + ""); if (sysPdfTemplateRelevanceLabelEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置，请检查"); @@ -106,7 +106,7 @@ public class InvInnerOrderPrintController { @RequestBody InnerOrderQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { - SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(stockQRCodeTextPDFTemplateRequest.getId() + ""); + SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(stockQRCodeTextPDFTemplateRequest.getLabelId() + ""); if (sysPdfTemplateRelevanceLabelEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置，请检查"); diff --git a/src/main/java/com/glxp/api/req/inout/InspectionPDFTemplateRequest.java b/src/main/java/com/glxp/api/req/inout/InspectionPDFTemplateRequest.java index f5c777dc..30ed709f 100644 --- a/src/main/java/com/glxp/api/req/inout/InspectionPDFTemplateRequest.java +++ b/src/main/java/com/glxp/api/req/inout/InspectionPDFTemplateRequest.java @@ -14,6 +14,7 @@ public class InspectionPDFTemplateRequest { private Long customerId; private Integer moduleId; private String modelKey; + private Integer labelId; } diff --git a/src/main/java/com/glxp/api/req/inv/InnerOrderQRCodeTextPDFTemplateRequest.java b/src/main/java/com/glxp/api/req/inv/InnerOrderQRCodeTextPDFTemplateRequest.java index 535eed37..70a9756a 100644 --- a/src/main/java/com/glxp/api/req/inv/InnerOrderQRCodeTextPDFTemplateRequest.java +++ b/src/main/java/com/glxp/api/req/inv/InnerOrderQRCodeTextPDFTemplateRequest.java @@ -23,5 +23,6 @@ public class InnerOrderQRCodeTextPDFTemplateRequest { private String orderName; private Integer moduleId; + private Integer labelId; } diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml index e27b8086..ea612809 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml @@ -64,7 +64,7 @@