Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-service

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

@@ -66,7 +66,7 @@ public class SyPackingListTailoringItem implements Serializable {
     /**小PO*/
 	@Excel(name = "小PO", width = 15)
 	@ApiModelProperty(value = "小PO")
-	private String smailPo;
+	private String smallPo;
 	/**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")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringMapper.xml

@@ -33,7 +33,16 @@
          b.item_Code,
          b.distribution_Point,
          b.prepack_Sku,
-         SUM(b.total) total
+         SUM(b.total) total,
+         sum(b.total_Net_Weight)  totalNetWeight,
+         sum(b.total_Gross_Weight)  totalGrossWeight,
+         sum(b.total_Volume)  totalVolume,
+         sum(b.total_Price)  totalPrice,
+         b.master_Metering,
+         b.inventory_Name,
+         b.colour,
+         b.small_Po,
+         b.factory_Unit_Price
          FROM sy_packing_list_tailoring a
          LEFT JOIN sy_packing_list_tailoring_item b
          ON a.id=b.sy_packing_list_tailoring_id

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

@@ -1,9 +1,13 @@
 package org.jeecg.modules.splt.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecg.modules.spapl.entity.SizeTable;
 import org.jeecg.modules.splt.entity.SyPackingListTailoringItem;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.ExcelCollection;
@@ -21,137 +25,79 @@ import java.util.List;
 @Data
 @ApiModel(value="sy_packing_list_tailoringPage对象", description="装箱单主表")
 public class SyPackingListTailoringVo {
-
 	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+	@ApiModelProperty(value = "主键")
 	private String id;
-	/**预装箱单主表id*/
-  	@Excel(name = "预装箱单主表id", width = 15)
-	private String syPreAssembledPackingListId;
-	/**创建人*/
-  	@Excel(name = "创建人", width = 15)
-	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")
-	private Date createTime;
-	/**修改人*/
-  	@Excel(name = "修改人", width = 15)
-	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")
-	private Date updateTime;
-	/**组织*/
-  	@Excel(name = "组织", width = 15)
-	private String pkOrg;
+	/**单据号*/
+	@ApiModelProperty(value = "单据号")
+	private String documentNo;
 	/**删除状态*/
-  	@Excel(name = "删除状态", width = 15)
+	@ApiModelProperty(value = "删除状态")
 	private String delFlag;
 	/**订单号*/
-  	@Excel(name = "订单号", width = 15)
+	@ApiModelProperty(value = "订单号")
 	private String orderNumber;
 	/**款号*/
-  	@Excel(name = "款号", width = 15)
+	@ApiModelProperty(value = "款号")
 	private String itemNumber;
 	/**品名*/
-  	@Excel(name = "品名", width = 15)
+	@ApiModelProperty(value = "品名")
 	private String productName;
 	/**尺码范围*/
-  	@Excel(name = "尺码范围", width = 15)
+	@ApiModelProperty(value = "尺码范围")
 	private String sizeRange;
-	/**客户*/
-  	@Excel(name = "客户", width = 15)
-	private String customer;
 	/**客户简称*/
-  	@Excel(name = "客户简称", width = 15)
+	@ApiModelProperty(value = "客户简称")
 	private String customerAbbreviation;
+	/**总箱数*/
+	@ApiModelProperty(value = "总箱数")
+	private java.math.BigDecimal totalBoxes;
 	/**集装箱代号*/
-  	@Excel(name = "集装箱代号", width = 15)
+	@ApiModelProperty(value = "集装箱代号")
 	private String containerCode;
 	/**集装箱号*/
-  	@Excel(name = "集装箱号", width = 15)
+	@ApiModelProperty(value = "集装箱号")
 	private String containerNumber;
 	/**备注*/
-  	@Excel(name = "备注", width = 15)
+	@ApiModelProperty(value = "备注")
 	private Object memo;
 	/**成衣工厂*/
-  	@Excel(name = "成衣工厂", width = 15)
+	@ApiModelProperty(value = "成衣工厂")
 	private String garmentFactory;
 	/**外销发票号*/
-  	@Excel(name = "外销发票号", width = 15)
+	@ApiModelProperty(value = "外销发票号")
 	private String exportInvoiceNo;
-	/**u8备注*/
-  	@Excel(name = "u8备注", width = 15)
-	private Object u8Remarks;
 	/**托书号*/
-  	@Excel(name = "托书号", width = 15)
-	private String syXxxId;
+	@ApiModelProperty(value = "托书号")
+	private String shippingOrderNumber;
 	/**预托书号*/
-  	@Excel(name = "预托书号", width = 15)
-	private 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 Date preDeliveryDate;
-	/**小PO*/
-  	@Excel(name = "小PO", width = 15)
-	private String smailPo;
-	/**分销点*/
-  	@Excel(name = "分销点", width = 15)
-	private String theDistribution;
-	/**存货名称*/
-  	@Excel(name = "存货名称", width = 15)
-	private String nameOfTheInventory;
-	/**颜色*/
-  	@Excel(name = "颜色", width = 15)
-	private String color;
+	@ApiModelProperty(value = "预托书号")
+	private String depositaryReceiptNo;
 	/**采购/委外订单号*/
-  	@Excel(name = "采购/委外订单号", width = 15)
+	@ApiModelProperty(value = "采购/委外订单号")
 	private String purchase;
 	/**订单类型*/
-  	@Excel(name = "订单类型", width = 15)
+	@ApiModelProperty(value = "订单类型")
 	private String orderType;
 	/**工厂单价*/
-  	@Excel(name = "工厂单价", width = 15)
+	@ApiModelProperty(value = "工厂单价")
 	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)
