染损数据合并

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/mapper/xml/DyeLossMapper.xml

@@ -22,27 +22,48 @@
         left join OM_MatSettleVouch f on  b.MODetailsID =f.MODetailsID
         left join OM_MatSettleVouchs g on g.msid=f.msid*/
 
-    select
+select *,(1-iQuantity2/NULLIF(iMSQuantity,0))*100 dyeLossRate from (
+ select
         d.cinvcode,--物料编码
         d.cInvName,--物料名称
         b.cfree1 color,--颜色
         cVenName cVenName,--供应商
         a.cCode cCode,--订单号
-        b.iQuantity,--订单数量
-        ISNULL(iReceivedQTY, 0 ) iQuantity2,--采购入库数
-        ISNULL(iMaterialSendQty, 0 ) iQuantity3,--材料出库数
-        ISNULL((select sum(OM_MatSettleVouchs.iMSQuantity) from OM_MatSettleVouch
-        left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-        where b.MODetailsID=OM_MatSettleVouch.modetailsid ) ,0)iMSQuantity,--核销数量
-        ISNULL( (1-iReceivedQTY/NULLIF((select sum(OM_MatSettleVouchs.iMSQuantity) from OM_MatSettleVouch
-        left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-        where b.MODetailsID=OM_MatSettleVouch.modetailsid ),0))*100,0) dyeLossRate--染损
+        sum(b.iQuantity) iQuantity,--订单数量
+        ISNULL(sum(iReceivedQTY), 0 ) iQuantity2,--采购入库数
+        ISNULL(sum(iMaterialSendQty), 0 ) iQuantity3,--材料出库数
+        isnull((select sum(OM_MatSettleVouchs.iMSQuantity) from
+            OM_MatSettleVouch
+            left join OM_MatSettleVouchs
+            on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
+            left join OM_MODetails  on OM_MODetails.MODetailsID=OM_MatSettleVouch.modetailsid
+            left join OM_MOMain on OM_MOMain.moid=OM_MODetails.moid
+            left join Vendor  on Vendor.cVenCode=OM_MOMain.cVenCode
+            left join Inventory  on OM_MODetails.cInvCode=Inventory.cInvCode
+        where 	Inventory.cinvcode=d.cinvcode and
+                Inventory.cInvName=d.cInvName and
+                OM_MODetails.cfree1=b.cfree1 and
+                Vendor.cVenName=c.cVenName and
+                OM_MOMain.cCode=a.cCode),0) iMSQuantity
         from OM_MOMain a
         left join OM_MODetails b on b.moid=a.moid
         left join Vendor c on c.cVenCode=a.cVenCode
         left join Inventory d on b.cInvCode=d.cInvCode
+		${ew.customSqlSegment}
+			group by
+            d.cinvcode,
+            d.cInvName,
+            b.cfree1,
+            cVenName,
+            a.cCode
+			)p
+			order by
+            cinvcode,
+            cInvName,
+            color,
+            cVenName,
+            cCode
         --left join SO_SODetails e on e.iSOsID =b.iSOsID
-       ${ew.customSqlSegment}
     </select>
 
     
@@ -92,27 +113,48 @@
 
 
     <select id="excel" resultType="org.jeecg.modules.scas.entity.DyeLoss">
