内网迁移环境代码调整

@@ -42,27 +42,25 @@ public class Mawb implements Serializable {
 
 
     @ApiModelProperty(value = "进出口标志", name = "IEFlag", example = "固定值：E")
-    @NotBlank(message="参数ieFlag不能为空")
     @Column(name = "IEFLAG")
     private String ieFlag;
 
     @ApiModelProperty(value = "报关类型", name = "Type", example = "固定值：EX")
-    @NotBlank(message="参数type不能为空")
     @Column(name = "TYPE")
     private String type;
 
     @ApiModelProperty(value = "申报单位代码", name = "agentCode", example = "固定值：1111980005")
-    //@NotBlank(message="参数agentCode不能为空")
+    ////@NotBlank(message="参数agentCode不能为空")
     @Column(name = "AGENTCODE")
     private String agentCode;
 
     @ApiModelProperty(value = "申报单位名称", name = "agentName", example = "固定值：联邦快递（中国）有限公司")
-    //@NotBlank(message="参数agentName不能为空")
+    ////@NotBlank(message="参数agentName不能为空")
     @Column(name = "AGENTNAME")
     private String agentName;
 
     @ApiModelProperty(value = "提单号", name = "billNo", example = "固定值：有总单号则取值‘总单号_运单号‘，没有总单号则取值‘运单号‘")
-    @NotBlank(message="参数billNo不能为空")
+    //@NotBlank(message="参数billNo不能为空")
     @Column(name = "BILLNO")
     private String billNo;
 
@@ -71,27 +69,27 @@ public class Mawb implements Serializable {
     private String contrNo;
 
     @ApiModelProperty(value = "主管海关（申报地海关）", name = "customMaster", example = "固定值：0101")
-    @NotBlank(message="参数customMaster不能为空")
+    //@NotBlank(message="参数customMaster不能为空")
     @Column(name = "CUSTOMMASTER")
     private String customMaster;
 
     @ApiModelProperty(value = "征免性质", name = "cutMode", example = "101")
-    @NotBlank(message="参数cutMode不能为空")
+    //@NotBlank(message="参数cutMode不能为空")
     @Column(name = "CUTMODE")
     private String cutMode;
 
     @ApiModelProperty(value = "报关/转关关系标志", name = "declTrnRel", example = "固定值:0")
-    //@NotBlank(message="参数declTrnRel不能为空")
+    ////@NotBlank(message="参数declTrnRel不能为空")
     @Column(name = "DECLTRNREL")
     private String declTrnRel;
 
     @ApiModelProperty(value = "经停港/指运港", name = "distinatePort", example = "ASM000")
-    @NotBlank(message="参数distinatePort不能为空")
+    //@NotBlank(message="参数distinatePort不能为空")
     @Column(name = "DISTINATEPORT")
     private String distinatePort;
 
     @ApiModelProperty(value = "报关标志", name = "EdiId", example = "001")
-    //@NotBlank(message="参数ediId不能为空")
+    ////@NotBlank(message="参数ediId不能为空")
     @Column(name = "EDIID")
     private String ediId;
 
@@ -100,12 +98,12 @@ public class Mawb implements Serializable {
     private String entryId;
 
     @ApiModelProperty(value = "运费币制", name = "feeCurr", example = "固定值：3")
-//    @NotBlank(message="参数feeCurr不能为空")
+//    //@NotBlank(message="参数feeCurr不能为空")
     @Column(name = "FEECURR")
     private String feeCurr;
 
     @ApiModelProperty(value = "运费标记", name = "feeMark", example = "99.22")
-//    @NotBlank(message="参数feeMark不能为空")
+//    //@NotBlank(message="参数feeMark不能为空")
     @Column(name = "FEEMARK")
     private String feeMark;
 
@@ -120,7 +118,7 @@ public class Mawb implements Serializable {
     private BigDecimal grossWet;
 
     @ApiModelProperty(value = "出入境关闭", name = "IEPort", example = "固定值：0101")
-    @NotBlank(message="参数iePort不能为空")
+    //@NotBlank(message="参数iePort不能为空")
     @Column(name = "IEPORT")
     private String iePort;
 
@@ -129,7 +127,7 @@ public class Mawb implements Serializable {
     private String inputerName;
 
     @ApiModelProperty(value = "保险费币制", name = "insurCurr", example = "MOP")
-//    @NotBlank(message="参数insurCurr不能为空")
+//    //@NotBlank(message="参数insurCurr不能为空")
     @Column(name = "INSURCURR")
     private String insurCurr;
 
@@ -164,17 +162,14 @@ public class Mawb implements Serializable {
     private String otherMark;
 
     @ApiModelProperty(value = "消费使用/生产销售单位代码", name = "ownerCode", example = "Z321654987")
-    @NotBlank(message="参数ownerCode不能为空")
     @Column(name = "OWNERCODE")
     private String ownerCode;
 
     @ApiModelProperty(value = "消费使用/生产销售单位名称", name = "ownerName", example = "上海保险")
-    @NotBlank(message="参数ownerName不能为空")
     @Column(name = "OWNERNAME")
     private String ownerName;
 
     @ApiModelProperty(value = "件数", name = "packNo", example = "")
-    @NotNull(message="参数packNo不能为空")
     @Column(name = "PACKNO")
     private Integer packNo;
 
@@ -182,52 +177,49 @@ public class Mawb implements Serializable {
     private String preEntryId;
 
     @ApiModelProperty(value = "启运国/运抵国", name = "tradeCountry", example = "USA")
-    @NotBlank(message="参数tradeCountry不能为空")
     @Column(name = "TRADECOUNTRY")
     private String tradeCountry;
 
     @ApiModelProperty(value = "监管方式", name = "tradeMode", example = "0200")
-    @NotBlank(message="参数tradeMode不能为空")
     @Column(name = "TRADEMODE")
     private String tradeMode;
 
     @ApiModelProperty(value = "境内收发货人编号", name = "tradeCode", example = "Z321654987")
-    @NotBlank(message="参数tradeCode不能为空")
     @Column(name = "TRADECODE")
     private String tradeCode;
 
     @ApiModelProperty(value = "运输方式代码", name = "trafMode", example = "1")
-    @NotBlank(message="参数trafMode不能为空")
+    //@NotBlank(message="参数trafMode不能为空")
     @Column(name = "TRAFMODE")
     private String trafMode;
 
     @ApiModelProperty(value = "境内收发货人名称", name = "tradeName", example = "上海铢怡国际货物运输代理有限公司")
-    @NotBlank(message="参数tradeName不能为空")
+    //@NotBlank(message="参数tradeName不能为空")
     @Column(name = "TRADENAME")
     private String tradeName;
 
     @ApiModelProperty(value = "成交方式", name = "transMode", example = "2")
-    @NotBlank(message="参数transMode不能为空")
+    //@NotBlank(message="参数transMode不能为空")
     @Column(name = "TRANSMODE")
     private String transMode;
 
     @ApiModelProperty(value = "包装种类", name = "wrapType", example = "22")
-    @NotBlank(message="参数wrapType不能为空")
+    //@NotBlank(message="参数wrapType不能为空")
     @Column(name = "WRAPTYPE")
     private String wrapType;
 
     @ApiModelProperty(value = "生产核销单位统一信用代码---报关形式类型", name = "TradeCodeScc", example = "A74125896321456987")
-    @NotBlank(message="参数tradeCodeScc不能为空")
+    //@NotBlank(message="参数tradeCodeScc不能为空")
     @Column(name = "TRADECODESCC")
     private String tradeCodeScc;
 
     @ApiModelProperty(value = "消费使用/生产销售单位单位统一编码", name = "ownerCodeScc", example = "")
-    @NotBlank(message="参数ownerCodeScc不能为空")
+    //@NotBlank(message="参数ownerCodeScc不能为空")
     @Column(name = "OWNERCODESCC")
     private String ownerCodeScc;
 
     @ApiModelProperty(value = "贸易国别", name = "tradeAreaCode", example = "")
-    @NotBlank(message="参数tradeAreaCode不能为空")
+    //@NotBlank(message="参数tradeAreaCode不能为空")
     @Column(name = "TRADEAREACODE")
     private String tradeAreaCode;
 
@@ -236,7 +228,7 @@ public class Mawb implements Serializable {
     private String markNo;
 
     @ApiModelProperty(value = "入境口岸代码", name = "entyPortCode", example = "固定值：110101")
-    //@NotBlank(message="参数entyPortCode不能为空")
+    ////@NotBlank(message="参数entyPortCode不能为空")
     @Column(name = "ENTYPORTCODE")
     private String entyPortCode;
 
@@ -256,7 +248,7 @@ public class Mawb implements Serializable {
     private String overseasConsigneeCode;
 
     @ApiModelProperty(value = "境外收货人名称(外文)", name = "overseasConsigneeEname", example = "")
-    @NotBlank(message="参数overseasConsigneeEname不能为空")
+    //@NotBlank(message="参数overseasConsigneeEname不能为空")
     @Column(name = "OVERSEASCONSIGNEEENAME")
     private String overseasConsigneeEname;
 

@@ -34,7 +34,7 @@ public class MawbDetail implements Serializable{
     private Long mawbId;
 
     @Column(name="DETAILID")
-    @NotBlank(message="参数detailId不能为空")
+    //@NotBlank(message="参数detailId不能为空")
     private String detailId;
 
     @ApiModelProperty(value = "归类标志", example = "空值")
@@ -42,7 +42,7 @@ public class MawbDetail implements Serializable{
     private String classMark;
 
     @ApiModelProperty(value = "商品编号")
-    @NotBlank(message="参数codeTS不能为空")
+    //@NotBlank(message="参数codeTS不能为空")
     @Column(name = "CODETS")
     private String codeTS;
 
@@ -57,7 +57,7 @@ public class MawbDetail implements Serializable{
     private BigDecimal declTotal;
 
     @ApiModelProperty(value = "征免方式")
-    @NotBlank(message="参数dutyMode不能为空")
+    //@NotBlank(message="参数dutyMode不能为空")
     @Column(name = "DUTYMODE")
     private String dutyMode;
 
@@ -70,7 +70,7 @@ public class MawbDetail implements Serializable{
     private String exgVersion;
 
     @ApiModelProperty(value = "第一计量单位（法定单位）")
-    @NotBlank(message="参数firstUnit不能为空")
+    //@NotBlank(message="参数firstUnit不能为空")
     @Column(name = "FIRSTUNIT")
     private String firstUnit;
 
@@ -80,22 +80,22 @@ public class MawbDetail implements Serializable{
     private Integer firstQty;
 
     @ApiModelProperty(value = "成交计量单位")
-    @NotBlank(message="参数gunit不能为空")
+    //@NotBlank(message="参数gunit不能为空")
     @Column(name = "GUNIT")
     private String gunit;
 
     @ApiModelProperty(value = "商品规格、型号")
-    @NotBlank(message="参数gmodel不能为空")
+    //@NotBlank(message="参数gmodel不能为空")
     @Column(name = "GMODE")
     private String gmodel;
 
     @ApiModelProperty(value = "商品名称")
-    @NotBlank(message="参数gname不能为空")
+    //@NotBlank(message="参数gname不能为空")
     @Column(name = "GNAME")
     private String gname;
 
     @ApiModelProperty(value = "商品序号")
-    @NotBlank(message="参数gno不能为空")
+    //@NotBlank(message="参数gno不能为空")
     @Column(name = "GNO")
     private String gno;
 
@@ -105,7 +105,7 @@ public class MawbDetail implements Serializable{
     private BigDecimal gqty;
 
     @ApiModelProperty(value = "原产国")
-    @NotBlank(message="参数originCountry不能为空")
+    //@NotBlank(message="参数originCountry不能为空")
     @Column(name = "ORIGINCURRENTY")
     private String originCountry;
 
@@ -119,7 +119,7 @@ public class MawbDetail implements Serializable{
     private Integer secondQty;
 
     @ApiModelProperty(value = "成交币制")
-    @NotBlank(message="参数tradeCurr不能为空")
+    //@NotBlank(message="参数tradeCurr不能为空")
     @Column(name = "TRADECURR")
     private String tradeCurr;
 
@@ -136,7 +136,7 @@ public class MawbDetail implements Serializable{
     private String ciqCode;
 
     @ApiModelProperty(value = "最终目的国（地区）")
-    @NotBlank(message="参数destinationCountry不能为空")
+    //@NotBlank(message="参数destinationCountry不能为空")
     @Column(name = "DESTINATIONCOUNTRY")
     private String destinationCountry;
 
@@ -149,7 +149,7 @@ public class MawbDetail implements Serializable{
     private String destCode;
 
     @ApiModelProperty(value = "境内目的地/境内货源地")
-    @NotBlank(message="参数districtCode不能为空")
+    //@NotBlank(message="参数districtCode不能为空")
     @Column(name = "DISTRICTCODE")
     private String districtCode;