fix：入账库打印

src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java

@@ -24,13 +24,16 @@ import com.glxp.api.entity.system.*;
 import com.glxp.api.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.req.dev.DeviceInfoDetailQuery;
 import com.glxp.api.req.inout.*;
+import com.glxp.api.req.inv.FilterInvProductRequest;
 import com.glxp.api.res.inout.*;
+import com.glxp.api.res.inv.InvProductResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.*;
 import com.glxp.api.service.inout.impl.IoCodeService;
 import com.glxp.api.service.inout.impl.IoOrderInvoiceService;
+import com.glxp.api.service.inv.impl.InvProductService;
 import com.glxp.api.service.system.*;
 import com.glxp.api.service.thrsys.ThrProductsService;
 import com.glxp.api.util.BeanCopyUtils;
@@ -87,6 +90,8 @@ public class IoOrderDetailResultController extends BaseController {
     private IoOrderInvoiceService ioOrderInvoiceService;
     @Resource
     DeviceInfoMapper deviceInfoMapper;
+    @Resource
+    InvProductService invProductService;
 
     /**
      * 查询单据扫码明细列表
@@ -591,6 +596,74 @@ public class IoOrderDetailResultController extends BaseController {
         return ResultVOUtils.success();
     }
 
+
+
+    /**
+     * 入账库明细打印
+     *
+     * @param filterInvProductRequest
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/inout/resultDetail/printOrderInvProducts")
+    public BaseResponse printOrderInvProducts(@RequestBody FilterInvProductRequest filterInvProductRequest, HttpServletRequest request, HttpServletResponse response) throws JRException, IOException {
+        List<InvProductResponse> ioOrderDetailResultResponseList = new ArrayList<>();
+        SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterInvProductRequest.getTemplateId());
+        //打印单号标签
+        Map<String, Object> data = new HashMap<>(1);
+        List<Object> list = new ArrayList<>();
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String dateStr = sdf.format(new Date());
+
+        //按选入打印
+        if (filterInvProductRequest.getList() != null && filterInvProductRequest.getList().size() > 0) {
+            ioOrderDetailResultResponseList = filterInvProductRequest.getList();
+        } else {
+
+            //按查询打印
+//            FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
+//            filterOrderRequest.setVueType(filterInvProductRequest.getActionType());
+//            List<String> actions = orderService.setActions(filterOrderRequest);
+//            if (CollUtil.isEmpty(actions)) {
+//                return ResultVOUtils.success("");
+//            }
+//            filterInvProductRequest.setActions(actions);
+
+            if (StrUtil.isNotEmpty(filterInvProductRequest.getInvSpaceCode())) {
+                ioOrderDetailResultResponseList = invProductService.findGroupBySpace(filterInvProductRequest);
+            } else {
+                ioOrderDetailResultResponseList = invProductService.filterListProduct(filterInvProductRequest);
+            }
+        }
+        int i = 1;
+        for (InvProductResponse item : ioOrderDetailResultResponseList) {
+
+            //组装数据
+            Map<String, Object> ioOrderDetailResultData = new HashMap<>();
+            ioOrderDetailResultData.put("index", String.valueOf(i));
+            ioOrderDetailResultData.put("cpmctymc", item.getCpmctymc() == null ? "" : item.getCpmctymc());
+            ioOrderDetailResultData.put("ggxh",item.getGgxh() == null ? "" : item.getGgxh());
+            ioOrderDetailResultData.put("inCount",item.getInCount());
+            ioOrderDetailResultData.put("outCount",item.getOutCount());
+            ioOrderDetailResultData.put("reCount",item.getReCount());
+            ioOrderDetailResultData.put("measname",item.getMeasname() == null ? "" : item.getMeasname());
+            ioOrderDetailResultData.put("batchNo",item.getBatchNo() == null ? "" : item.getBatchNo());
+            ioOrderDetailResultData.put("price",item.getPrice() == null ? "" : item.getPrice());
+            ioOrderDetailResultData.put("supName",item.getSupName() == null ? "" : item.getSupName());
+            ioOrderDetailResultData.put("ylqxzcrbarmc",item.getYlqxzcrbarmc() == null ? "" : item.getYlqxzcrbarmc());
+
+            ioOrderDetailResultData.put("locInvName", filterInvProductRequest.getLocInvName() == null ? ' ' : filterInvProductRequest.getLocInvName());
+            list.add(ioOrderDetailResultData);
+            i++;
+        }
+
+        data.put("data", list);
+        String param = JSON.toJSONString(data);
+        JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
+        return ResultVOUtils.success();
+    }
+
     /**
      * 科室设备明细打印
      *

src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java

@@ -1,5 +1,7 @@
 package com.glxp.api.req.inv;
 
+import com.glxp.api.res.inout.IoOrderDetailDeptResultResponse;
+import com.glxp.api.res.inv.InvProductResponse;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
@@ -88,6 +90,7 @@ public class FilterInvProductRequest extends ListPageRequest {
      * 仓库编码
      */
     private String invCode;
+    private String locInvName;
 
     /**
      * 仓库数组
@@ -143,4 +146,8 @@ public class FilterInvProductRequest extends ListPageRequest {
     private String basicPrductRemak7;
     private String basicPrductRemak8;
 
+    private String templateId;
+
+    private List<InvProductResponse> list;
+
 }