-    select
+select *,(1-iQuantity2/NULLIF(iMSQuantity,0))*100 dyeLossRate from (
+ select
         d.cinvcode,--物料编码
         d.cInvName,--物料名称
         b.cfree1 color,--颜色
         cVenName cVenName,--供应商
         a.cCode cCode,--订单号
-        b.iQuantity,--订单数量
-        ISNULL(iReceivedQTY, 0 ) iQuantity2,--采购入库数
-        ISNULL(iMaterialSendQty, 0 ) iQuantity3,--材料出库数
-        ISNULL((select sum(OM_MatSettleVouchs.iMSQuantity) from OM_MatSettleVouch
-        left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-        where b.MODetailsID=OM_MatSettleVouch.modetailsid ) ,0)iMSQuantity,--核销数量
-        ISNULL( (1-iReceivedQTY/NULLIF((select sum(OM_MatSettleVouchs.iMSQuantity) from OM_MatSettleVouch
-        left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-        where b.MODetailsID=OM_MatSettleVouch.modetailsid ),0))*100,0) dyeLossRate--染损
+        sum(b.iQuantity) iQuantity,--订单数量
+        ISNULL(sum(iReceivedQTY), 0 ) iQuantity2,--采购入库数
+        ISNULL(sum(iMaterialSendQty), 0 ) iQuantity3,--材料出库数
+        isnull((select sum(OM_MatSettleVouchs.iMSQuantity) from
+            OM_MatSettleVouch
+            left join OM_MatSettleVouchs
+            on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
+            left join OM_MODetails  on OM_MODetails.MODetailsID=OM_MatSettleVouch.modetailsid
+            left join OM_MOMain on OM_MOMain.moid=OM_MODetails.moid
+            left join Vendor  on Vendor.cVenCode=OM_MOMain.cVenCode
+            left join Inventory  on OM_MODetails.cInvCode=Inventory.cInvCode
+        where 	Inventory.cinvcode=d.cinvcode and
+                Inventory.cInvName=d.cInvName and
+                OM_MODetails.cfree1=b.cfree1 and
+                Vendor.cVenName=c.cVenName and
+                OM_MOMain.cCode=a.cCode),0) iMSQuantity
         from OM_MOMain a
         left join OM_MODetails b on b.moid=a.moid
         left join Vendor c on c.cVenCode=a.cVenCode
         left join Inventory d on b.cInvCode=d.cInvCode
-        --left join SO_SODetails e on e.iSOsID =b.iSOsID
         where c.cVCCode='0105'
+			group by
+            d.cinvcode,
+            d.cInvName,
+            b.cfree1,
+            cVenName,
+            a.cCode
+			)p
+			order by
+            cinvcode,
+            cInvName,
+            color,
+            cVenName,
+            cCode
+        --left join SO_SODetails e on e.iSOsID =b.iSOsID
     </select>
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/SyPackingListTailoring.java

