面料装箱单

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

@@ -20,61 +20,69 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @Data
 @TableName("sy_packing_list_fabric_item")
-@ApiModel(value="sy_packing_list_fabric对象", description="面料装箱单")
+@ApiModel(value="sy_packing_list_fabric对象", description="装箱单面料")
 public class SyPackingListFabricItem implements Serializable {
     private static final long serialVersionUID = 1L;
     
 	/**id*/
 	@TableId(type = IdType.ASSIGN_ID)
 	@ApiModelProperty(value = "id")
-	private java.lang.String id;
+	private String id;
 	/**装箱单面料主表id*/
 	@ApiModelProperty(value = "装箱单面料主表id")
-	private java.lang.String syPackingListFabricId;
+	private String syPackingListFabricId;
+	/**发运明细主表id*/
+	// @Excel(name = "发运明细主表id", width = 15)
+	@ApiModelProperty(value = "发运明细主表id")
+	private String syDeclarationElementsId;
+	/**发运明细子表id*/
+	//@Excel(name = "发运明细子表id", width = 15)
+	@ApiModelProperty(value = "发运明细子表id")
+	private String syDeclarationElementsItemId;
 	/**业务员*/
     @Excel(name = "业务员", width = 15)
 	@ApiModelProperty(value = "业务员")
-	private java.lang.String salesman;
+	private String salesman;
 	/**计划单号*/
     @Excel(name = "计划单号", width = 15)
 	@ApiModelProperty(value = "计划单号")
-	private java.lang.String orderNumber;
+	private String PlanLotNumber;
 	/**款号/Kimball*/
     @Excel(name = "款号/Kimball", width = 15)
 	@ApiModelProperty(value = "款号/Kimball")
-	private java.lang.String styleNumber;
+	private String itemNumber;
 	/**缸号/Batch no.*/
     @Excel(name = "缸号/Batch no.", width = 15)
 	@ApiModelProperty(value = "缸号/Batch no.")
-	private java.lang.String dyelotNumber;
+	private String dyelotNumber;
 	/**颜色/color*/
     @Excel(name = "颜色/color", width = 15)
-	@ApiModelProperty(value = "颜色/color")
-	private java.lang.String color;
+	@ApiModelProperty(value = "颜色/colour")
+	private String colour;
 	/**项目/Item（存货编码）*/
     @Excel(name = "项目/Item（存货编码）", width = 15)
 	@ApiModelProperty(value = "项目/Item（存货编码）")
-	private java.lang.String project;
+	private String inventoryCode;
 	/**存货名称（辅料名称）*/
     @Excel(name = "存货名称（辅料名称）", width = 15)
 	@ApiModelProperty(value = "存货名称（辅料名称）")
-	private java.lang.String accessoriesName;
+	private String inventoryName;
 	/**报关品名*/
     @Excel(name = "报关品名", width = 15)
 	@ApiModelProperty(value = "报关品名")
-	private java.lang.String customsDeclarationItems;
+	private String declarationName;
 	/**成分/Composition*/
     @Excel(name = "成分/Composition", width = 15)
 	@ApiModelProperty(value = "成分/Composition")
-	private java.lang.String composition;
+	private String composition;
 	/**门幅/Width*/
     @Excel(name = "门幅/Width", width = 15)
 	@ApiModelProperty(value = "门幅/Width")
-	private java.lang.String width;
+	private String width;
 	/**匹数/Rolls*/
     @Excel(name = "匹数/Rolls", width = 15)
 	@ApiModelProperty(value = "匹数/Rolls")
-	private java.lang.String rolls;
+	private String rolls;
 	/**毛重/GW/kg*/
     @Excel(name = "毛重/GW/kg", width = 15)
 	@ApiModelProperty(value = "毛重/GW/kg")
@@ -106,47 +114,47 @@ public class SyPackingListFabricItem implements Serializable {
 	/**供应商编码（染厂）*/
     @Excel(name = "供应商编码（染厂）", width = 15)
 	@ApiModelProperty(value = "供应商编码（染厂）")
-	private java.lang.String supplierCodeDyeingPlant;
+	private String supplierCodeDyeingPlant;
 	/**供应商（染厂）*/
     @Excel(name = "供应商（染厂）", width = 15)
 	@ApiModelProperty(value = "供应商（染厂）")
-	private java.lang.String supplierDyeingPlant;
+	private String supplierDyeingPlant;
 	/**供应商编码（印厂）*/
     @Excel(name = "供应商编码（印厂）", width = 15)
 	@ApiModelProperty(value = "供应商编码（印厂）")
-	private java.lang.String supplierCodePrintingPlant;
+	private String supplierCodePrintingPlant;
 	/**供应商（印厂）*/
     @Excel(name = "供应商（印厂）", width = 15)
 	@ApiModelProperty(value = "供应商（印厂）")
-	private java.lang.String supplierPrintingPlant;
+	private String supplierPrintingPlant;
 	/**包装方式*/
     @Excel(name = "包装方式", width = 15)
 	@ApiModelProperty(value = "包装方式")
-	private java.lang.String mannerOfPacking;
+	private String mannerOfPacking;
 	/**处理方式*/
     @Excel(name = "处理方式", width = 15)
 	@ApiModelProperty(value = "处理方式")
-	private java.lang.String processMode;
+	private String treatmentMethod;
 	/**是否手册纱*/
     @Excel(name = "是否手册纱", width = 15)
 	@ApiModelProperty(value = "是否手册纱")
-	private java.lang.String manualYarn;
+	private int manualYarnFlag;
 	/**手册纱单价*/
     @Excel(name = "手册纱单价", width = 15)
 	@ApiModelProperty(value = "手册纱单价")
-	private java.math.BigDecimal unitPriceOfManual yarn;
+	private java.math.BigDecimal manualYarnUnitPrice;
 	/**手册纱占比*/
-    @Excel(name = "手册纱占比", width = 15)
+	@Excel(name = "手册纱占比", width = 15)
 	@ApiModelProperty(value = "手册纱占比")
-	private java.math.BigDecimal manualYarnRatio;
+	private String manualYarnProportion;
 	/**柜号*/
     @Excel(name = "柜号", width = 15)
 	@ApiModelProperty(value = "柜号")
-	private java.lang.String containerNumber;
+	private String containerNumber;
 	/**备注*/
     @Excel(name = "备注", width = 15)
 	@ApiModelProperty(value = "备注")
-	private java.lang.Object remarks1;
+	private Object remarks1;
 	/**入库数量*/
     @Excel(name = "入库数量", width = 15)
 	@ApiModelProperty(value = "入库数量")
@@ -154,7 +162,7 @@ public class SyPackingListFabricItem implements Serializable {
 	/**规格型号*/
     @Excel(name = "规格型号", width = 15)
 	@ApiModelProperty(value = "规格型号")
-	private java.lang.String specificationsAndModels;
+	private String specificationAndModel;
 	/**实际报关数量*/
     @Excel(name = "实际报关数量", width = 15)
 	@ApiModelProperty(value = "实际报关数量")
@@ -162,49 +170,49 @@ public class SyPackingListFabricItem implements Serializable {
 	/**超发*/
     @Excel(name = "超发", width = 15)
 	@ApiModelProperty(value = "超发")
-	private java.math.BigDecimal multipleShipments;
+	private java.math.BigDecimal excessQuantity;
 	/**单位*/
     @Excel(name = "单位", width = 15)
 	@ApiModelProperty(value = "单位")
-	private java.lang.String unit;
+	private String masterMetering;
 	/**备注（U8）*/
     @Excel(name = "备注（U8）", width = 15)
 	@ApiModelProperty(value = "备注（U8）")
-	private java.lang.Object remarks2;
+	private Object remarks2;
 	/**创建人*/
     @Excel(name = "创建人", width = 15)
 	@ApiModelProperty(value = "创建人")
-	private java.lang.String createBy;
+	private 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;
+	private Date createTime;
 	/**修改人*/
     @Excel(name = "修改人", width = 15)
 	@ApiModelProperty(value = "修改人")
-	private java.lang.String updateBy;
+	private 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;
+	private Date updateTime;
 	/**组织*/
     @Excel(name = "组织", width = 15)
 	@ApiModelProperty(value = "组织")
-	private java.lang.String pkOrg;
+	private String pkOrg;
 	/**删除状态*/
     @Excel(name = "删除状态", width = 15)
 	@ApiModelProperty(value = "删除状态")
-	private java.lang.String delFlag;
+	private String delFlag;
 	/**备注*/
     @Excel(name = "备注", width = 15)
 	@ApiModelProperty(value = "备注")
-	private java.lang.Object memo;
+	private Object memo;
 	/**排序*/
     @Excel(name = "排序", width = 15)
 	@ApiModelProperty(value = "排序")
-	private java.lang.Integer sort;
+	private Integer sort;
 }