Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java

@@ -60,8 +60,6 @@ public class InvInnerOrderPrintController {
     private InvInnerOrderPdfTempService innerOrderPdfTempService;
 
 
-
-
     @GetMapping("/udiwms/innerOrderPrint/filter")
     public BaseResponse filterList(FilterinnerOrderprintRequest filterinnerOrderprintRequest) {
         List<InvInnerOrderPrintEntity> list = invInnerOrderPrintService.filterOrderPrintList(filterinnerOrderprintRequest);
@@ -83,14 +81,16 @@ public class InvInnerOrderPrintController {
         return ResultVOUtils.success();
 
     }
+
     //-----------打印码
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/pdf/template/inspection/stock/qrcode/text/file")
     public BaseResponse inspectionStockQRCodeTextPDFFromTemplateFile(
             @RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception {
 
-
-        SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(6 + "");
+        if (inspectionPDFTemplateRequest.getModuleId() == null)
+            inspectionPDFTemplateRequest.setModuleId(3);
+        SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(inspectionPDFTemplateRequest.getModuleId() + "");
         if (systemPDFModuleEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
         SystemPDFTemplateEntity systemPDFTemplateEntity =
                 systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
@@ -104,8 +104,10 @@ public class InvInnerOrderPrintController {
     public BaseResponse stockQRCodeTextPDFFromTemplateFile(
             @RequestBody InnerOrderQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest,
             HttpServletRequest request, HttpServletResponse response) throws Exception {
-        SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(6 + "");
-        if (systemPDFModuleEntity == null) return null;
+        if (stockQRCodeTextPDFTemplateRequest.getModuleId() == null)
+            stockQRCodeTextPDFTemplateRequest.setModuleId(3);
+        SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(stockQRCodeTextPDFTemplateRequest.getModuleId() + "");
+        if (systemPDFModuleEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置，请检查");
         SystemPDFTemplateEntity systemPDFTemplateEntity =
                 systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
         if (systemPDFTemplateEntity == null) return null;

src/main/java/com/glxp/api/req/inout/InspectionPDFTemplateRequest.java

@@ -12,7 +12,7 @@ public class InspectionPDFTemplateRequest {
     private int module;
     private String orderId;
     private Long customerId;
-    private int moduleId;
+    private Integer moduleId;
 
 
 }