托书发票打印调整

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

@@ -574,7 +574,11 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 		 //查询主表数据
 		 SyShippingOrder entity = syShippingOrderService.getById(id);
-
+		 int box = entity.getBoxNumber().intValue();
+		 entity.setBoxNumber(new BigDecimal(box));
+		 entity.setTotalNetWeight(entity.getTotalNetWeight().setScale(2,BigDecimal.ROUND_HALF_UP));
+		 entity.setTotalGrossWeight(entity.getTotalGrossWeight().setScale(2,BigDecimal.ROUND_HALF_UP));
+		 entity.setTotalVolume(entity.getTotalVolume().setScale(3,BigDecimal.ROUND_HALF_UP));
 		 try {
 
 		 	if(oConvertUtils.isNotEmpty(entity.getLatestDateOfShipment())){
@@ -660,7 +664,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 			 //String[] nameList = new String[]{"报关信息-报关单","报关信息-申报要素-成衣","报关信息-发票","报关信息-合同","报关信息-申报要素-面料","报关信息-装箱单"};
 
 			 if(testName.equals("报关信息-报关单")){
-
+				 int size = 0;
 				 TemplateExportParams params = new TemplateExportParams("D:\\单证模板\\"+testName+".xlsx");
 
 				 //转map
@@ -671,12 +675,14 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 }
                  //集合转map
 				 for(SyShippingOrderItem li:list){
+					 size++;
 					 Field[] fieldsList = li.getClass().getDeclaredFields();
 					 Map<String, Object> mapList = new HashMap<String, Object>();
 					 for (Field field : fieldsList) {
 						 field.setAccessible(true);
 						 mapList.put(field.getName(), field.get(li));
 					 }
+					 mapList.put("size",size);
 					 listMap.add(mapList);
 				 }
 				 map.put("item", listMap);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/entity/SyShippingOrderItem.java

@@ -228,6 +228,15 @@ public class SyShippingOrderItem {
 	@TableField(exist = false)
 	private String curr;
 
+	//单位
+	@TableField(exist = false)
+	private String ctns;
+	@TableField(exist = false)
+	private String kgs;
+	@TableField(exist = false)
+	private String cbm;
+
+
 	//原产地
 	@TableField(exist = false)
 	private String dree;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -108,14 +108,14 @@ group by b.hs_code,b.declaration_name
 
 
     <select id="queryEelement" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
-select t.id, t.hsCode,sum(t.boxNumber) as boxNumber, t.declarationName,t.englishProductName,sum(t.number) as number,t.unitPrice,
-sum(t.totalPrice) as totalPrice,sum(t.grossWeight) as grossWeight,sum(t.netWeight) as netWeight,pcs,
-sum(t.volume) as volume,t.curr,t.dree,t.place,t.certificate,t.styleNumber,t.smailPo,t.orderNumber,
+select t.id, t.hsCode,sum(t.boxNumber) as boxNumber, t.declarationName,t.englishProductName,sum(t.number) as number,round(t.unitPrice,2) as unitPrice,
+round(sum(t.totalPrice),2) as totalPrice,round(sum(t.grossWeight),2) as grossWeight,round(sum(t.netWeight),2) as netWeight,t.pcs,
+round(sum(t.volume),3) as volume,t.curr,t.dree,t.place,t.certificate,t.styleNumber,t.smailPo,t.orderNumber,t.ctns,t.kgs,t.cbm,
 t.clientAbbreviation from (
 select GROUP_CONCAT(a.id) as id,b.hs_code as hsCode,b.declaration_name as declarationName,b.english_product_name as englishProductName,sum(a.number) as number,a.unit_price as unitPrice,
 sum(a.number*a.unit_price) as totalPrice,a.gross_weight as grossWeight,a.net_weight as netWeight,a.master_metering as pcs,a.volume as volume,
-'USD' as curr,'CHAIN' as dree,'宁波其他/宁波象山县' as place,'照章征税' as certificate,a.style_number as styleNumber,a.smail_po as smailPo,a.box_number as boxNumber,
-a.order_number as orderNumber,a.client_abbreviation as clientAbbreviation
+'USD' as curr,'CHIAN' as dree,'宁波其他/宁波象山县' as place,'照章征税' as certificate,a.style_number as styleNumber,a.smail_po as smailPo,a.box_number as boxNumber,
+a.order_number as orderNumber,a.client_abbreviation as clientAbbreviation,'CTNS' as ctns,'KGS' as kgs,'CBM' as cbm
  from sy_shipping_order_item a
 left join sy_declaration_elements b
 on a.elements_Id = b.id