托书以及成本分配调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/entity/SyCostAllocation.java

@@ -199,4 +199,8 @@ public class SyCostAllocation implements Serializable {
     @ApiModelProperty(value = "供应商事故单人民币金额")
     private java.math.BigDecimal supperAccidentcnyAmount;
 
+
+    //表头备注
+    private String memo;
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -142,6 +142,8 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 								   HttpServletRequest req) {
 
 		Result<IPage<SyShippingDetailsVo>> result = new Result<IPage<SyShippingDetailsVo>>();
+         //列表合计
+		 Double amountTo = 0.00;
 
 		QueryWrapper<SyShippingDetailsVo> queryWrapper = new QueryWrapper<>();
 		SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
@@ -223,15 +225,22 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		if(flourOrGarment.equals("0")){//面辅料
 			queryWrapper.eq("1",1);
 			 IPage<SyShippingDetailsVo> pageList = syShippingDetailsService.queryShippingDetailsGarment(page, queryWrapper);
+			  for(SyShippingDetailsVo str:pageList.getRecords()){
+				  amountTo = amountTo+str.getShipmentQuantity();
+			  }
+
 				result.setSuccess(true);
 				result.setResult(pageList);
-				result.setMessage("查询成功");
+				result.setMessage(amountTo.toString());
 		}else{//成衣
 			queryWrapper.eq("1",1);
 			IPage<SyShippingDetailsVo> pageList = syShippingDetailsService.queryShippingDetails(page, queryWrapper);
+			for(SyShippingDetailsVo str:pageList.getRecords()){
+				amountTo = amountTo+str.getShipmentQuantity();
+			}
 			result.setSuccess(true);
 			result.setResult(pageList);
-			result.setMessage("查询成功");
+			result.setMessage(amountTo.toString());
 		}
 
 

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

@@ -718,6 +718,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 
 			 if (testName.equals("-结汇发票")) {
+			 	StringBuffer sbu = new StringBuffer();
 
 				 List<Map<String, Object>> taitouList = new ArrayList<>();
 				 //获取对应模板
@@ -729,12 +730,16 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 for (DictModel te : test) {
 						 if (list.get(0).getPkOrg().equals(te.getText())) {
 							 String split[] = test.get(0).getValue().split("\\+");
-							 for (int i = 1; i < 5 ; i++) {
-								 Map<String, Object> maiTou = new HashMap<>();
-								 maiTou.put("name", split[i]);
-								 taitouList.add(maiTou);
-							 }
+//							 for (int i = 1; i < 5 ; i++) {
+//								 Map<String, Object> maiTou = new HashMap<>();
+//								 maiTou.put("name", split[i]);
+//
+//								 //taitouList.add(maiTou);
+//							 }
 							 entity.setClientAbbreviation(split[1]);
+							 entity.setCorporationAddress(split[2]);
+							 entity.setCorporationTel(split[3]);
+							 entity.setFax(split[4]);
 						 }
 					 }
 
@@ -756,7 +761,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 listMap.add(mapList);
 				 }
 				 map.put("item", listMap);
-				 map.put("list", taitouList);
+				 //map.put("list", taitouList);
 
 				 Workbook workbook = ExcelExportUtil.exportExcel(params, map);
 				 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");

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

@@ -341,4 +341,8 @@ public class SyShippingOrder {
 	//经营单位电话
 	@TableField(exist = false)
 	private String corporationTel;
+
+	//经营单位FAX
+	@TableField(exist = false)
+	private String fax;
 }

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

@@ -267,7 +267,7 @@ public class SyShippingOrderItem {
 	private String declarationUnit;
 	//米数
 	@TableField(exist = false)
-	private String meter;
+	private BigDecimal meter;
 
 	/**
 	 * 国外报关单字段