发运明细，托书调整

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

@@ -92,9 +92,9 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getClientAbbreviation())){
 				queryWrapper.eq("b.client_abbreviation",syLetterDeposit.getClientAbbreviation().trim());
 			}
-			//集装箱号
-			if(oConvertUtils.isNotEmpty(syLetterDeposit.getContainerNumber())){
-				queryWrapper.eq("b.container_number",syLetterDeposit.getContainerNumber().trim());
+			//制单人
+			if(oConvertUtils.isNotEmpty(syLetterDeposit.getCreateBy())){
+				queryWrapper.eq("b.create_by",syLetterDeposit.getCreateBy().trim());
 			}
 			//小PO
 			if(oConvertUtils.isNotEmpty(syLetterDeposit.getSmallPo())){

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

@@ -148,6 +148,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		if(oConvertUtils.isNotEmpty(supplier)){
 			queryWrapper.like("t.supplier",supplier);
 		}
+
 		Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(pageNo, pageSize);
 		if(flourOrGarment.equals("0")){//面辅料
 			 IPage<SyShippingDetailsVo> pageList = syShippingDetailsService.queryShippingDetailsGarment(page, queryWrapper);

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

@@ -365,6 +365,8 @@ public class SyShippingDetailsItem {
 	@Excel(name = "提交1，取消提交0", width = 15)
 	@ApiModelProperty(value = "提交1，取消提交0")
 	private Integer submitStatus;
+	//克重
+	private String weight;
 
 	public SyShippingDetailsItem(){}
 
@@ -428,6 +430,7 @@ public class SyShippingDetailsItem {
 		this.ompoIdItem = orderDataVo.getOmpoIdItem();
 		this.ymoney = orderDataVo.getYmoney();
 		this.submitStatus = 0;
+        this.weight = orderDataVo.getWeight();
 
 	}
 }

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

@@ -257,4 +257,7 @@ public class OrderDataVo {
     private Integer numberOfSets;
 
     private String groupid;
+
+    //克重
+    private String weight;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -143,7 +143,8 @@ ${ew.customSqlSegment}
            a.whole_order_total as wholeOrderTotal,a.sales_department as salesDepartment,a.salesman as salesman,a.currency_text as currencyText,a.third_party as thirdParty,
             a.deposit_ratio as depositRatio,a.deposit as deposit,a.collaborative_route as collaborativeRoute,a.term_of_payment as termOfPayment,a.end_customer as endCustomer,
              a.order_remarks as orderRemarks,a.price_remarks as priceRemarks,a.order_change_description as orderChangeDescription,b.supplier as supplier,b.i_tax_price as iTaxPrice,
-             case when b.ymoney is null then '0' else b.ymoney end as ymoney,b.OMPO_id as OMPOId,b.inventory_ccode as inventoryCcode
+             case when b.ymoney is null then '0' else b.ymoney end as ymoney,b.ompo_id as ompoId,b.inventory_ccode as inventoryCcode,
+             b.ompo_id_item as ompoIdItem,b.ompo_account as ompoAccount,b.ompo_code as purOrSubOrder,
              from sy_order_data a
               left join sy_order_data_item b
         on a.id = b.sy_order_data_id and b.del_flag = 0

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/service/impl/SyShippingDetailsServiceImpl.java

@@ -121,6 +121,7 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
                 if(ids.contains(li.getSyOrderDataItemId())){
                     entity.setGroupId(gourpid);
                 }
+
                 //设置物料成分
                 if(syShippingDetails.getReadyFabric().equals("成衣")){
                     entity.setMaterialComposition(li.getSpecificationAndModel());//取规格型号

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

@@ -75,14 +75,43 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 	@AutoLog(value = "托书主表实体类-分页列表查询")
 	@ApiOperation(value="托书主表实体类-分页列表查询", notes="托书主表实体类-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<SyShippingOrder>> queryPageList(SyShippingOrder syShippingOrder,
+	public Result<IPage<SyShippingOrder>> queryPageList(SyShippingOrder syShippingOrder,String OrderDate,String smailPo,String type,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 
 		Result<IPage<SyShippingOrder>> result = new Result<IPage<SyShippingOrder>>();
+		QueryWrapper<SyShippingOrder> queryWrapper = new QueryWrapper<>();
+		if(oConvertUtils.isNotEmpty(syShippingOrder.getOrderNumber())){
+			queryWrapper.like("b.order_number",syShippingOrder.getOrderNumber());
+		}
+		if(oConvertUtils.isNotEmpty(OrderDate)){
+			queryWrapper.eq("a.shipping_order_date",OrderDate);
+		}
+		if(oConvertUtils.isNotEmpty(syShippingOrder.getClientAbbreviation())){
+			queryWrapper.eq("a.client_abbreviation",syShippingOrder.getClientAbbreviation());
+		}
+		if(oConvertUtils.isNotEmpty(smailPo)){
+			queryWrapper.eq("b.smail_po",smailPo);
+		}
+		if(oConvertUtils.isNotEmpty(syShippingOrder.getShippingOrderNumber())){
+			queryWrapper.eq("a.shipping_order_number",syShippingOrder.getShippingOrderNumber());
+		}
+		if(oConvertUtils.isNotEmpty(syShippingOrder.getExportInvoiceNo())){
+			queryWrapper.eq("a.export_invoice_no",syShippingOrder.getExportInvoiceNo());
+		}
+		if(oConvertUtils.isNotEmpty(syShippingOrder.getExportInvoiceNo())){
+			queryWrapper.eq("a.export_invoice_no",syShippingOrder.getExportInvoiceNo());
+		}
+		if(oConvertUtils.isNotEmpty(type)){
+			if(type.equals("成衣")){
+				queryWrapper.eq("b.ready_fabric","成衣");
+			}else{
+				queryWrapper.ne("b.ready_fabric","成衣");
+			}
+
+		}
 
-		QueryWrapper<SyShippingOrder> queryWrapper = QueryGenerator.initQueryWrapper(syShippingOrder, req.getParameterMap());
 		Page<SyShippingOrder> page = new Page<SyShippingOrder>(pageNo, pageSize);
 		IPage<SyShippingOrder> pageList = syShippingOrderService.syShippingOrderPageList(page, queryWrapper);
 
@@ -279,7 +308,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 	 @AutoLog(value = "查询装箱单-成衣")
 	 @ApiOperation(value="查询装箱单-成衣", notes="查询装箱单-成衣")
 	 @GetMapping(value = "/queryTailoring")
-  public Result<IPage<SyPackingList>> queryTailoring(SyPackingList syPackingList,String tailoringOrFabric,
+  public Result<IPage<SyPackingList>> queryTailoring(SyPackingList syPackingList,String tailoringOrFabric,String name,String supplier,
+													 String type,
 													 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 													 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 													 HttpServletRequest request, HttpServletResponse response){
@@ -288,27 +318,74 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 	  IPage<SyPackingList> pageList = new Page<>();
 	  Page<SyPackingList> page = new Page<SyPackingList>(pageNo, pageSize);
-	  String ordernumber = syPackingList.getOrderNumber();
-	  syPackingList.setOrderNumber(null);
-
-	  QueryWrapper<SyPackingList> queryWrapper = QueryGenerator.initQueryWrapper(syPackingList,request.getParameterMap());
-
-
+	  QueryWrapper<SyPackingList> queryWrapper = new QueryWrapper<>();
 
-	  if(tailoringOrFabric.equals("0")){ //查成衣
-		  if(oConvertUtils.isNotEmpty(ordernumber)){
-			  queryWrapper.like("a.order_number",ordernumber);
+	  //查成衣
+	  if(tailoringOrFabric.equals("0")){
+	  	  //订单号
+		  if(oConvertUtils.isNotEmpty(syPackingList.getOrderNumber())){
+			  queryWrapper.like("a.order_number",syPackingList.getOrderNumber());
 		  }
-			  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.status",1).groupBy("b.group_id");
+		  //款号
+		  if(oConvertUtils.isNotEmpty(syPackingList.getItemNumber())){
+			  queryWrapper.eq("a.item_number",syPackingList.getItemNumber());
+		  }
+		  //报关品名
+		  if(oConvertUtils.isNotEmpty(name)){
+			  queryWrapper.eq("c.declaration_name",name);
+		  }
+		  //小PO
+		  if(oConvertUtils.isNotEmpty(syPackingList.getSmallPo())){
+			  queryWrapper.eq("b.small_po",syPackingList.getSmallPo());
+		  }
+          //分销点
+		  if(oConvertUtils.isNotEmpty(syPackingList.getDistributionPoint())){
+			  queryWrapper.eq("b.distribution_point",syPackingList.getDistributionPoint());
+		  }
+		  //预发货日期
+		  if(oConvertUtils.isNotEmpty(syPackingList.getPreDeliveryDate())){
+			  queryWrapper.eq("b.hot",syPackingList.getPreDeliveryDate());
+		  }
+		  //供应商
+		  if(oConvertUtils.isNotEmpty(supplier)){
+			  queryWrapper.eq("b.supplier_printing_plant",supplier);
+		  }
+		  //托书号
+		  if(oConvertUtils.isNotEmpty(syPackingList.getDepositaryReceiptNo())){
+			  queryWrapper.like("a.depositary_receipt_no",syPackingList.getDepositaryReceiptNo());
+		  }
+
+			  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.status",1).eq("a.is_Reference",0);
+		      queryWrapper.groupBy("b.group_id");
 			  queryWrapper.groupBy("a.document_No");
 		  pageList = syShippingOrderService.queryTailoring(page,queryWrapper);
 
-	  }else{//查面料
-		  if(oConvertUtils.isNotEmpty(ordernumber)){
-			  queryWrapper.like("b.order_number",ordernumber);
+
+		//查面料
+	  }else{
+	  	  //订单号
+		  if(oConvertUtils.isNotEmpty(syPackingList.getOrderNumber())){
+			  queryWrapper.like("b.order_number",syPackingList.getOrderNumber());
+		  }
+		  //外销发票号
+		  if(oConvertUtils.isNotEmpty(syPackingList.getExportInvoiceNo())){
+			  queryWrapper.eq("b.export_invoice_no",syPackingList.getExportInvoiceNo());
+		  }
+		  //集装箱号
+		  if(oConvertUtils.isNotEmpty(syPackingList.getContainerNumber())){
+			  queryWrapper.eq("a.container_number",syPackingList.getContainerNumber());
+		  }
+		  //面料还是辅料
+		  if(oConvertUtils.isNotEmpty(type)){
+		  	if(type.equals("面料")){
+				queryWrapper.isNull("b.u8_Pid");
+			}else{
+				queryWrapper.isNotNull("b.u8_Pid");
+			}
 		  }
 		  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.status",1);
-		  queryWrapper.groupBy("a.document_No");
+		  queryWrapper.eq("a.is_Reference",0).eq("c.del_flag",0);
+		  queryWrapper.groupBy("b.group_id");
 		  pageList = syShippingOrderService.queryFabric(page,queryWrapper);
 
 	  }

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

@@ -158,4 +158,9 @@ public class SyShippingOrderItem {
 	/**申报要素ID*/
 	@ApiModelProperty(value = "申报要素ID")
 	private String elementsId;
+
+	/**订单号*/
+	@Excel(name = "订单号", width = 15)
+	@ApiModelProperty(value = "订单号")
+	private java.lang.String orderNumber;
 }

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

@@ -21,74 +21,73 @@ public class SyPackingList {
     //子表ID
     private String itemId;
 
+    /**单据号*/
+    @ApiModelProperty(value = "单据号")
     private String documentNo;
-
-
-    /**款号*/
-    @ApiModelProperty(value = "款号")
+    /**制单人*/
+    @ApiModelProperty(value = "制单人")
+    private String createBy;
+    /**外销发票号*/
+    @ApiModelProperty(value = "外销发票号")
+    private String exportInvoiceNo;
+    /**集装箱号*/
+    @ApiModelProperty(value = "集装箱号")
+    private String containerNumber;
+    /**成衣工厂*/
+    @ApiModelProperty(value = "成衣工厂")
+    private String garmentFactory;
+    /**供应商*/
+    @ApiModelProperty(value = "供应商")
+    private String supplierPrintingPlant;
+    /**铅分号*/
+    @ApiModelProperty(value = "铅分号")
+    private String plumbumNo;
+    /**总件数（面料是匹数、辅料是箱数）*/
+    @ApiModelProperty(value = "总件数（面料是匹数、辅料是箱数）")
+    private BigDecimal total;
+    //款号
     private String itemNumber;
-    /**预发货日期*/
-    @ApiModelProperty(value = "预发货日期")
-    private String preDeliveryDate;
-    /**客户简称*/
-    @ApiModelProperty(value = "客户简称")
-    private String customerAbbreviation;
-    /**小PO*/
-    @ApiModelProperty(value = "小PO")
+    //小PO
     private String smallPo;
-    /**分销点*/
-    @ApiModelProperty(value = "分销点")
+    //箱数
+    private BigDecimal planQuantity;
+    //数量
+    private BigDecimal number;
+    //毛重
+    private BigDecimal grossWeight;
+    //净重
+    private BigDecimal netWeight;
+    //体积
+    private BigDecimal totalVolume;
+    //分销点
     private String distributionPoint;
-    /**备注*/
-    @ApiModelProperty(value = "备注")
-    private String memo;
-    /**客户*/
-    @ApiModelProperty(value = "客户")
-    private String customer;
-    /**存货名称*/
-    @ApiModelProperty(value = "存货名称")
-    private String inventoryName;
-    /**颜色*/
-    @ApiModelProperty(value = "颜色")
-    private String colour;
-    /**采购/委外订单号*/
-    @ApiModelProperty(value = "采购/委外订单号")
+    //集装箱代号
+    private String containerCode;
+    //单价
+    private BigDecimal price;
+    //金额
+    private BigDecimal totalPrice;
+    //预发货日期
+    private String preDeliveryDate;
+    //业务员
+    private String salesman;
+    //业务部门
+    private String salesDepartment;
+    //采购或者委外订单号
     private String purOrSubOrder;
-    /**订单类型*/
-    @ApiModelProperty(value = "订单类型")
-    private String orderType;
+    //英文名称
+    private String englishProductName;
 
-    /**成衣或者面料*/
-    @Excel(name = "成衣或者面料", width = 15)
-    @ApiModelProperty(value = "成衣或者面料")
-    private String readyFabric;
+    //订单号
+    private String orderNumber;
 
-    @ApiModelProperty(value = "预发货日期")
-    private String hod;
-    @ApiModelProperty(value = "工厂单价")
-    private BigDecimal factoryUnitPrice;
+    //区分成衣、面料
+    private String readyFabric;
 
-    @ApiModelProperty(value = "数量")
-    private BigDecimal planQuantity;
-    @ApiModelProperty(value = "箱数")
-    private BigDecimal actualPackingQty;
-    @ApiModelProperty(value = "集装箱代号")
-    private String containerCode;
-    @ApiModelProperty(value = "集装箱号")
-    private String containerNumber;
-    @ApiModelProperty(value = "预托书号")
+    //预托书号
     private String depositaryReceiptNo;
-    @ApiModelProperty(value = "毛重")
-    private BigDecimal totalGrossWeight;
-    @ApiModelProperty(value = "净重")
-    private BigDecimal totalNetWeight;
-    @ApiModelProperty(value = "体积")
-    private BigDecimal totalVolume;
-    @ApiModelProperty(value = "订单号")
-    private String orderNumber;
-    @ApiModelProperty(value = "业务员")
-    private String salesman;
-    @ApiModelProperty(value = "总价")
-    private BigDecimal totalPrice;
+
+    //客户简称
+    private String customerAbbreviation;
 
 }

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

@@ -3,32 +3,36 @@
 <mapper namespace="org.jeecg.modules.documents.syShippingOrder.mapper.SyShippingOrderMapper">
 
     <select id="syShippingOrderPageList" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder">
-
-  select id,shipping_order_number as shippingOrderNumber,order_number as orderNumber,export_invoice_no as exportInvoiceNo,
-  distribution_point as distributionPoint,unit_in_operation as unitInOperation,box_number as boxNumber,total_gross_weight as totalGrossWeight,
-  total_volume as totalVolume,
-  money,the_actual_shipping_date as theActualShippingDate,exchange_earnings_text as exchangeEarningsText,
-  consignee,bill_of_lading_or_carriage_receipt as billOfLadingOrCarriageReceipt,
-  addressee,trade_country as tradeCountry,arrive_in_country as arriveInCountry,export_port as exportPort,
-  notifier,nottfy,destination_port as destinationPort,latest_date_of_shipment as latestDateOfShipment,the_documents_state as theDocumentsState
-  from sy_shipping_order where del_flag = 0
+  select a.id,a.shipping_order_number as shippingOrderNumber,b.order_number as orderNumber,a.export_invoice_no as exportInvoiceNo,
+  a.distribution_point as distributionPoint,a.unit_in_operation as unitInOperation,a.box_number as boxNumber,a.total_gross_weight as totalGrossWeight,
+  a.total_volume as totalVolume,
+  a.money,a.the_actual_shipping_date as theActualShippingDate,a.exchange_earnings_text as exchangeEarningsText,
+  a.consignee,a.bill_of_lading_or_carriage_receipt as billOfLadingOrCarriageReceipt,
+  a.addressee,a.trade_country as tradeCountry,a.arrive_in_country as arriveInCountry,a.export_port as exportPort,
+  a.notifier,a.nottfy,a.destination_port as destinationPort,a.latest_date_of_shipment as latestDateOfShipment,a.the_documents_state as theDocumentsState
+  from sy_shipping_order a
+  left join sy_shipping_order_item b
+	on a.id = b.sy_shipping_order_item_id
+  where a.del_flag = 0 and b.del_flag = 0
 
     </select>
 
 
 <!--    查询装箱单-成衣-->
   <select id="queryTailoring" resultType="org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList">
-
-    select a.id as id ,GROUP_CONCAT(b.id) as itemId, a.document_No as documentNo,a.depositary_receipt_no as depositaryReceiptNo,b.elements_id as elementsId,
-     a.item_number as itemNumber,b.inventory_name as inventoryName,b.distribution_point as distributionPoint,a.customer_abbreviation as customerAbbreviation,
-     b.item_code as itemCode,b.starting_box_number as startingBoxNumber,b.end_case_number as endCaseNumber,b.hod as preDeliveryDate,b.small_Po as smallPo,
-     b.colour as colour,b.pieces_box as piecesBox,b.box_number as boxNumber,b.total as total,b.outer_box_length as outerBoxLength,a.customer as customer,a.order_number as orderNumber,
-     b.outer_box_width as outerBoxWidth,b.outer_box_height as outerBoxHeight,sum(b.total_volume) as totalVolume,sum(b.total_net_weight) as totalNetWeight,b.spur_Or_Sub_Order as purOrSubOrder,
-     sum(b.total_gross_weight) as totalGrossWeight,'成衣' as readyFabric,a.memo as memo,b.salesman as salesman,b.factory_Unit_Price as factoryUnitPrice,sum(b.total_price) as totalPrice,
-     sum(b.plan_Quantity) as planQuantity,sum(b.actual_Packing_Qty) as actualPackingQty,a.container_code as containerCode,a.container_number as containerNumber
-       from sy_packing_list_tailoring a
+select a.id as id ,GROUP_CONCAT(b.id) as itemId,a.document_No as documentNo,a.order_Number as orderNumber,
+a.item_number as itemNumber,a.customer_abbreviation as customerAbbreviation,b.hod as preDeliveryDate,
+b.small_po as smallPo,b.distribution_point as distributionPoint,b.spur_Or_Sub_Order as purOrSubOrder,
+b.plan_Quantity as number,b.box_number as planQuantity,sum(b.gross_weight) as grossWeight,sum(b.net_weight) as netWeight,
+b.total_volume as totalVolume,a.container_code as containerCode,a.container_number as containerNumber,
+a.depositary_receipt_no as depositaryReceiptNo,a.garment_factory as garmentFactory,b.unit_price as price,
+b.total_price as totalPrice,a.create_by as createBy,b.salesman as salesman,b.sales_Department as salesDepartment,
+c.english_product_name as englishProductName,'成衣' as readyFabric
+   from sy_packing_list_tailoring a
     left join sy_packing_list_tailoring_item b
     on a.id = b.sy_packing_list_tailoring_id
+			left join sy_declaration_elements c
+		on a.elements_Id = c.id
    ${ew.customSqlSegment}
 
   </select>
@@ -36,17 +40,19 @@
     <!--    查询装箱单-面料-->
     <select id="queryFabric" resultType="org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList">
 
-    select a.id as id ,GROUP_CONCAT(b.id) as itemId, a.document_No as documentNo,b.order_number as orderNumber,
-    b.item_Number as itemNumber,a.customer_Abbreviation as customerAbbreviation,a.customer,b.small_Po as smallPo,b.distribution_Point as distributionPoint,
-    b.salesman as salesman,b.pur_Or_Sub_Order as purOrSubOrder,b.factory_Unit_Price as factoryUnitPrice,'0' as totalVolume,'0' as actualPackingQty,
-    a.depositary_receipt_no as depositaryReceiptNo,b.order_Type as orderType,sum(b.gross_weight) as totalGrossWeight,sum(b.total_Price) as totalPrice,
-     b.inventory_name as inventoryName,sum(b.inventory_quantity) as planQuantity,sum(b.net_weight) as totalNetWeight,a.container_Code as containerCode,
-     b.inventory_Code as itemCode,a.memo as memo,a.container_number as containerNumber,
-     b.colour as colour,b.elements_id as elementsId,
-     '面料' as readyFabric
-       from sy_packing_list_fabric a
+  select a.id as id ,GROUP_CONCAT(b.id) as itemId,a.document_No as documentNo,a.create_by as createBy,
+  a.export_invoice_no as exportInvoiceNo,a.container_number as containerNumber,a.garment_Factory as garmentFactory,
+  b.supplier_printing_plant as supplierPrintingPlant,a.plumbum_No as plumbumNo,
+  case when b.u8_Pid is null then sum(b.inventory_quantity) else sum(b.gross_weight) end as Total,
+  b.item_Number as itemNumber,b.small_Po as smallPo,b.plan_Quantity as planQuantity,sum(b.gross_weight) as grossWeight,
+  sum(b.net_weight) as netWeight,sum(b.total_Volume) as totalVolume,b.distribution_Point as distributionPoint,
+  a.container_Code as containerCode,b.price,b.total_Price as totalPrice,b.pre_Delivery_Date as preDeliveryDate,
+  b.salesman as salesman,b.sales_Department as salesDepartment,b.pur_Or_Sub_Order as purOrSubOrder,
+  c.english_product_name as englishProductName,b.order_Number as orderNumber,'面料' as readyFabric from sy_packing_list_fabric a
     left join sy_packing_list_fabric_item b
     on a.id = b.sy_packing_list_fabric_id
+		left join sy_declaration_elements c
+		on b.elements_Id = c.id
    ${ew.customSqlSegment}
 
   </select>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -105,6 +105,13 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
         //子表集合
         List<SyShippingOrderItem> itemList = new ArrayList<>();
 
+        //总毛重
+        BigDecimal totalGrossWeight = BigDecimal.ZERO;
+        //总体积
+        BigDecimal totalVolume = BigDecimal.ZERO;
+        //总箱数
+        BigDecimal boxNumber = BigDecimal.ZERO;
+
         String id = oConvertUtils.id();
         syShippingOrder.setId(id);
         syShippingOrder.setDelFlag("0");
@@ -141,15 +148,21 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setDelFlag("0");
                         syShippingOrderItem.setStyleNumber(itemli.getItemNumber());
                         syShippingOrderItem.setNumber(itemli.getInventoryQuantity());//数量
-                        syShippingOrderItem.setReadyFabric("面料");//成衣或者面料
+                        if(oConvertUtils.isEmpty(itemli.getU8Id())){
+                            syShippingOrderItem.setReadyFabric("面料");
+                        }else{
+                            syShippingOrderItem.setReadyFabric("辅料");
+                        }
                         syShippingOrderItem.setContainerCode(li.getContainerCode());//集装箱代号
                         syShippingOrderItem.setContainerNumber(li.getContainerNumber());//集装箱号
-                        syShippingOrderItem.setTailoringFabricId(li.getTailoringFabricId());//成衣或者面料主表ID
-                        syShippingOrderItem.setTailoringFabricItemId(li.getTailoringFabricItemId());//成衣或者面料子表ID
+                        syShippingOrderItem.setTailoringFabricId(itemli.getSyPackingListFabricId());//成衣或者面料主表ID
+                        syShippingOrderItem.setTailoringFabricItemId(itemli.getId());//成衣或者面料子表ID
                         syShippingOrderItem.setSmailPo(itemli.getSmallPo());
                         syShippingOrderItem.setGrossWeight(itemli.getGrossWeight());
+                        totalGrossWeight.add(itemli.getGrossWeight());
                         syShippingOrderItem.setNetWeight(itemli.getNetWeight());
                         syShippingOrderItem.setVolume(itemli.getTotalVolume());
+                        totalVolume.add(itemli.getTotalVolume());
                         syShippingOrderItem.setDistributionPoint(itemli.getDistributionPoint());
                         syShippingOrderItem.setUnitPrice(itemli.getPrice());
                         syShippingOrderItem.setPreShipmentDate(itemli.getPreDeliveryDate());
@@ -158,26 +171,23 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setPurchaseOutsourcingOrderNo(itemli.getPurOrSubOrder());
                         syShippingOrderItem.setPkOrg(itemli.getPkOrg());
                         syShippingOrderItem.setElementsId(itemli.getElementsId());
+                        syShippingOrderItem.setOrderNumber(itemli.getOrderNumber());
 
                          itemList.add(syShippingOrderItem);
-
                     }
-
-
                     //查询预装箱但面料数据
                     SyPackingListFabric syPackingListFabric = syPackingListFabricService.getById(li.getTailoringFabricId());
                     if(oConvertUtils.isEmpty(syPackingListFabric)){
                         throw new JeecgBootException("没有查询到装箱单面料数据！");
                     }
-                    ////回写预装箱面料外销发票号, 剩余数量
+                    //回写预装箱面料外销发票号、是否被参照、托书号
                     syPackingListFabric.setExportInvoiceNo(syShippingOrder.getExportInvoiceNo());
-                    BigDecimal rem = syPackingListFabric.getRemainingQuantity();
-                    BigDecimal tatol = rem.subtract(li.getNumber());
-                    syPackingListFabric.setRemainingQuantity(tatol);
+                    syPackingListFabric.setIsReference(1);
+                    syPackingListFabric.setShippingOrderNumber(syShippingOrder.getShippingOrderNumber());
                     syPackingListFabricService.updateById(syPackingListFabric);
 
-                }else{ //成衣
 
+                }else{ //成衣
                     //查询装箱单成衣子表数据
                     QueryWrapper<SyPackingListTailoringItem> queryWrapper = new QueryWrapper<SyPackingListTailoringItem>();
                     queryWrapper.in("id",fabricItemIdList);
@@ -193,36 +203,46 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setDelFlag("0");
                         syShippingOrderItem.setSmailPo(lit.getSmallPo());
                         syShippingOrderItem.setBoxNumber(lit.getBoxNumber());
+                        boxNumber.add(lit.getBoxNumber());
                         syShippingOrderItem.setGrossWeight(lit.getGrossWeight());
+                        totalGrossWeight.add(lit.getGrossWeight());
                         syShippingOrderItem.setNetWeight(lit.getNetWeight());
                         syShippingOrderItem.setVolume(lit.getTotalVolume());
+                        totalVolume.add(lit.getTotalVolume());
                         syShippingOrderItem.setDistributionPoint(lit.getDistributionPoint());
-                        syShippingOrderItem.setContainerCode(li.getContainerCode());
-                        syShippingOrderItem.setContainerNumber(li.getContainerNumber());//集装箱号
                         syShippingOrderItem.setUnitPrice(lit.getUnitPrice());
                         syShippingOrderItem.setPreShipmentDate(lit.getHod());
                         syShippingOrderItem.setReadyFabric("成衣");//成衣或者面料
                         syShippingOrderItem.setContainerCode(li.getContainerCode());//集装箱代号
                         syShippingOrderItem.setContainerNumber(li.getContainerNumber());//集装箱号
-                        syShippingOrderItem.setTailoringFabricId(li.getTailoringFabricId());//成衣或者面料主表ID
-                        syShippingOrderItem.setTailoringFabricItemId(li.getTailoringFabricItemId());//成衣或者面料子表ID
-                       // syShippingOrderItem.setElementsId()
-
+                        syShippingOrderItem.setTailoringFabricId(lit.getSyPackingListTailoringId());//成衣主表ID
+                        syShippingOrderItem.setTailoringFabricItemId(lit.getId());//成衣子表ID
+                        syShippingOrderItem.setElementsId(lit.getElementsId());
+                        syShippingOrderItem.setOrderNumber(lit.getOrderNumber());
                         itemList.add(syShippingOrderItem);
 
                     }
 
-                    //回写预装箱成衣外销发票号
+                    //回写预装箱成衣外销发票号、是否被参照、托书号
                     SyPackingListTailoring syPackingListTailoring = syPackingListTailoringService.getById(li.getTailoringFabricId());
                     if(oConvertUtils.isEmpty(syPackingListTailoring)){
                         throw new JeecgBootException("没有查询到装箱单数据！");
                     }
                     syPackingListTailoring.setExportInvoiceNo(syShippingOrder.getExportInvoiceNo());
+                    syPackingListTailoring.setIsReference(1);
+                    syPackingListTailoring.setShippingOrderNumber(syShippingOrder.getShippingOrderNumber());
                     syPackingListTailoringService.updateById(syPackingListTailoring);
 
                 }
 
             }
+            //总毛重
+            syShippingOrder.setTotalGrossWeight(totalGrossWeight);
+            //总体积
+            syShippingOrder.setTotalVolume(totalVolume);
+            //总箱数
+            syShippingOrder.setBoxNumber(boxNumber);
+
             syShippingOrderItemService.saveBatch(itemList);
         }
         //新增人名币
@@ -278,23 +298,19 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                 //查询预装箱但面料数据
                 SyPackingListFabric syPackingListFabric = syPackingListFabricService.getById(li.getTailoringFabricId());
                 if(oConvertUtils.isEmpty(syPackingListFabric)){
-                    throw new JeecgBootException("没有查询到装箱单数据！");
+                    throw new JeecgBootException("没有查询到装箱单面料数据！");
                 }
-                ////回写预装箱面料外销发票号, 剩余数量
-                syPackingListFabric.setExportInvoiceNo(syShippingOrder.getExportInvoiceNo());
-                //箱数减去剩余数量
-                BigDecimal sub = syPackingListFabric.getRemainingQuantity().add(li.getNumber());
-                syPackingListFabric.setRemainingQuantity(sub);
+                //回写预装箱-面料是否被参照
+                syPackingListFabric.setIsReference(0);
                 syPackingListFabricService.updateById(syPackingListFabric);
 
             }else{//成衣
-
-                //回写预装箱成衣外销发票号
+                //回写预装箱-成衣是否被参照
                 SyPackingListTailoring syPackingListTailoring = syPackingListTailoringService.getById(li.getTailoringFabricId());
                 if(oConvertUtils.isEmpty(syPackingListTailoring)){
-                    throw new JeecgBootException("没有查询到装箱单数据！");
+                    throw new JeecgBootException("没有查询到装箱单成衣数据！");
                 }
-                syPackingListTailoring.setExportInvoiceNo(syShippingOrder.getExportInvoiceNo());
+                syPackingListTailoring.setIsReference(0);
                 syPackingListTailoringService.updateById(syPackingListTailoring);
             }
             //删除子表

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabric.java

@@ -147,4 +147,9 @@ public class SyPackingListFabric implements Serializable {
 	@ApiModelProperty(value = "账套号")
 	//@TableField(exist = false)
 	private String account;
+
+	/**是否被参照(0:无,1:被预托书参照,2:被装箱单参照)*/
+	//@Excel(name = "是否被参照(0:无,1:被预托书参照,2:被装箱单参照)", width = 15)
+	@ApiModelProperty(value = "是否被参照(0:无,1:被预托书参照,2:被装箱单参照)")
+	private Integer isReference;
 }