|  |  | @ -88,7 +88,7 @@ public class BasicOrderPrintController { | 
			
		
	
		
		
			
				
					
					|  |  |  |     public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest) { |  |  |  |     public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest) { | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         String name=getStatusName(filterOrderPrintRequest.getStatus()); |  |  |  |         String name = getStatusName(filterOrderPrintRequest.getStatus()); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity = systemPDFTemplateRelevanceCodeService.selectNameAndAction(name, filterOrderPrintRequest.getAction()); |  |  |  |         SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity = systemPDFTemplateRelevanceCodeService.selectNameAndAction(name, filterOrderPrintRequest.getAction()); | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (sysPdfTemplateRelevanceCodeEntity != null) { |  |  |  |         if (sysPdfTemplateRelevanceCodeEntity != null) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(sysPdfTemplateRelevanceCodeEntity.getTemplateId() + ""); |  |  |  |             SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(sysPdfTemplateRelevanceCodeEntity.getTemplateId() + ""); | 
			
		
	
	
		
		
			
				
					|  |  | @ -108,7 +108,7 @@ public class BasicOrderPrintController { | 
			
		
	
		
		
			
				
					
					|  |  |  |     @PostMapping("/udiwms/pdf/template/order/file") |  |  |  |     @PostMapping("/udiwms/pdf/template/order/file") | 
			
		
	
		
		
			
				
					
					|  |  |  |     public void printSupCertProduction(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { |  |  |  |     public void printSupCertProduction(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { | 
			
		
	
		
		
			
				
					
					|  |  |  |         SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderPrintRequest.getTemplateId()); |  |  |  |         SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderPrintRequest.getTemplateId()); | 
			
		
	
		
		
			
				
					
					|  |  |  |         String name=getStatusName(filterOrderPrintRequest.getStatus()); |  |  |  |         String name = getStatusName(filterOrderPrintRequest.getStatus()); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity = systemPDFTemplateRelevanceCodeService.selectNameAndAction(name, filterOrderPrintRequest.getAction()); |  |  |  |         SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity = systemPDFTemplateRelevanceCodeService.selectNameAndAction(name, filterOrderPrintRequest.getAction()); | 
			
		
	
		
		
			
				
					
					|  |  |  |         //打印单号标签
 |  |  |  |         //打印单号标签
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         Map<String, Object> data = new HashMap<>(1); |  |  |  |         Map<String, Object> data = new HashMap<>(1); | 
			
		
	
	
		
		
			
				
					|  |  | @ -210,19 +210,19 @@ public class BasicOrderPrintController { | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         data.put("data", list); |  |  |  |         data.put("data", list); | 
			
		
	
		
		
			
				
					
					|  |  |  |         String param = JSON.toJSONString(data); |  |  |  |         String param = JSON.toJSONString(data); | 
			
		
	
		
		
			
				
					
					|  |  |  |         JasperUtils.jasperReport(request, response, param, filePath + "/pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf"); |  |  |  |         JasperUtils.jasperReport(request, response, param, filePath + "/pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf"); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     public  String getStatusName(Integer type){ |  |  |  |     public String getStatusName(Integer type) { | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |         String name=""; |  |  |  |         String name = ""; | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |         if(type==3){ |  |  |  |         if (type == 3) { | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |             name="ScanCodeVerification"; |  |  |  |             name = "ScanCodeVerification"; | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |         }else  if(type==5){ |  |  |  |         } else if (type == 5) { | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |             name="ScanCodeCheck"; |  |  |  |             name = "ScanCodeCheck"; | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |         }else  if(type==10){ |  |  |  |         } else if (type == 10) { | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |             name="ScanCode"; |  |  |  |             name = "ScanCode"; | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |         }else  if(type==7){ |  |  |  |         } else if (type == 7) { | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |             name="ScanCodeAlready"; |  |  |  |             name = "ScanCodeAlready"; | 
			
				
				
			
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |         } | 
			
		
	
		
		
			
				
					
					|  |  |  |         return name; |  |  |  |         return name; | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
	
		
		
			
				
					|  |  | @ -235,7 +235,7 @@ public class BasicOrderPrintController { | 
			
		
	
		
		
			
				
					
					|  |  |  |             @RequestBody FilterOrderPrintRequest filterOrderPrintRequest) throws Exception { |  |  |  |             @RequestBody FilterOrderPrintRequest filterOrderPrintRequest) throws Exception { | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         //查询模板文件是否存在
 |  |  |  |         //查询模板文件是否存在
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(filterOrderPrintRequest.getLabelId()+""); |  |  |  |         SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(filterOrderPrintRequest.getLabelId() + ""); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         if (null == sysPdfTemplateRelevanceStatemenEntity) { |  |  |  |         if (null == sysPdfTemplateRelevanceStatemenEntity) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误"); |  |  |  |             return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误"); | 
			
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |         } | 
			
		
	
	
		
		
			
				
					|  |  | @ -280,7 +280,10 @@ public class BasicOrderPrintController { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 Map<String, Object> bizData = new HashMap<>(); |  |  |  |                 Map<String, Object> bizData = new HashMap<>(); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 bizData.put("index", i); |  |  |  |                 bizData.put("index", i); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 bizData.put("nameCode", obj.getNameCode() == null ? ' ' : obj.getNameCode()); |  |  |  |                 bizData.put("nameCode", obj.getNameCode() == null ? ' ' : obj.getNameCode()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 bizData.put("udiCode", udiProductEntity.getUuid() == null ? ' ' : udiProductEntity.getUuid()); |  |  |  |                 String udiCode = "#" + obj.getNameCode() + "#" + obj.getProduceDate() + "#" + obj.getExpireDate() + | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                         "#" + obj.getBatchNo() + "#" + obj.getSerialNo() + "#" + obj.getWarehouseCode() + "#" + obj.getDeptCode(); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 udiCode = udiCode.replaceAll("#null", "#"); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 bizData.put("udiCode", udiCode); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 bizData.put("cpmctymc", udiProductEntity.getCpmctymc() == null ? ' ' : udiProductEntity.getCpmctymc()); |  |  |  |                 bizData.put("cpmctymc", udiProductEntity.getCpmctymc() == null ? ' ' : udiProductEntity.getCpmctymc()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 bizData.put("ggxh", udiProductEntity.getGgxh() == null ? ' ' : udiProductEntity.getGgxh()); |  |  |  |                 bizData.put("ggxh", udiProductEntity.getGgxh() == null ? ' ' : udiProductEntity.getGgxh()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 bizData.put("batchNo", obj.getBatchNo() == null ? ' ' : obj.getBatchNo()); |  |  |  |                 bizData.put("batchNo", obj.getBatchNo() == null ? ' ' : obj.getBatchNo()); | 
			
		
	
	
		
		
			
				
					|  |  | @ -300,5 +303,4 @@ public class BasicOrderPrintController { | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | } |  |  |  | } | 
			
		
	
	
		
		
			
				
					|  |  | 
 |