Merge remote-tracking branch 'origin/master'

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());

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, "未找到单据模板模块设置，请检查");
 

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;
 
 
 }

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;
 
 }

src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml

@@ -64,7 +64,7 @@
     <select id="selectByLabelId" parameterType="java.lang.String"
             resultType="com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity">
         select *
-        FROM sys_pdf_module_relevance_label
+        FROM sys_pdf_template_relevance_label
         WHERE id = #{id}
     </select>