+	@ApiModelProperty(value = "推送状态")
 	private String pushState;
 	/**单据状态*/
-  	@Excel(name = "单据状态", width = 15)
+	@ApiModelProperty(value = "单据状态")
 	private String theDocumentsState;
 	/**原因*/
-  	@Excel(name = "原因", width = 15)
+	@ApiModelProperty(value = "原因")
 	private String cause;
 	/**是否云工厂推送*/
-  	@Excel(name = "是否云工厂推送", width = 15)
+	@ApiModelProperty(value = "是否云工厂推送")
 	private String whetherCloudFactoryPush;
-	/**状态*/
-  	@Excel(name = "状态", width = 15)
-	private String state;
 	/**附件*/
-  	@Excel(name = "附件", width = 15)
+	@ApiModelProperty(value = "附件")
 	private String accessory;
-
-  	/*以下暂时为子表数据*/
 	/**帐套*/
 	@Excel(name = "帐套", width = 15)
 	@ApiModelProperty(value = "帐套")
@@ -160,29 +106,49 @@ public class SyPackingListTailoringVo {
 	@Excel(name = "HOD", width = 15)
 	@ApiModelProperty(value = "HOD")
 	private String hod;
-	/**STYLE NO*/
-	@Excel(name = "STYLE NO", width = 15)
-	@ApiModelProperty(value = "STYLE NO")
-	private String styleNo;
-	/**PO NO.*/
-	@Excel(name = "PO NO.", width = 15)
-	@ApiModelProperty(value = "PO NO.")
-	private 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 String itemCode;
+	/**小PO*/
+	@Excel(name = "小PO", width = 15)
+	@ApiModelProperty(value = "小PO")
+	private String smallPo;
 	/**分销点/DC/LABEL*/
 	@Excel(name = "分销点/DC/LABEL", width = 15)
 	@ApiModelProperty(value = "分销点/DC/LABEL")
 	private String distributionPoint;
-	/**PREPACK SKU*/
-	@Excel(name = "PREPACK SKU", width = 15)
-	@ApiModelProperty(value = "PREPACK SKU")
-	private String prepackSku;
-	/**total*/
-	@Excel(name = "total", width = 15)
-	@ApiModelProperty(value = "total")
-	private String total;
-	
+	/**颜色（中英文）*/
+	@Excel(name = "颜色（中英文）", width = 15)
+	@ApiModelProperty(value = "颜色（中英文）")
+	private String colour;
+	/**总件数*/
+	@Excel(name = "总件数", width = 15)
+	@ApiModelProperty(value = "总件数")
+	private java.math.BigDecimal total;
+	/**总净重*/
+	@Excel(name = "总净重", width = 15)
+	@ApiModelProperty(value = "总净重")
+	private java.math.BigDecimal totalNetWeight;
+	/**总毛重*/
+	@Excel(name = "总毛重", width = 15)
+	@ApiModelProperty(value = "总毛重")
+	private java.math.BigDecimal totalGrossWeight;
+	/**总体积*/
+	@Excel(name = "总体积", width = 15)
+	@ApiModelProperty(value = "总体积")
+	private java.math.BigDecimal totalVolume;
+	/**总价*/
+	@Excel(name = "总价", width = 15)
+	@ApiModelProperty(value = "总价")
+	private java.math.BigDecimal totalPrice;
+	/**存货名称*/
+	@Excel(name = "存货名称", width = 15)
+	@ApiModelProperty(value = "存货名称")
+	private String inventoryName;
+
+	@Excel(name = "计量单位", width = 20)
+	@ApiModelProperty(value = "计量单位")
+	private String masterMetering;
+
+	@Excel(name = "工厂单价", width = 20)
+	@ApiModelProperty(value = "工厂单价")
+	private java.math.BigDecimal factoryUnitPrice;
+
 }