发运明细导出调整，托书预托书增加查询条件

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

@@ -121,6 +121,10 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getShippingOrderDate())){
 				queryWrapper.eq("t.shippingOrderDate",syLetterDeposit.getShippingOrderDate());
 			}
+			//账套
+			if(oConvertUtils.isNotEmpty(syLetterDeposit.getAcSetNo())){
+				queryWrapper.eq("t.acSetNo",syLetterDeposit.getAcSetNo());
+			}
 
 			queryWrapper.groupBy("t.sy_letter_deposit_id").orderByDesc("t.createTime");
 			IPage<SyLetterDeposit> pageList = syLetterDepositService.querySyLetterDeposit(page, queryWrapper);

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

@@ -266,4 +266,10 @@ public class SyLetterDeposit {
     //总数量
 	@TableField(exist = false)
 	private BigDecimal total;
+
+	/**账套*/
+	@Excel(name = "账套", width = 15)
+	@ApiModelProperty(value = "账套")
+	@TableField(exist = false)
+	private java.lang.String acSetNo;
 }

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

@@ -82,7 +82,7 @@ on a.id = b.sy_pre_assembled_packing_list_id
  select t.depositaryReceiptNo,t.id,t.createTime,t.shippingOrderDate,t.smallPo,t.clientAbbreviation,t.createBy,t.unitInOperation, sum(t.total) as total,sum(t.boxNumber) as boxNumber,t.tradeCountry,t.arriveInCountry,t.exportPort,t.destinationPort,t.theDocumentsState,
 sum(t.totalGrossWeight) as totalGrossWeight,sum(t.totalNetWeight) as totalNetWeight,sum(t.totalVolume) as totalVolume,t.distributionPoint,
 t.unitPrice,sum(t.totalPrice) as money from( select b.sy_letter_deposit_id as sy_letter_deposit_id,a.depositary_receipt_no as depositaryReceiptNo,b.distribution_point as distributionPoint,a.unit_in_operation as unitInOperation, sum(b.total) as total,b.box_number as boxNumber,a.trade_country as tradeCountry,a.arrive_in_country as arriveInCountry,a.export_port as exportPort,a.destination_port as destinationPort,a.the_documents_state as theDocumentsState,
-b.total_gross_weight as totalGrossWeight,b.total_net_weight as totalNetWeight,b.total_volume as totalVolume,
+b.total_gross_weight as totalGrossWeight,b.total_net_weight as totalNetWeight,b.total_volume as totalVolume,b.ac_set_no as acSetNo,
 a.shipping_order_date as shippingOrderDate,b.small_po as smallPo,b.create_by as createBy,b.client_abbreviation as clientAbbreviation,
 a.create_time as createTime,b.unit_price as unitPrice,sum(b.total_price) as totalPrice,a.id as id
          from sy_letter_deposit_item b

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

@@ -175,6 +175,11 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getCustomerAbbreviation())){
 			queryWrapper.like("t.customerAbbreviation",syShippingDetails.getCustomerAbbreviation());
 		}
+
+		//账套号
+		if(oConvertUtils.isNotEmpty(syShippingDetails.getAccount())){
+			queryWrapper.like("t.account",syShippingDetails.getAccount());
+		}
 		if(oConvertUtils.isNotEmpty(isElement)){
 			if(isElement.equals("0")){//没有维护
 				queryWrapper.isNull("t.elementsId");
@@ -493,10 +498,22 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			  queryWrapper.isNotNull("t.elementsId");
 		  }
 
+	  }
+	  //分销点
+	  if(oConvertUtils.isNotEmpty(syShippingDetails.getDistributionPoint())){
+		  queryWrapper.like("t.distributionPoint",syShippingDetails.getDistributionPoint());
+	  }
+	  //客户
+	  if(oConvertUtils.isNotEmpty(syShippingDetails.getCustomerAbbreviation())){
+		  queryWrapper.like("t.customerAbbreviation",syShippingDetails.getCustomerAbbreviation());
 	  }
 	  	if(oConvertUtils.isNotEmpty(syShippingDetails.getSubmitStatus())){
 			queryWrapper.eq("t.submitStatus",syShippingDetails.getSubmitStatus());
 		}
+	  //账套号
+	  if(oConvertUtils.isNotEmpty(syShippingDetails.getAccount())){
+		  queryWrapper.like("t.account",syShippingDetails.getAccount());
+	  }
 	  if(oConvertUtils.isNotEmpty(syShippingDetails.getId())){
 		  queryWrapper.like("t.id",syShippingDetails.getId());
 	  }