@@ -0,0 +1,156 @@
+package org.jeecg.modules.splt.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 装箱单主表
+ * @Author: jeecg-boot
+ * @Date:   2022-07-06
+ * @Version: V1.0
+ */
+@Data
+@TableName("sy_packing_list_tailoring")
+@ApiModel(value="sy_packing_list_tailoring对象", description="装箱单主表")
+public class syPackingListTailoring implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+	@ApiModelProperty(value = "主键")
+	private java.lang.String id;
+	/**创建人*/
+	@ApiModelProperty(value = "创建人")
+	private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "创建日期")
+	private java.util.Date createTime;
+	/**修改人*/
+	@ApiModelProperty(value = "修改人")
+	private java.lang.String updateBy;
+	/**修改日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "修改日期")
+	private java.util.Date updateTime;
+	/**组织*/
+	@ApiModelProperty(value = "组织")
+	private java.lang.String pkOrg;
+	/**删除状态*/
+	@ApiModelProperty(value = "删除状态")
+	private java.lang.String delFlag;
+	/**订单号*/
+	@ApiModelProperty(value = "订单号")
+	private java.lang.String orderNumber;
+	/**款号*/
+	@ApiModelProperty(value = "款号")
+	private java.lang.String styleNum;
+	/**品名*/
+	@ApiModelProperty(value = "品名")
+	private java.lang.String tradeName;
+	/**尺码范围*/
+	@ApiModelProperty(value = "尺码范围")
+	private java.lang.String sizeRange;
+	/**客户*/
+	@ApiModelProperty(value = "客户")
+	private java.lang.String client;
+	/**客户简称*/
+	@ApiModelProperty(value = "客户简称")
+	private java.lang.String clientAbbreviation;
+	/**集装箱代号*/
+	@ApiModelProperty(value = "集装箱代号")
+	private java.lang.String containerCode;
+	/**集装箱号*/
+	@ApiModelProperty(value = "集装箱号")
+	private java.lang.String containerNumber;
+	/**备注*/
+	@ApiModelProperty(value = "备注")
+	private java.lang.Object memo;
+	/**成衣工厂*/
+	@ApiModelProperty(value = "成衣工厂")
+	private java.lang.String theGarmentFactory;
+	/**外销发票号*/
+	@ApiModelProperty(value = "外销发票号")
+	private java.lang.String exportInvoiceNo;
+	/**备注*/
+	@ApiModelProperty(value = "备注")
+	private java.lang.Object remarks;
+	/**托书号*/
+	@ApiModelProperty(value = "托书号")
+	private java.lang.String syXxxId;
+	/**预托书号*/
+	@ApiModelProperty(value = "预托书号")
+	private java.lang.String syXxxxId;
+	/**预发货日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "预发货日期")
+	private java.util.Date preShipmentDate;
+	/**小PO*/
+	@ApiModelProperty(value = "小PO")
+	private java.lang.String smailPo;
+	/**分销点*/
+	@ApiModelProperty(value = "分销点")
+	private java.lang.String theDistribution;
+	/**存货名称*/
+	@ApiModelProperty(value = "存货名称")
+	private java.lang.String nameOfTheInventory;
+	/**颜色*/
+	@ApiModelProperty(value = "颜色")
+	private java.lang.String color;
+	/**采购/委外订单号*/
+	@ApiModelProperty(value = "采购/委外订单号")
+	private java.lang.String purchase;
+	/**订单类型*/
+	@ApiModelProperty(value = "订单类型")
+	private java.lang.String orderTypeValue;
+	/**订单类型文本*/
+	@ApiModelProperty(value = "订单类型文本")
+	private java.lang.String orderTypeText;
+	/**工厂单价*/
+	@ApiModelProperty(value = "工厂单价")
+	private java.math.BigDecimal theFactoryPrice;
+	/**数量(按合并规则累计)*/
+	@ApiModelProperty(value = "数量(按合并规则累计)")
+	private java.math.BigDecimal number;
+	/**箱数*/
+	@ApiModelProperty(value = "箱数")
+	private java.math.BigDecimal boxNumber;
+	/**总净重*/
+	@ApiModelProperty(value = "总净重")
+	private java.math.BigDecimal totalNetWeight;
+	/**总毛重*/
+	@ApiModelProperty(value = "总毛重")
+	private java.math.BigDecimal totalGrossWeight;
+	/**总体积*/
+	@ApiModelProperty(value = "总体积")
+	private java.math.BigDecimal totalVolume;
+	/**推送状态*/
+	@ApiModelProperty(value = "推送状态")
+	private java.lang.String pushState;
+	/**单据状态*/
+	@ApiModelProperty(value = "单据状态")
+	private java.lang.String theDocumentsState;
+	/**原因*/
+	@ApiModelProperty(value = "原因")
+	private java.lang.String cause;
+	/**是否云工厂推送*/
+	@ApiModelProperty(value = "是否云工厂推送")
+	private java.lang.String whetherCloudFactoryPush;
+	/**状态*/
+	@ApiModelProperty(value = "状态")
+	private java.lang.String state;
+	/**附件*/
+	@ApiModelProperty(value = "附件")
+	private java.lang.String accessory;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/SyPackingListTailoringItem.java

