出运明细调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/controller/SyLetterDepositController.java

@@ -655,7 +655,6 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 			 //总体积
 			 entity.setTotalVolume(tatolVolume);
 
-
 			 //主表转map
 			 Field[] fields = entity.getClass().getDeclaredFields();
 			 for (Field field : fields) {
@@ -663,7 +662,33 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 				 map.put(field.getName(), field.get(entity));
 			 }
 
+			 //根据客户简称查询唛头
+			 List<Map<String, Object>> maiTouList = new ArrayList<>();
+			 boolean boo = true;
+			 if (oConvertUtils.isNotEmpty(list.get(0).getClientAbbreviation())) {
+				 //查询数据字典唛头
+				 List<DictModel> test = sysDictService.queryDictItemsByCode("test0902002");
+				 for (DictModel di : test) {
+					 if (di.getText().equals(list.get(0).getClientAbbreviation())) {
+						 String split[] = di.getValue().split("\\+");
+						 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);
+			 }
+
 			 map.put("item", listMap);
+			 map.put("list", maiTouList);
 
 			 TemplateExportParams params = new TemplateExportParams("D:\\单证模板\\预托书数据.xlsx");
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/entity/SyLetterDepositItem.java

@@ -248,7 +248,6 @@ public class SyLetterDepositItem {
 	private String kgs;
     @TableField(exist = false)
 	private String cbm;
-
-
-
+	@TableField(exist = false)
+    private String isTc;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/mapper/xml/SyLetterDepositMapper.xml

@@ -106,17 +106,22 @@ hod,salesman,sales_Department as salesDepartment,spur_or_sub_order as spurOrSubO
 
     <select id="printItem" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem">
 
-         select itemNumber,sum(boxNumber) as boxNumber,smallPo,sum(total) as total,sum(totalGrossWeight) as totalGrossWeight,sum(totalNetWeight) as totalNetWeight,sum(totalVolume) as totalVolume,containerCode,containerNumber,unitPrice,sum(totalPrice) as totalPrice,hod,salesman,salesDepartment,spurOrSubOrder,supplier,englishName,pcs,ctns,kgs,cbm from(
+         select itemNumber,sum(boxNumber) as boxNumber,smallPo,sum(total) as total,sum(totalGrossWeight) as totalGrossWeight,
+         sum(totalNetWeight) as totalNetWeight,sum(totalVolume) as totalVolume,containerCode,containerNumber,
+         unitPrice,sum(totalPrice) as totalPrice,hod,salesman,salesDepartment,spurOrSubOrder,supplier,englishName,pcs,ctns,kgs,cbm,
+         t.clientAbbreviation,t.hod,case when t.isTc = '0' then '否' else '是' end as isTc
+          from(
  select a.item_number as itemNumber,a.small_po as smallPo,round(sum(a.total),2) as total,round(a.box_number,0) as boxNumber,
 round(a.total_gross_weight,2) as totalGrossWeight,round(a.total_net_weight,2) as totalNetWeight,round(a.total_volume,3) as totalVolume,
 a.container_code as containerCode,a.container_number as containerNumber,a.unit_price as unitPrice,sum(a.total_price) as totalPrice,letter_groupid as letterGroupid,
-a.hod,a.salesman,a.sales_Department as salesDepartment,a.spur_or_sub_order as spurOrSubOrder,a.supplier,
-c.english_product_name as englishName,'PCS' as pcs, 'CTNS' as ctns,'KGS' as kgs,'CBM' as cbm
+DATE_FORMAT(a.hod,'%y-%m-%d') as hod,a.salesman,a.sales_Department as salesDepartment,a.spur_or_sub_order as spurOrSubOrder,a.supplier,a.client_abbreviation as clientAbbreviation,
+c.english_product_name as englishName,'PCS' as pcs, 'CTNS' as ctns,'KGS' as kgs,'CBM' as cbm,b.is_tc as isTc
          from sy_letter_deposit_item a
          left join sy_pre_assembled_packing_list b
          on a.sy_pre_assembled_packing_list_id = b.id
          left join sy_declaration_elements c
          on b.elements_id = c.id
-         where a.del_flag = 0 and a.sy_letter_deposit_id = #{id}  group by groupid  order by a.item_number,a.small_po desc) t GROUP BY t.letterGroupid
+         where a.del_flag = 0 and a.sy_letter_deposit_id = #{id}  group by groupid  order by a.item_number,a.small_po desc
+         ) t GROUP BY t.itemNumber,t.smallPo,t.unitPrice
     </select>
 </mapper>

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

@@ -699,7 +699,12 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				  }
 				  builder1.deleteCharAt(builder1.length()-1);
 				  //创建列名放在第一行
-				  String[] params =("成衣工厂*款号*小po*分销点*起始箱号*结束箱号*item NO./SKU NO./UPC NO./PACKS CODE*PREACKSKU*"+builder+"颜色*计划装箱数量*净重/箱*毛重/箱*外箱长度*外箱宽度*外箱高度*客户简称*配码规格*箱数*总件数*总净重*总毛重*总体积*发运明细子表ID*发运明细分组ID*发运明细主表ID*申报要素ID").split("\\*");
+				  String[] params = null;
+				  if(syShippingDetails.getAccount().equals("101")){
+					  params = ("成衣工厂*STYLE*PO NO.*分销点*CTN NO. FROM*CTN NO. TO*item NO./SKU NO./UPC NO./PACKS CODE*PREACKSKU*" + builder + "COLOUR*计划装箱数量*N.W/CTN*G.W/CTN*L(CM)*W(CM)*H(CM)*BUYER*配码规格*TTL CTNS*TTL PCS*TTL N.W*TTL G.W*TTL CBM*发运明细子表ID*发运明细分组ID*发运明细主表ID*申报要素ID").split("\\*");
+				  }else {
+					  params = ("成衣工厂*款号*小po*分销点*起始箱号*结束箱号*item NO./SKU NO./UPC NO./PACKS CODE*PREACKSKU*" + builder + "颜色*计划装箱数量*净重/箱*毛重/箱*外箱长度*外箱宽度*外箱高度*客户简称*配码规格*箱数*总件数*总净重*总毛重*总体积*发运明细子表ID*发运明细分组ID*发运明细主表ID*申报要素ID").split("\\*");
+				  }
 				  String[] params1 =syPreList.get(index).toString(builder.toString(),builder1.toString()).split("\\*");
 				  String[] params2= {"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","AA","AB","AC","AD","AE","AF","AG","AH","AI","AJ","AK","AL","AM","AN","AO","AP","AQ","AR","AS","AT","AU","AV","AW","AX","AY","AZ"};
 
@@ -717,25 +722,25 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 
 				  for (int x=0;x<params.length;x++){
 
-					  if(params[x].equals("箱数")){
+					  if(params[x].equals("箱数") || params[x].equals("TTL CTNS")){
 						  box = params2[x];
 					  }
-					  if(params[x].equals("净重/箱")){
+					  if(params[x].equals("净重/箱") || params[x].equals("N.W/CTN")){
 						  net = params2[x];
 					  }
-					  if(params[x].equals("毛重/箱")){
+					  if(params[x].equals("毛重/箱") || params[x].equals("G.W/CTN")){
 						  gross = params2[x];
 					  }
-					  if(params[x].equals("外箱长度")){
+					  if(params[x].equals("外箱长度") || params[x].equals("L(CM)")){
 						  length = params2[x];
 					  }
-					  if(params[x].equals("外箱宽度")){
+					  if(params[x].equals("外箱宽度") || params[x].equals("W(CM)")){
 						  wide = params2[x];
 					  }
-					  if(params[x].equals("外箱高度")){
+					  if(params[x].equals("外箱高度") || params[x].equals("H(CM)")){
 						  heigt = params2[x];
 					  }
-					  if(params[x].equals("箱数")){
+					  if(params[x].equals("箱数") || params[x].equals("TTL CTNS")){
 						  sunBox = params2[x];
 					  }