BASF接口

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.*;
 import javax.persistence.*;
 import javax.validation.Valid;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.List;
 import java.util.List;
 
 
@@ -50,7 +51,8 @@ public class Basfc implements Serializable {
 
 
     @ApiModelProperty(value = "运单ID", name = "consignmentId", example = "运单记录的唯一ID")
     @ApiModelProperty(value = "运单ID", name = "consignmentId", example = "运单记录的唯一ID")
     @Column(name = "CONSIGNMENTID")
     @Column(name = "CONSIGNMENTID")
-    @NotBlank(message="参数consignmentId不能为空！")
+    @NotNull(message="参数consignmentId不能为空！")
+//    @NotBlank(message="参数consignmentId不能为空！")
     private Long consignmentId;
     private Long consignmentId;
 
 
     @ApiModelProperty(value = "运单类型",name = "consType", example = "A/B/C/D")
     @ApiModelProperty(value = "运单类型",name = "consType", example = "A/B/C/D")

@@ -30,8 +30,8 @@ public class BasfcDetail {
     private Long basfId;
     private Long basfId;
 
 
     @Column(name="CONSIGNMENTDETAILID")
     @Column(name="CONSIGNMENTDETAILID")
-    @NotBlank(message="参数consignmentDetailId不能为空")
-    private String consignmentDetailId;
+    @NotNull(message="参数consignmentDetailId不能为空")
+    private Long consignmentDetailId;
 
 
     @ApiModelProperty(value = "商品编号")
     @ApiModelProperty(value = "商品编号")
     @NotBlank(message="参数skuCode不能为空")
     @NotBlank(message="参数skuCode不能为空")

@@ -80,7 +80,7 @@ public class BasfService {
             if (basfc.getBasfcDetailList().size()>0){
             if (basfc.getBasfcDetailList().size()>0){
                 for (BasfcDetail basfcDetail : basfc.getBasfcDetailList()){
                 for (BasfcDetail basfcDetail : basfc.getBasfcDetailList()){
                     BasfMawbDetail mawbDetail = new BasfMawbDetail();
                     BasfMawbDetail mawbDetail = new BasfMawbDetail();
-                    mawbDetail.setDetailId(basfcDetail.getConsignmentDetailId());
+                    mawbDetail.setDetailId(String.valueOf(basfcDetail.getConsignmentDetailId()));
                     mawbDetail.setGmodel(basfcDetail.getModel());
                     mawbDetail.setGmodel(basfcDetail.getModel());
                     mawbDetail.setCodeTS(basfcDetail.getSkuCode());
                     mawbDetail.setCodeTS(basfcDetail.getSkuCode());
                     mawbDetail.setGname(basfcDetail.getSkuName());
                     mawbDetail.setGname(basfcDetail.getSkuName());