托书调整

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

@@ -230,8 +230,11 @@ public class SyLetterDeposit {
 	@TableField(exist = false)
 	private List<SyUsd> syUsdList;
 
-	@ApiModelProperty(value = "提交（1）/取消提交（2）")
+	@ApiModelProperty(value = "用来判断提交或取消提交，提交（1）/取消提交（2）")
 	@TableField(exist = false)
 	private String type;
 
+	@ApiModelProperty(value = "预装箱单子表ID")
+	@TableField(exist = false)
+	private String syPreAssembledPackingListId;
 }

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

@@ -79,7 +79,7 @@ on a.id = b.sy_pre_assembled_packing_list_id
 
     <select id="querySyLetterDeposit" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyLetterDeposit">
 select a.id as id,a.depositary_receipt_no as depositaryReceiptNo,b.order_number as orderNumber,a.export_invoice_no as exportInvoiceNo,
-a.client_abbreviation as clientAbbreviation,a.exchange_earnings_value as exchangeEarningsValue,
+a.client_abbreviation as clientAbbreviation,a.exchange_earnings_value as exchangeEarningsValue,b.sy_pre_assembled_packing_list_id as syPreAssembledPackingListId,
 a.distribution_point as distributionPoint,a.unit_in_operation as unitInOperation,sum(b.box_number) as boxNumber,sum(b.total_gross_weight) as totalGrossWeight,sum(b.total_volume) as totalVolume,
 sum(a.money) as money,a.the_actual_shipping_date as theActualShippingDate,a.exchange_earnings_text as exchangeEarningsText,a.consignee as consignee,a.bill_of_lading_or_carriage_receipt as billOfLadingOrCarriageReceipt,
 a.addressee as addressee,a.trade_country as tradeCountry,a.arrive_in_country as arriveInCountry,a.export_port as exportPort,a.notifier as notifier,a.nottfy as nottfy,a.destination_port as destinationPort,

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

@@ -71,7 +71,7 @@ public class SyShippingOrderItem {
 	/**分销点*/
 	@Excel(name = "分销点", width = 15)
     @ApiModelProperty(value = "分销点")
-	private java.lang.String theDistribution;
+	private java.lang.String distributionPoint;
 	/**集装箱代号*/
 	@Excel(name = "集装箱代号", width = 15)
     @ApiModelProperty(value = "集装箱代号")