托书优化发票打印

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -827,6 +827,9 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 //			 }
 			 else if(testName.equals("报关信息-发票")){
 
+			 	List<Map<String,Object>> maiTouList = new ArrayList<Map<String,Object>>();
+
+                boolean boo = true;
 				 //重新赋值
 				 entity.setLatestDateOfShipment(sf.format(date));
 				 //出口口岸转大写拼音
@@ -852,40 +855,19 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 for(DictModel di:test){
 					 if(di.getText().equals(list.get(0).getClientAbbreviation())){
 					 	String split[] = di.getValue().split("\\+");
-					 	if(split.length != 12){
-							result.setSuccess(false);
-							result.setMessage("数据字典-唛头信息维护不正确！");
-							result.setResult(entity);
-							return result;
-						}
-						 entity.setPrimark(split[0]);
-						 entity.setKimballNo(split[1]);
-						 entity.setOrderNo(split[2]);
-						 entity.setCartonGrossWeight(split[3]);
-						 entity.setCartonDimensions(split[4]);
-						 entity.setCartonNumber(split[5]);
-						 entity.setCartonQuantity(split[6]);
-						 entity.setSubSectionDescription(split[7]);
-						 entity.setAssortedSizeCodes(split[8]);
-						 entity.setColour(split[9]);
-						 entity.setMadeInChina(split[10]);
-						 entity.setSizeBreakdown(split[11]);
-					 }else{
-						 entity.setPrimark(" ");
-						 entity.setKimballNo(" ");
-						 entity.setOrderNo(" ");
-						 entity.setCartonGrossWeight(" ");
-						 entity.setCartonDimensions(" ");
-						 entity.setCartonNumber(" ");
-						 entity.setCartonQuantity(" ");
-						 entity.setSubSectionDescription(" ");
-						 entity.setAssortedSizeCodes(" ");
-						 entity.setColour(" ");
-						 entity.setMadeInChina(" ");
-						 entity.setSizeBreakdown(" ");
+						 for (int i=0;i<split.length;i++) {
+							 Map<String,Object> maiTou = new HashMap<>();
+							 maiTou.put("name", split[i]);
+							 maiTouList.add(maiTou);
+						 }
+						 boo = false;
 					 }
 				 }
-
+				 if(boo == true){
+					 Map<String,Object> maiTou = new HashMap<>();
+					 maiTou.put("name", " ");
+					 maiTouList.add(maiTou);
+				 }
 
 				 TemplateExportParams params = new TemplateExportParams("D:\\单证模板\\"+testName+".xlsx");
 
@@ -907,6 +889,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 }
 
 				 map.put("item", listMap);
+				 map.put("list",maiTouList);
 
 				 Workbook workbook = ExcelExportUtil.exportExcel(params,map);
 				 ServletOutputStream outputStream = response.getOutputStream();
@@ -970,6 +953,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 
 			 }else if(testName.equals("报关信息-装箱单")){
+				 List<Map<String,Object>> maiTouList = new ArrayList<>();
+                 boolean boo = true;
 
 				 entity.setDateTime(sf.format(date));
 
@@ -982,40 +967,21 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 //查询数据字典唛头
 				 List<DictModel> test = sysDictService.queryDictItemsByCode("test0902002");
 				 for(DictModel di:test){
-					 if(di.getText().equals(list.get(0).getClientAbbreviation())){
+					 if(di.getText().equals(list.get(0).getClientAbbreviation())) {
 						 String split[] = di.getValue().split("\\+");
-						 if(split.length != 12){
-							 result.setSuccess(false);
-							 result.setMessage("数据字典-唛头信息维护不正确！");
-							 result.setResult(entity);
-							 return result;
+						 for (int i=0;i<split.length;i++) {
+							 Map<String,Object> maiTou = new HashMap<>();
+							 maiTou.put("name", split[i]);
+							 maiTouList.add(maiTou);
 						 }
-						 entity.setPrimark(split[0]);
-						 entity.setKimballNo(split[1]);
-						 entity.setOrderNo(split[2]);
-						 entity.setCartonGrossWeight(split[3]);
-						 entity.setCartonDimensions(split[4]);
-						 entity.setCartonNumber(split[5]);
-						 entity.setCartonQuantity(split[6]);
-						 entity.setSubSectionDescription(split[7]);
-						 entity.setAssortedSizeCodes(split[8]);
-						 entity.setColour(split[9]);
-						 entity.setMadeInChina(split[10]);
-						 entity.setSizeBreakdown(split[11]);
-					 }else{
-						 entity.setPrimark(" ");
-						 entity.setKimballNo(" ");
-						 entity.setOrderNo(" ");
-						 entity.setCartonGrossWeight(" ");
-						 entity.setCartonDimensions(" ");
-						 entity.setCartonNumber(" ");
-						 entity.setCartonQuantity(" ");
-						 entity.setSubSectionDescription(" ");
-						 entity.setAssortedSizeCodes(" ");
-						 entity.setColour(" ");
-						 entity.setMadeInChina(" ");
-						 entity.setSizeBreakdown(" ");
+						 boo = false;
 					 }
+
+				 }
+				 if(boo == true){
+					 Map<String,Object> maiTou = new HashMap<>();
+					 maiTou.put("name", " ");
+					 maiTouList.add(maiTou);
 				 }
 
 				 TemplateExportParams params = new TemplateExportParams("D:\\单证模板\\"+testName+".xlsx");
@@ -1038,6 +1004,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 }
 
 				 map.put("item", listMap);
+				 map.put("list", maiTouList);
 
 				 Workbook workbook = ExcelExportUtil.exportExcel(params,map);
 				 ServletOutputStream outputStream = response.getOutputStream();