@@ -0,0 +1,194 @@
+package org.jeecg.modules.splt.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 装箱单子表
+ * @Author: jeecg-boot
+ * @Date:   2022-07-06
+ * @Version: V1.0
+ */
+@Data
+@TableName("sy_packing_list_tailoring_item")
+@ApiModel(value="sy_packing_list_tailoring对象", description="装箱单主表")
+public class syPackingListTailoringItem implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+	@ApiModelProperty(value = "主键")
+	private java.lang.String id;
+	/**装箱单主表id*/
+	@ApiModelProperty(value = "装箱单主表id")
+	private java.lang.String syPackingListTailoringId;
+	/**预装箱单主表id*/
+    @Excel(name = "预装箱单主表id", width = 15)
+	@ApiModelProperty(value = "预装箱单主表id")
+	private java.lang.String syPreAssembledPackingListId;
+	/**预装箱单子表id*/
+    @Excel(name = "预装箱单子表id", width = 15)
+	@ApiModelProperty(value = "预装箱单子表id")
+	private java.lang.String syPreAssembledPackingListItemId;
+	/**帐套*/
+    @Excel(name = "帐套", width = 15)
+	@ApiModelProperty(value = "帐套")
+	private java.lang.String acSetNo;
+	/**成衣工厂*/
+    @Excel(name = "成衣工厂", width = 15)
+	@ApiModelProperty(value = "成衣工厂")
+	private java.lang.String garmentFactory;
+	/**HOD*/
+    @Excel(name = "HOD", width = 15)
+	@ApiModelProperty(value = "HOD")
+	private java.lang.String hod;
+	/**STYLE NO*/
+    @Excel(name = "STYLE NO", width = 15)
+	@ApiModelProperty(value = "STYLE NO")
+	private java.lang.String styleNo;
+	/**PO NO.*/
+    @Excel(name = "PO NO.", width = 15)
+	@ApiModelProperty(value = "PO NO.")
+	private java.lang.String poNo;
+	/**ITEM NO./SKU NO./UPC NO./PACKSCODE*/
+    @Excel(name = "ITEM NO./SKU NO./UPC NO./PACKSCODE", width = 15)
+	@ApiModelProperty(value = "ITEM NO./SKU NO./UPC NO./PACKSCODE")
+	private java.lang.String itemCode;
+	/**分销点/DC/LABEL*/
+    @Excel(name = "分销点/DC/LABEL", width = 15)
+	@ApiModelProperty(value = "分销点/DC/LABEL")
+	private java.lang.String distributionPoint;
+	/**PREPACK SKU*/
+    @Excel(name = "PREPACK SKU", width = 15)
+	@ApiModelProperty(value = "PREPACK SKU")
+	private java.lang.String prepackSku;
+	/**尺码*/
+    @Excel(name = "尺码", width = 15)
+	@ApiModelProperty(value = "尺码")
+	private java.lang.String size;
+	/**启始箱号*/
+    @Excel(name = "启始箱号", width = 15)
+	@ApiModelProperty(value = "启始箱号")
+	private java.lang.String startingBoxNumber;
+	/**结束箱号*/
+    @Excel(name = "结束箱号", width = 15)
+	@ApiModelProperty(value = "结束箱号")
+	private java.lang.String endCaseNumber;
+	/**颜色（中英文）*/
+    @Excel(name = "颜色（中英文）", width = 15)
+	@ApiModelProperty(value = "颜色（中英文）")
+	private java.lang.String colour;
+	/**件数/箱*/
+    @Excel(name = "件数/箱", width = 15)
+	@ApiModelProperty(value = "件数/箱")
+	private java.math.BigDecimal piecesBox;
+	/**箱数*/
+    @Excel(name = "箱数", width = 15)
+	@ApiModelProperty(value = "箱数")
+	private java.math.BigDecimal boxNumber;
+	/**总件数*/
+    @Excel(name = "总件数", width = 15)
+	@ApiModelProperty(value = "总件数")
+	private java.math.BigDecimal total;
+	/**净重/箱*/
+    @Excel(name = "净重/箱", width = 15)
+	@ApiModelProperty(value = "净重/箱")
+	private java.math.BigDecimal netWeight;
+	/**总净重*/
+    @Excel(name = "总净重", width = 15)
+	@ApiModelProperty(value = "总净重")
+	private java.math.BigDecimal totalNetWeight;
+	/**毛重/箱*/
+    @Excel(name = "毛重/箱", width = 15)
+	@ApiModelProperty(value = "毛重/箱")
+	private java.math.BigDecimal grossWeight;
+	/**总毛重*/
+    @Excel(name = "总毛重", width = 15)
+	@ApiModelProperty(value = "总毛重")
+	private java.math.BigDecimal totalGrossWeight;
+	/**外箱长度*/
+    @Excel(name = "外箱长度", width = 15)
+	@ApiModelProperty(value = "外箱长度")
+	private java.math.BigDecimal outerBoxLength;
+	/**外箱宽度*/
+    @Excel(name = "外箱宽度", width = 15)
+	@ApiModelProperty(value = "外箱宽度")
+	private java.math.BigDecimal outerBoxWidth;
+	/**外箱高度*/
+    @Excel(name = "外箱高度", width = 15)
+	@ApiModelProperty(value = "外箱高度")
+	private java.math.BigDecimal outerBoxHeight;
+	/**总体积*/
+    @Excel(name = "总体积", width = 15)
+	@ApiModelProperty(value = "总体积")
+	private java.math.BigDecimal totalVolume;
+	/**净净重*/
+    @Excel(name = "净净重", width = 15)
+	@ApiModelProperty(value = "净净重")
+	private java.math.BigDecimal netWeightToo;
+	/**单价*/
+    @Excel(name = "单价", width = 15)
+	@ApiModelProperty(value = "单价")
+	private java.math.BigDecimal unitPrice;
+	/**总价*/
+    @Excel(name = "总价", width = 15)
+	@ApiModelProperty(value = "总价")
+	private java.math.BigDecimal totalPrice;
+	/**备注*/
+    @Excel(name = "备注", width = 15)
+	@ApiModelProperty(value = "备注")
+	private java.lang.Object remarks;
+	/**创建人*/
+    @Excel(name = "创建人", width = 15)
+	@ApiModelProperty(value = "创建人")
+	private java.lang.String createBy;
+	/**创建日期*/
+	@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "创建日期")
+	private java.util.Date createTime;
+	/**修改人*/
+    @Excel(name = "修改人", width = 15)
+	@ApiModelProperty(value = "修改人")
+	private java.lang.String updateBy;
+	/**修改日期*/
+	@Excel(name = "修改日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "修改日期")
+	private java.util.Date updateTime;
+	/**组织*/
+    @Excel(name = "组织", width = 15)
+	@ApiModelProperty(value = "组织")
+	private java.lang.String pkOrg;
+	/**删除状态*/
+    @Excel(name = "删除状态", width = 15)
+	@ApiModelProperty(value = "删除状态")
+	private java.lang.String delFlag;
+	/**备注*/
+    @Excel(name = "备注", width = 15)
+	@ApiModelProperty(value = "备注")
+	private java.lang.Object memo;
+	/**排序*/
+    @Excel(name = "排序", width = 15)
+	@ApiModelProperty(value = "排序")
+	private java.lang.Integer sort;
+	/**配码*/
+    @Excel(name = "配码", width = 15)
+	@ApiModelProperty(value = "配码")
+	private java.lang.String withCode;
+	/**存货名称*/
+    @Excel(name = "存货名称", width = 15)
+	@ApiModelProperty(value = "存货名称")
+	private java.lang.String inventoryName;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/vo/SyPackingListTailoringPage.java

@@ -0,0 +1,158 @@
+package org.jeecg.modules.splt.vo;
+
+import java.util.List;
+import org.jeecg.modules.splt.entity.SyPackingListTailoring;
+import org.jeecg.modules.splt.entity.SyPackingListTailoringItem;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 装箱单主表
+ * @Author: jeecg-boot
+ * @Date:   2022-07-06
+ * @Version: V1.0
+ */
+@Data
+@ApiModel(value="sy_packing_list_tailoringPage对象", description="装箱单主表")
+public class SyPackingListTailoringPage {
+	
+	/**主键*/
+	private java.lang.String id;
+	/**预装箱单主表id*/
+  	@Excel(name = "预装箱单主表id", width = 15)
+	private java.lang.String syPreAssembledPackingListId;
+	/**创建人*/
+  	@Excel(name = "创建人", width = 15)
+	private java.lang.String createBy;
+	/**创建日期*/
+  	@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+  	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private java.util.Date createTime;
+	/**修改人*/
+  	@Excel(name = "修改人", width = 15)
+	private java.lang.String updateBy;
+	/**修改日期*/
+  	@Excel(name = "修改日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+  	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private java.util.Date updateTime;
+	/**组织*/
+  	@Excel(name = "组织", width = 15)
+	private java.lang.String pkOrg;
+	/**删除状态*/
+  	@Excel(name = "删除状态", width = 15)
+	private java.lang.String delFlag;
+	/**订单号*/
+  	@Excel(name = "订单号", width = 15)
+	private java.lang.String orderNumber;
+	/**款号*/
+  	@Excel(name = "款号", width = 15)
+	private java.lang.String itemNumber;
+	/**品名*/
+  	@Excel(name = "品名", width = 15)
+	private java.lang.String productName;
+	/**尺码范围*/
+  	@Excel(name = "尺码范围", width = 15)
+	private java.lang.String sizeRange;
+	/**客户*/
+  	@Excel(name = "客户", width = 15)
+	private java.lang.String customer;
+	/**客户简称*/
+  	@Excel(name = "客户简称", width = 15)
+	private java.lang.String customerAbbreviation;
+	/**集装箱代号*/
+  	@Excel(name = "集装箱代号", width = 15)
+	private java.lang.String containerCode;
+	/**集装箱号*/
+  	@Excel(name = "集装箱号", width = 15)
+	private java.lang.String containerNumber;
+	/**备注*/
+  	@Excel(name = "备注", width = 15)
+	private java.lang.Object memo;
+	/**成衣工厂*/
+  	@Excel(name = "成衣工厂", width = 15)
+	private java.lang.String garmentFactory;
+	/**外销发票号*/
+  	@Excel(name = "外销发票号", width = 15)
+	private java.lang.String exportInvoiceNo;
+	/**u8备注*/
+  	@Excel(name = "u8备注", width = 15)
+	private java.lang.Object u8Remarks;
+	/**托书号*/
+  	@Excel(name = "托书号", width = 15)
+	private java.lang.String syXxxId;
+	/**预托书号*/
+  	@Excel(name = "预托书号", width = 15)
+	private java.lang.String syXxxxId;
+	/**预发货日期*/
+  	@Excel(name = "预发货日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+  	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private java.util.Date preDeliveryDate;
+	/**小PO*/
+  	@Excel(name = "小PO", width = 15)
+	private java.lang.String smailPo;
+	/**分销点*/
+  	@Excel(name = "分销点", width = 15)
+	private java.lang.String theDistribution;
+	/**存货名称*/
+  	@Excel(name = "存货名称", width = 15)
+	private java.lang.String nameOfTheInventory;
+	/**颜色*/
+  	@Excel(name = "颜色", width = 15)
+	private java.lang.String color;
+	/**采购/委外订单号*/
+  	@Excel(name = "采购/委外订单号", width = 15)
+	private java.lang.String purchase;
+	/**订单类型*/
+  	@Excel(name = "订单类型", width = 15)
+	private java.lang.String orderType;
+	/**工厂单价*/
+  	@Excel(name = "工厂单价", width = 15)
+	private java.math.BigDecimal theFactoryPrice;
+	/**数量(按合并规则累计)*/
+  	@Excel(name = "数量(按合并规则累计)", width = 15)
+	private java.math.BigDecimal number;
+	/**箱数*/
+  	@Excel(name = "箱数", width = 15)
+	private java.math.BigDecimal totalBoxes;
+	/**总净重*/
+  	@Excel(name = "总净重", width = 15)
+	private java.math.BigDecimal totalNetWeight;
+	/**总毛重*/
+  	@Excel(name = "总毛重", width = 15)
+	private java.math.BigDecimal totalGrossWeight;
+	/**总体积*/
+  	@Excel(name = "总体积", width = 15)
+	private java.math.BigDecimal totalVolume;
+	/**推送状态*/
+  	@Excel(name = "推送状态", width = 15)
+	private java.lang.String pushState;
+	/**单据状态*/
+  	@Excel(name = "单据状态", width = 15)
+	private java.lang.String theDocumentsState;
+	/**原因*/
+  	@Excel(name = "原因", width = 15)
+	private java.lang.String cause;
+	/**是否云工厂推送*/
+  	@Excel(name = "是否云工厂推送", width = 15)
+	private java.lang.String whetherCloudFactoryPush;
+	/**状态*/
+  	@Excel(name = "状态", width = 15)
+	private java.lang.String state;
+	/**附件*/
+  	@Excel(name = "附件", width = 15)
+	private java.lang.String accessory;
+	
+	@ExcelCollection(name="装箱单子表")
+	@ApiModelProperty(value = "装箱单子表")
+	private List<SyPackingListTailoringItem> syPackingListTailoringItemList;
+	
+}