Merge remote-tracking branch 'origin/master'

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

@@ -49,7 +49,7 @@ public class InvInnerOrderPrintController {
     private InvInnerOrderPrintService invInnerOrderPrintService;
 
     @Resource
-    SystemPDFModuleService  systemPDFModuleService;
+    SystemPDFModuleService systemPDFModuleService;
     @Resource
     SystemPDFTemplateService systemPDFTemplateService;
     @Value("${file_path}")
@@ -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);
@@ -73,24 +71,26 @@ public class InvInnerOrderPrintController {
     }
 
     @PostMapping("/udiwms/innerOrderPrint/addOrderPrint")
-    public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques){
+    public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques) {
 
-      if(invInnerOrderprintReques.getOrderIdFk()!=null){
+        if (invInnerOrderprintReques.getOrderIdFk() != null) {
-          invInnerOrderPrintService.addOrderList(invInnerOrderprintReques.getOrderIdFk());
+            invInnerOrderPrintService.addOrderList(invInnerOrderprintReques.getOrderIdFk());
-      }else{
+        } else {
-          return  ResultVOUtils.error(999,"参数错误！");
+            return ResultVOUtils.error(999, "参数错误！");
-      }
+        }
-       return  ResultVOUtils.success();
+        return ResultVOUtils.success();
 
     }
+
     //-----------打印码
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/pdf/template/inspection/stock/qrcode/text/file")
     public BaseResponse inspectionStockQRCodeTextPDFFromTemplateFile(
             @RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception {
 
-
+        if (inspectionPDFTemplateRequest.getModuleId() == null)
-        SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(6 + "");
+            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 (stockQRCodeTextPDFTemplateRequest.getModuleId() == null)
-        if (systemPDFModuleEntity == null) return 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;
@@ -178,7 +180,7 @@ public class InvInnerOrderPrintController {
 
         }
         for (innerOrderPrintRequest innerOrderPrintRequest : mStockPrintEntities) {
-            InvInnerOrderPrintEntity innerOrderPrintEntity=new InvInnerOrderPrintEntity();
+            InvInnerOrderPrintEntity innerOrderPrintEntity = new InvInnerOrderPrintEntity();
             innerOrderPrintEntity.setStatus(1);
             innerOrderPrintEntity.setId(innerOrderPrintRequest.getId());
             invInnerOrderPrintService.updateOrder(innerOrderPrintEntity);
@@ -198,9 +200,9 @@ public class InvInnerOrderPrintController {
 
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/pdf/template/stock/qrcode/text/maxfile")
-    public BaseResponse stockQRCodeMaxTextPDFFromTemplateFile(@RequestBody InnerOrderQRCodeTextPDFTemplateRequest innerOrderQRCodeTextPDFTemplateRequest){
+    public BaseResponse stockQRCodeMaxTextPDFFromTemplateFile(@RequestBody InnerOrderQRCodeTextPDFTemplateRequest innerOrderQRCodeTextPDFTemplateRequest) {
 
-        PageSimpleResponse pageSimpleResponse=invInnerOrderPrintService.print(innerOrderQRCodeTextPDFTemplateRequest);
+        PageSimpleResponse pageSimpleResponse = invInnerOrderPrintService.print(innerOrderQRCodeTextPDFTemplateRequest);
 
         return ResultVOUtils.success(pageSimpleResponse);
 

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