@@ -636,12 +653,30 @@ 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 =("成衣工厂*款号*小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"};
+
+				  int size = 8+sizeGroup.size()-1;
+				  String box = "";
+				  String gross = "";
+				  String net = "";
+
 				  Row row1 = sheet.createRow(0);
 				  Row row2 = sheet.createRow(1);
 
 				  for (int x=0;x<params.length;x++){
+
+					  if(params[x].equals("箱数")){
+						  box = params2[x];
+					  }
+					  if(params[x].equals("净重/箱")){
+						  net = params2[x];
+					  }
+					  if(params[x].equals("毛重/箱")){
+						  gross = params2[x];
+					  }
+
 					  Cell cell = row1.createCell(x);
 					  cell.setCellValue(params[x]);
 
@@ -651,13 +686,34 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 					  }else{
 						  sheet.setColumnWidth(x,3000);
 					  }
-					  if(x > 7 && x < params.length-13){
+					  if(x > 7 && x < params.length-18){
 						  Cell cell1 = row2.createCell(x);
 						  cell1.setCellValue(" ");
 					  }else{
 						  Cell cell1 = row2.createCell(x);
 						  cell1.setCellValue(params1[x]);
-
+					  }
+					  //计算箱数
+					  if(x == params.length-8){
+						  Cell cell1 = row2.createCell(x);
+						  cell1.setCellFormula("SUM(F2-E2+1)");
+						  //cell1.setCellValue("=");
+					  }
+					  //总件数=所有尺码值*箱数
+					  if(x == params.length-7){
+						  Cell cell1 = row2.createCell(x);
+						  cell1.setCellFormula("SUM("+params2[8]+"2:"+params2[size]+"2)*"+box+"2");
+						  //cell1.setCellValue("=");
+					  }
+					  //总毛重
+					  if(x == params.length-6){
+						  Cell cell1 = row2.createCell(x);
+						  cell1.setCellFormula("ROUND(SUM("+gross+"2*"+box+"2),2)");
+					  }
+					  //总净重
+					  if(x == params.length-5){
+						  Cell cell1 = row2.createCell(x);
+						  cell1.setCellFormula("ROUND(SUM("+net+"2*"+box+"2),2)");
 					  }
 
 				  }
@@ -743,8 +799,11 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 
 					  //判断是不是辅料数据，如果是不必维护一下内容
 					  String code = li.getInventoryCcode().substring(0,2);
-					  String codeTwo = li.getInventoryCcode().substring(0,4);
-					  if(!code.equals("04") && !code.equals("05")&& !code.equals("06")&& !code.equals("07")&& !codeTwo.equals("0299")&& !codeTwo.equals("0399")){
+					  if(li.getInventoryCcode().length() >= 4){
+						  code = li.getInventoryCcode().substring(0,4);
+					  }
+
+					  if(!code.equals("04") && !code.equals("05")&& !code.equals("06")&& !code.equals("07")&& !code.equals("0299")&& !code.equals("0399")){
 						  //判断物料成份。isTc、款号是否为空，为空不允许提交
 						  if(oConvertUtils.isEmpty(li.getItemNumber()) || oConvertUtils.isEmpty(li.getMaterialComposition()) || oConvertUtils.isEmpty(li.getIsTc())){
 							  result.setSuccess(false);
@@ -1292,6 +1351,18 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			 }
 
 		 }
+		 //分销点
+		 if(oConvertUtils.isNotEmpty(syShippingDetails.getDistributionPoint())){
+			 queryWrapper.like("t.distributionPoint",syShippingDetails.getDistributionPoint());
+		 }
+		 //客户
+		 if(oConvertUtils.isNotEmpty(syShippingDetails.getCustomerAbbreviation())){
+			 queryWrapper.like("t.customerAbbreviation",syShippingDetails.getCustomerAbbreviation());
+		 }
+		 //账套号
+		 if(oConvertUtils.isNotEmpty(syShippingDetails.getAccount())){
+			 queryWrapper.like("t.account",syShippingDetails.getAccount());
+		 }
 		 if(oConvertUtils.isNotEmpty(syShippingDetails.getSubmitStatus())){
 			 queryWrapper.eq("t.submitStatus",syShippingDetails.getSubmitStatus());
 		 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/SyPreAssembledPackingListVo.java

@@ -201,7 +201,7 @@ public class SyPreAssembledPackingListVo {
         return garmentFactory+"*"+itemNumber+"*"+smallPo+"*"+distributionPoint+"*"+""+
                 "*"+""+"*"+""+"*"+""+"*"+builder+color+"*"+plannedShippingQuantity+
                 "*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+
-                customerAbb+"*"+builder1+"*"+groupId+"*"+id+"*"+elenmentId;
+                customerAbb+"*"+codingRules+"*"+""+"*"+""+"*"+""+"*"+""+"*"+builder1+"*"+groupId+"*"+id+"*"+elenmentId;
     }
 
 

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

@@ -138,6 +138,10 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 			}
 
 		}
+
+		if(oConvertUtils.isNotEmpty(syShippingOrder.getPkOrg())){
+			queryWrapper.eq("b.pk_org",syShippingOrder.getPkOrg());
+		}
 		queryWrapper.eq("a.del_flag","0").eq("a.del_flag","0");
 		queryWrapper.orderByDesc("a.create_time");
 		queryWrapper.groupBy("a.shipping_order_number");