Merge remote-tracking branch 'refs/remotes/origin/dev' into nanguangmall

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/constant/ServiceNameConstants.java

@@ -24,6 +24,8 @@ public class ServiceNameConstants
 
     public static final String USER_CENTER = "mhd-userCenter-service";
 
+   // public static final String USER_CENTER = "http://192.168.0.28:8007";
+
     public static final String TRANSPORT_CENTER = "mhd-transport-service";
 
     public static final String PRODUCT_CENTER = "mhd-product-service";

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java

@@ -226,4 +226,11 @@ public class ReconciliationDTO extends BaseVOEntity{
 
     @ApiModelProperty(value = "运单发票开具状态（0-未索取，1-已索取，2-已开票，3-部分索取）")
     private Integer isInvoice;
+
+    @ApiModelProperty("nc同步状态 0-未同步 1-已同步")
+    private Integer synchronousStatus;
+
+    @ApiModelProperty("nc同步状态 0-未同步 1-已同步")
+    private Integer skSynchronousStatus;
+
 }

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/SKbill.java

@@ -0,0 +1,18 @@
+package com.mhd.common.core.domain.dto.nc;
+
+import lombok.Data;
+
+import javax.xml.bind.annotation.*;
+
+@Data
+@XmlRootElement(name = "bill")
+@XmlAccessorType(XmlAccessType.FIELD) // 使用字段访问策略
+@XmlType(propOrder = {"billhead"})
+public class SKbill {
+    @XmlAttribute(name = "id")
+    private String id;
+
+    @XmlElement(name = "billhead")
+    private SKbillhead billhead;
+}
+

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/SKbillhead.java

@@ -0,0 +1,86 @@
+package com.mhd.common.core.domain.dto.nc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.xml.bind.annotation.*;
+
+@Data
+@XmlRootElement(name = "billhead")
+@XmlAccessorType(XmlAccessType.FIELD) // 使用字段访问策略
+@XmlType(propOrder = {"pk_group","pk_org","sett_org","creationtime","creator","pk_billtype","pk_tradetype","billyear"
+        ,"billclass","isinit","syscode","billdate","billno","src_syscode","billstatus","billmaker","def28","def29","def59","pk_busitype","billperiod","effectstatus","bodys"})
+public class SKbillhead {
+    @ApiModelProperty( "")
+    private String pk_group;
+
+    @ApiModelProperty( "")
+    private String pk_org;
+
+    @ApiModelProperty( "")
+    private String sett_org;
+
+
+    @ApiModelProperty( "")
+    private String creationtime;
+
+    @ApiModelProperty( "")
+    private String creator;
+
+    @ApiModelProperty( "")
+    private String pk_billtype;
+
+    @ApiModelProperty( "")
+    private String pk_tradetype;
+
+    @ApiModelProperty( "")
+    private String billclass;
+
+    @ApiModelProperty( "")
+    private String isinit;
+
+
+    @ApiModelProperty( "")
+    private String syscode;
+
+    @ApiModelProperty( "")
+    private String billdate;
+
+    @ApiModelProperty( "")
+    private String billno;
+
+    @ApiModelProperty( "")
+    private String src_syscode;
+
+    @ApiModelProperty( "")
+    private String billstatus;
+
+
+    @ApiModelProperty( "")
+    private String billmaker;
+
+    @ApiModelProperty( "")
+    private String def28;
+
+    @ApiModelProperty( "")
+    private String def29;
+
+    @ApiModelProperty( "")
+    private String def59;
+
+
+    @ApiModelProperty( "")
+    private String pk_busitype;
+
+    @ApiModelProperty( "")
+    private String billyear;
+
+    @ApiModelProperty( "")
+    private String billperiod;
+
+    @ApiModelProperty( "")
+    private String effectstatus;
+
+    @XmlElement(name = "bodys")
+    private SKbodys bodys;
+}

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/SKbodys.java

@@ -0,0 +1,16 @@
+package com.mhd.common.core.domain.dto.nc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.xml.bind.annotation.*;
+import java.util.List;
+
+@Data
+@XmlRootElement(name = "bodys")
+@XmlAccessorType(XmlAccessType.FIELD) // 使用字段访问策略
+@XmlType(propOrder = {"item"})
+public class SKbodys {
+    @XmlElement(name = "item")
+    private List<SKitem> item;
+}

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/SKitem.java

@@ -0,0 +1,70 @@
+package com.mhd.common.core.domain.dto.nc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@Data
+@XmlRootElement(name = "item")
+public class SKitem {
+    @ApiModelProperty( "")
+    private String pk_deptid;
+    @ApiModelProperty( "")
+    private String so_deptid;
+
+    @ApiModelProperty( "")
+    private String pk_psndoc;
+
+    @ApiModelProperty( "")
+    private String customer;
+
+    @ApiModelProperty( "")
+    private String checkdirection;
+
+    @ApiModelProperty( "")
+    private String purchaseorder;
+
+
+    @ApiModelProperty( "")
+    private String objtype;
+
+    @ApiModelProperty( "")
+    private String direction;
+
+    @ApiModelProperty( "")
+    private String scomment;
+
+    @ApiModelProperty( "")
+    private String pk_currtype;
+
+    @ApiModelProperty( "")
+    private String recaccount;
+
+    @ApiModelProperty( "")
+    private String money_cr;
+
+
+    @ApiModelProperty( "")
+    private String money_bal;
+
+    @ApiModelProperty( "")
+    private String notax_cr;
+
+
+    @ApiModelProperty( "")
+    private String invoiceno;
+
+
+
+    @ApiModelProperty( "")
+    private String prepay;
+
+    @ApiModelProperty( "")
+    private String subjcode;
+
+    @ApiModelProperty( "")
+    private String def65;
+}

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/SKufinterface.java

@@ -0,0 +1,48 @@
+package com.mhd.common.core.domain.dto.nc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.xml.bind.annotation.*;
+
+@Data
+@XmlRootElement(name = "ufinterface")
+@XmlAccessorType(XmlAccessType.FIELD) // 使用字段访问策略
+@XmlType(propOrder = {"bill"})
+public class SKufinterface {
+    @XmlAttribute(name = "account")
+
+    private String account;
+    @XmlAttribute(name = "billtype")
+
+    private String billtype;
+    @XmlAttribute(name = "businessunitcode")
+
+    private String businessunitcode;
+    @XmlAttribute(name = "filename")
+
+    private String filename;
+    @XmlAttribute(name = "groupcode")
+
+    private String groupcode;
+    @XmlAttribute(name = "isexchange")
+
+    private String isexchange;
+    @XmlAttribute(name = "orgcode")
+
+    private String orgcode;
+    @XmlAttribute(name = "receiver")
+
+    private String receiver;
+    @XmlAttribute(name = "replace")
+
+    private String replace;
+    @XmlAttribute(name = "roottag")
+
+    private String roottag;
+    @XmlAttribute(name = "sender")
+
+    private String sender;
+    @XmlElement(name = "bill")
+    private com.mhd.common.core.domain.dto.nc.SKbill bill;
+}

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysbill.java

@@ -0,0 +1,18 @@
+package com.mhd.common.core.domain.dto.nc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.xml.bind.annotation.*;
+
+@Data
+@XmlRootElement(name = "bill")
+@XmlAccessorType(XmlAccessType.FIELD) // 使用字段访问策略
+@XmlType(propOrder = {"billhead"})
+public class Ysbill {
+    @XmlAttribute(name = "id")
+    private String id;
+
+    @XmlElement(name = "billhead")
+    private Ysbillhead billhead;
+}

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysbillhead.java

@@ -0,0 +1,86 @@
+package com.mhd.common.core.domain.dto.nc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.xml.bind.annotation.*;
+
+@Data
+@XmlRootElement(name = "billhead")
+@XmlAccessorType(XmlAccessType.FIELD) // 使用字段访问策略
+@XmlType(propOrder = {"pk_group","pk_org","sett_org","creationtime","creator","pk_billtype","pk_tradetype","billyear"
+,"billclass","isinit","syscode","billdate","billno","src_syscode","billstatus","billmaker","def28","def29","def59","pk_busitype","billperiod","effectstatus","bodys"})
+public class Ysbillhead {
+    @ApiModelProperty( "")
+    private String pk_group;
+
+    @ApiModelProperty( "")
+    private String pk_org;
+
+    @ApiModelProperty( "")
+    private String sett_org;
+
+
+    @ApiModelProperty( "")
+    private String creationtime;
+
+    @ApiModelProperty( "")
+    private String creator;
+
+    @ApiModelProperty( "")
+    private String pk_billtype;
+
+    @ApiModelProperty( "")
+    private String pk_tradetype;
+
+    @ApiModelProperty( "")
+    private String billclass;
+
+    @ApiModelProperty( "")
+    private String isinit;
+
+
+    @ApiModelProperty( "")
+    private String syscode;
+
+    @ApiModelProperty( "")
+    private String billdate;
+
+    @ApiModelProperty( "")
+    private String billno;
+
+    @ApiModelProperty( "")
+    private String src_syscode;
+
+    @ApiModelProperty( "")
+    private String billstatus;
+
+
+    @ApiModelProperty( "")
+    private String billmaker;
+
+    @ApiModelProperty( "")
+    private String def28;
+
+    @ApiModelProperty( "")
+    private String def29;
+
+    @ApiModelProperty( "")
+    private String def59;
+
+
+    @ApiModelProperty( "")
+    private String pk_busitype;
+
+    @ApiModelProperty( "")
+    private String billyear;
+
+    @ApiModelProperty( "")
+    private String billperiod;
+
+    @ApiModelProperty( "")
+    private String effectstatus;
+
+    @XmlElement(name = "bodys")
+    private Ysbodys bodys;
+}

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysbodys.java

@@ -0,0 +1,16 @@
+package com.mhd.common.core.domain.dto.nc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.xml.bind.annotation.*;
+import java.util.List;
+
+@Data
+@XmlRootElement(name = "bodys")
+@XmlAccessorType(XmlAccessType.FIELD) // 使用字段访问策略
+@XmlType(propOrder = {"item"})
+public class Ysbodys {
+    @XmlElement(name = "item")
+    private List<Ysitem> item;
+}

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysitem.java

@@ -0,0 +1,87 @@
+package com.mhd.common.core.domain.dto.nc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@Data
+@XmlRootElement(name = "item")
+public class Ysitem {
+    @ApiModelProperty( "")
+    private String pk_deptid;
+    @ApiModelProperty( "")
+    private String so_deptid;
+
+    @ApiModelProperty( "")
+    private String pk_psndoc;
+
+    @ApiModelProperty( "")
+    private String customer;
+
+    @ApiModelProperty( "")
+    private String purchaseorder;
+
+    @ApiModelProperty( "")
+    private String objtype;
+
+    @ApiModelProperty( "")
+    private String direction;
+
+    @ApiModelProperty( "")
+    private String scomment;
+
+    @ApiModelProperty( "")
+    private String pk_currtype;
+
+    @ApiModelProperty( "")
+    private String taxrate;
+
+    @ApiModelProperty( "")
+    private String quantity_de;
+
+    @ApiModelProperty( "")
+    private String money_de;
+
+
+    @ApiModelProperty( "")
+    private String money_bal;
+
+    @ApiModelProperty( "")
+    private String notax_de;
+
+    @ApiModelProperty( "")
+    private String tax_de;
+
+    @ApiModelProperty( "")
+    private String local_tax_de;
+
+    @ApiModelProperty( "")
+    private String price;
+
+    @ApiModelProperty( "")
+    private String taxprice;
+
+    @ApiModelProperty( "")
+    private String invoiceno;
+
+    @ApiModelProperty( "")
+    private String recaccount;
+
+
+    @ApiModelProperty( "")
+    private String prepay;
+
+    @ApiModelProperty( "")
+    private String subjcode;
+
+    @ApiModelProperty( "")
+    private String def65;
+
+    @ApiModelProperty( "")
+    private String def75;
+
+
+}

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysufinterface.java

@@ -0,0 +1,48 @@
+package com.mhd.common.core.domain.dto.nc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.xml.bind.annotation.*;
+
+@Data
+@XmlRootElement(name = "ufinterface")
+@XmlAccessorType(XmlAccessType.FIELD) // 使用字段访问策略
+@XmlType(propOrder = {"bill"})
+public class Ysufinterface {
+    @XmlAttribute(name = "account")
+
+    private String account;
+    @XmlAttribute(name = "billtype")
+
+    private String billtype;
+    @XmlAttribute(name = "businessunitcode")
+
+    private String businessunitcode;
+    @XmlAttribute(name = "filename")
+
+    private String filename;
+    @XmlAttribute(name = "groupcode")
+
+    private String groupcode;
+    @XmlAttribute(name = "isexchange")
+
+    private String isexchange;
+    @XmlAttribute(name = "orgcode")
+
+    private String orgcode;
+    @XmlAttribute(name = "receiver")
+
+    private String receiver;
+    @XmlAttribute(name = "replace")
+
+    private String replace;
+    @XmlAttribute(name = "roottag")
+
+    private String roottag;
+    @XmlAttribute(name = "sender")
+
+    private String sender;
+    @XmlElement(name = "bill")
+    private com.mhd.common.core.domain.dto.nc.Ysbill bill;
+}

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/TmsOrder.java

@@ -0,0 +1,525 @@
+package com.mhd.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description: 货源表
+ * @Author: lfs
+ * @Date:   2020-02-14 09:49:27
+ * @Version: V1.0
+ */
+@Data
+@TableName("tms_order")
+public class TmsOrder implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	@TableId(type = IdType.ID_WORKER_STR)
+    private String id;
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    @ApiModelProperty(value = "创建日期")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date createTime;
+    @ApiModelProperty(value = "货源单创建企业ID")
+    private String createCompanyId;
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    @ApiModelProperty(value = "更新日期")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date updateTime;
+    @ApiModelProperty(value = "所属部门")
+
+    private String sysOrgCode;
+    @ApiModelProperty(value = "货源单号")
+
+    private String goodsNumber;
+//    @ApiModelProperty(value = "线路名称ID")
+//	@Excel(name = "线路名称ID", width = 15)
+//    private java.lang.String lineNameId;
+//    @ApiModelProperty(value = "线路名称")
+//	@Excel(name = "线路名称", width = 15)
+//    private java.lang.String lineName;
+//    @ApiModelProperty(value = "运距,距离，里程（千米）")
+//	@Excel(name = "运距（千米）", width = 15)
+//    private BigDecimal haulDistance;
+    @ApiModelProperty(value = "装货地名称")
+    private String loadingName;
+    @ApiModelProperty(value = "装货地县区编码")
+    private String loadingAreaId;
+    @ApiModelProperty(value = "装货地详细地址")
+    private String loadingAddress;
+    @ApiModelProperty(value = "装货地经度")
+    private String loadingLongitude;
+    @ApiModelProperty(value = "装货地纬度")
+    private String loadingLatitude;
+    @ApiModelProperty(value = "装货单位")
+    private String loadingUnit;
+    @ApiModelProperty(value = "发货人姓名")
+    private String freighterName;
+    @ApiModelProperty(value = "装货电话")
+    private String loadingPhone;
+    @ApiModelProperty(value = "装货时间日期（年月日）")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private java.util.Date loadingDate;
+//    @ApiModelProperty(value = "装货时间（上午、下午、24小时）")
+//	@Excel(name = "装货时间（上午、下午、24小时）", width = 15)
+//    private java.lang.String loadingTime;
+//    @ApiModelProperty(value = "装货时间id")
+//	@Excel(name = "装货时间id", width = 15)
+//    private java.lang.String loadingTimeId;
+    @ApiModelProperty(value = "卸货地名称")
+    private String unloadName;
+    @ApiModelProperty(value = "卸货地县区编码")
+    private String unloadAreaId;
+    @ApiModelProperty(value = "卸货地详细地址")
+    private String unloadAddress;
+    @ApiModelProperty(value = "卸货地经度")
+    private String unloadLongitude;
+    @ApiModelProperty(value = "卸货地纬度")
+    private String unloadLatitude;
+//    @ApiModelProperty(value = "卸货单位")
+//    private java.lang.String unloadUnit ;
+//    @ApiModelProperty(value = "收货人身份证号")
+//    private java.lang.String unloadIdentificationNumber;
+    @ApiModelProperty(value = "收货人姓名")
+    private String dischargerName ;
+    @ApiModelProperty(value = "卸货电话")
+    private String unloadPhone ;
+    @ApiModelProperty(value = "卸货时间日期（年月日）")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private java.util.Date unloadingData;
+//    @ApiModelProperty(value = "卸货时间（上午、下午、24小时）")
+//	@Excel(name = "卸货时间（上午、下午、24小时）", width = 15)
+//    private java.lang.String unloadingTime;
+//    @ApiModelProperty(value = "卸货时间id")
+//	@Excel(name = "卸货时间id", width = 15)
+//    private java.lang.String unloadingTimeId ;
+    @ApiModelProperty(value = "货物名称ID")
+    private String goodsNameId ;
+    @ApiModelProperty(value = "货物大类型")
+    private String goodsType ;
+    @ApiModelProperty(value = "货物小类型")
+    private String goodsName ;
+    @ApiModelProperty(value = "重量小（吨）")
+    private BigDecimal weightMin;
+//    @ApiModelProperty(value = "货物重量")
+//    private BigDecimal goodsWeight;
+    @ApiModelProperty(value = "货物数量单位（吨/方/件）")
+    private String goodsUntis ;
+    @ApiModelProperty(value = "货物数量单位（吨/方/件）id",required = true)
+    private String goodsUntisId ;
+    @ApiModelProperty(value = "配载方式ID（0-数量，1-车次）")
+    private Integer transportationModeId;
+    @ApiModelProperty(value = "配载方式名称")
+    private String transportationName ;
+    @ApiModelProperty(value = "车型车长ID")
+    private String carType ;
+    @ApiModelProperty(value = "车型车长名称")
+    private String carTypeName ;
+    @ApiModelProperty(value = "承运方ID")
+    private String appointDriverEnterpriseId;
+    @ApiModelProperty(value = "承运方名称")
+    private String appointDriverEnterprise;
+//    @ApiModelProperty(value = "指定司机ID")
+//	@Excel(name = "指定司机ID", width = 15)
+//    private java.lang.String appointDriverId;
+//    @ApiModelProperty(value = "指定司机姓名")
+//	@Excel(name = "指定司机姓名", width = 15)
+//    private java.lang.String appointDriver ;
+//    @ApiModelProperty(value = "指定司机电话")
+//	@Excel(name = "指定司机电话", width = 15)
+//    private java.lang.String appointDriverPhone ;
+//    @ApiModelProperty(value = "指定司机车牌号")
+//	@Excel(name = "指定司机车牌号", width = 15)
+//    private java.lang.String appointDriverLicense ;
+    @ApiModelProperty(value = "服务要求ID")
+    private String serviceRequireId ;
+    @ApiModelProperty(value = "服务要求名称")
+    private String serviceRequire ;
+    @ApiModelProperty(value = "备注")
+    private String remarks ;
+//    @ApiModelProperty(value = "上游客户ID")
+//	@Excel(name = "上游客户ID", width = 15)
+//    private java.lang.String upstreamCustomersId ;
+//    @ApiModelProperty(value = "上游客户姓名")
+//	@Excel(name = "上游客户姓名", width = 15)
+//    private java.lang.String upstreamCustomersName ;
+//    @ApiModelProperty(value = "上游客户电话")
+//	@Excel(name = "上游客户电话", width = 15)
+//    private java.lang.String upstreamCustomersPhone ;
+//    @ApiModelProperty(value = "运单类型（0-普货、1-批量货、2-撮合货、3-客服运单，4-线下运单）")
+//	@Excel(name = "运单类型（0-普货、1-批量货、2-撮合货、3-客服运单，4-线下运单）", width = 15)
+//    private java.lang.Integer waybillType;
+    @ApiModelProperty(value = "运单来源（0-后台发布、1-app发布、2-导入）")
+    private Integer waybillFrom;
+//    @ApiModelProperty(value = "期望运费")
+//    @Excel(name = "期望运费", width = 15)
+//    private java.math.BigDecimal freightHope;
+    @ApiModelProperty(value = "货源是否关闭（0-否，1-是）")
+    private Integer isSource;
+//    @ApiModelProperty(value = "货源是否被接单（0-否，1-是）")
+//	@Excel(name = "货源是否被接单（0-否，1-是）", width = 15)
+//    private java.lang.Integer isOrder;
+    @ApiModelProperty(value = "货源关闭时间")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private java.util.Date sourceCloseTime;
+    @ApiModelProperty(value = "货源关闭人用户ID")
+    private String executorId;
+    @ApiModelProperty(value = "是否删除（0-否，1-是）")
+    private Integer isDelete;
+    @ApiModelProperty(value = "货物类型ID")
+    private String goodsTypeId ;
+    @ApiModelProperty(value = "货运线路（装货市县）")
+    private String lineTitleLeft ;
+    @ApiModelProperty(value = "货运线路（卸货市县）")
+    private String lineTitleRight ;
+    @ApiModelProperty(value = "是否为常发货源（0-否，1-是）")
+    private Integer isCommon;
+//    @ApiModelProperty(value = "占用车长")
+//    @Excel(name = "占用车长", width = 15)
+//    private String occupyConductor ;
+//    @ApiModelProperty(value = " 货源信息上报:0-未上报，1-已上报，2-上报失败")
+//    private Integer isOrderReporting;
+//    @ApiModelProperty(value = "货源信息上报时间")
+//    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    private java.util.Date orderReportingTime;
+//    @ApiModelProperty(value = "货源信息上报失败原因")
+//    private java.lang.String orderReportingErr ;
+    @ApiModelProperty(value = "审核状态")
+    private Integer auditStatus;
+    @ApiModelProperty(value = "运单模式(0-普通模式,1-竞价模式)")
+    private Integer waybillMode;
+    @ApiModelProperty(value = "竞价截止时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date latestBiddingTime;
+    @ApiModelProperty(value = "竞价单位（元/车，元/吨）")
+    private String biddingUnit;
+    @ApiModelProperty(value = "审核人")
+    private String auditBy;
+    @ApiModelProperty(value = "发货运费")
+    private BigDecimal deliveryFreight;
+    @ApiModelProperty(value = "审核时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date auditTime;
+    @ApiModelProperty(value = "业务类型")
+    private String businessType ;
+    @ApiModelProperty(value = "运费单价（元/吨）")
+    private BigDecimal transportationUnitPrice  ;
+    @ApiModelProperty(value = "结算方式，1-按趟结算，2-按数量结算")
+    private Integer radioValue;
+    @ApiModelProperty(value = "创建人姓名")
+    private String createrName ;
+    @ApiModelProperty(value = "创建人电话")
+    private String createrPhone ;
+//    @ApiModelProperty(value = "赫达订单号")
+//    private String orderNumber ;
+//    @ApiModelProperty(value = "是否长期货源：0-否，1-是")
+//    private Integer isLongOrder;
+    @ApiModelProperty(value = "是否使用电子围栏:0-否,1-是")
+    private Integer isElectricFence;
+
+    @ApiModelProperty(value = "微信小程序图片地址")
+    private String wxaQrcode ;
+
+//    @ApiModelProperty(value = "运单服务费率")
+//    private java.math.BigDecimal serviceRate;
+
+//    @ApiModelProperty(value = "代运营人员用户ID")
+//    private String orderAgentUserId ;
+    @ApiModelProperty(value = "委托方编号")
+    private String appointShipperId;
+//    @ApiModelProperty(value = "指定平台公司")
+//    private String appointCompanyId;
+//    @ApiModelProperty(value = "指定平台公司名称")
+//    private String appointCompanyName;
+    @ApiModelProperty(value = "平台员工创建人id")
+    private String createUserId;
+    @ApiModelProperty(value = "委托方")
+    private String appointShipper;
+//    @ApiModelProperty(value = "指定车辆ID")
+//    private String appointVehicleId;
+//    @ApiModelProperty(value = "是否卸货完成(0:否,1:是)")
+//    private Integer isUnload;
+//    @ApiModelProperty(value = "指定车辆设备号")
+//    private String appointVehicleDevice;
+
+//    @ApiModelProperty(value = "发布货源方式 0-未指定;1-企业货源;2-平台货源")
+//    private Integer publishOrderType;
+
+//    /**是否开启路耗（0-否 1-是）*/
+//    @ApiModelProperty(value = "是否开启路耗（0-否 1-是）")
+//    @Excel(name = "是否开启路耗（0-否 1-是）", width = 15)
+//    private Integer isRoadLoss;
+//    /**货物价值(元/吨)*/
+//    @ApiModelProperty(value = "货物价值(元/吨)")
+//    @Excel(name = "货物价值(元/吨)", width = 15)
+//    private BigDecimal goodsValue  ;
+//    /**路耗模式（0-按比例% 1-按数量(吨)）*/
+//    @ApiModelProperty(value = "路耗模式（0-按比例% 1-按数量(吨)）")
+//    @Excel(name = "路耗模式（0-按比例% 1-按数量(吨)）", width = 15)
+//    private Integer roadLossMode;
+//    /**路耗结算方式(0-无 1-取装货重量 2-取卸货重量 3-装卸货取大 4-装卸货取小)*/
+//    @ApiModelProperty(value = "路耗结算方式(0-无 1-取装货重量 2-取卸货重量 3-装卸货取大 4-装卸货取小)")
+//    @Excel(name = "路耗结算方式(0-无 1-取装货重量 2-取卸货重量 3-装卸货取大 4-装卸货取小)", width = 15)
+//    private Integer roadLossSettlementMethod;
+
+//    /**允许货物亏损*/
+//    @ApiModelProperty(value = "允许货物亏损（吨或%）")
+//    @Excel(name = "允许货物亏损（吨或%）", width = 15)
+//    private BigDecimal allowableLoss  ;
+
+//    /**超出亏损扣除金额（元/吨)*/
+//    @ApiModelProperty(value = "超出亏损扣除金额（元/吨)")
+//    @Excel(name = "超出亏损扣除金额（元/吨)", width = 15)
+//    private BigDecimal lossDeductionAmount  ;
+//    @ApiModelProperty(value = "上游客户id")
+//    @Excel(name = "上游客户id", width = 15)
+//    private String upClientId;
+
+    @ApiModelProperty(value = "货单二维码图片地址")
+    private String qrCodeImgUrl;
+
+//    @ApiModelProperty(value = "运费抹零 0-不抹零 ，1-抹零小数位，2-抹零个位，3-抹零十位")
+//    private Integer isFreightNullification ;
+
+//    /**回单付金额*/
+//    @ApiModelProperty(value = "回单付金额")
+//    @Excel(name = "回单付金额", width = 15)
+//    private BigDecimal receiptPaymentAmount  ;
+//    /**预付运费金额*/
+//    @ApiModelProperty(value = "预付现金金额")
+//    @Excel(name = "预付现金金额", width = 15)
+//    private BigDecimal cashAdvance  ;
+//    /**到付运费金额*/
+//    @ApiModelProperty(value = "到付运费金额")
+//    @Excel(name = "到付运费金额", width = 15)
+//    private BigDecimal freightAmount  ;
+//    /**预付平台油卡金额*/
+//    @ApiModelProperty(value = "预付平台油卡金额")
+//    @Excel(name = "预付平台油卡金额", width = 15)
+//
+//
+//    private BigDecimal oilCardOnline  ;
+//    @ApiModelProperty(value = "是否协议费用生成：0否 1是")
+//    private Integer isAutoGenerateProtocol;
+
+//    /**单车重量*/
+//    @ApiModelProperty(value = "单车重量",required = true)
+//    private java.math.BigDecimal singleVehicleWeight;
+//
+//    /**单车总费用*/
+//    @ApiModelProperty(value = "单车总费用")
+//    @Excel(name = "单车总费用", width = 15)
+//    private BigDecimal freightGross  ;
+//
+//    @ApiModelProperty(value = "是否允许接多单：0否 1是")
+//    private Integer isMultipleOrdersAllowed;
+
+    @ApiModelProperty(value = "发货备注")
+    private String shippingNote;
+
+    @ApiModelProperty(value = "运单事实创建人ID(创建运单时的当前登录人USER-ID)")
+    private String realCreateBy;
+
+    @ApiModelProperty(value = "运单事实创建人名称(创建运单时的当前登录人REAL-NAME)")
+    private String realCreateName;
+
+//    @ApiModelProperty(value = "涨吨是否计算费用  0-否 1-是 ")
+//    private Integer isTonnageIncreaseCharge;
+
+    @ApiModelProperty("应收结算类型：1-月结，2-现结")
+    private Integer receivableType;
+//
+//    @ApiModelProperty(value = "订单类型：0-自有订单，1-tms订单")
+//    private Integer orderType;
+
+    @ApiModelProperty(value = "第三方订单号")
+    private String thirdPartyOrderNumber;
+
+    @ApiModelProperty(value = "调度单单号")
+    private String dispatchOrderNumber;
+
+    @ApiModelProperty(value = "作废订单备注")
+    private String cancelOrderRemark;
+
+//    @ApiModelProperty("项目表ID")
+//    private Long projectManagementId;
+
+    @ApiModelProperty(value = "接单司机ID")
+    private String orderDriverId;
+
+    @ApiModelProperty(value = "货物数量")
+    private String goodsQuantity;
+    @ApiModelProperty(value = "货物数量单位code")
+    private String goodsQuantityUnitId;
+    @ApiModelProperty(value = "货物数量单位")
+    private String goodsQuantityUnit;
+
+    @ApiModelProperty(value = "拼单类型（0-不拼单(主单)，1-拼单-子单，2-拼单-合单）")
+    private Integer splicingOrderType;
+
+    @ApiModelProperty(value = "拼单发布状态（0-否，1-是）")
+    private Integer splicingStatus;
+
+    @ApiModelProperty(value = "拼单主单id")
+    private String mainOrderId;
+
+    @ApiModelProperty(value = "拼单主单号")
+    private String mainOrderNum;
+
+    @ApiModelProperty(value = "拼单合单id")
+    private String mergeOrderId;
+
+    @ApiModelProperty(value = "拼单合单号")
+    private String mergeOrderNum;
+
+
+    //=================批量货派单相关=============================
+//    @ApiModelProperty(value = "需求车次")
+//    private Integer demandTrainNumber;
+//    @ApiModelProperty(value = "承运车次默认0")
+//    private Integer carriageNumber;
+//    @ApiModelProperty(value = "剩余需求车次")
+//    private Integer remainingDemandTrainNumber;
+
+    /**货物重量*/
+    @ApiModelProperty(value = "重量大（吨）")
+    private BigDecimal weightMax;
+//    @ApiModelProperty(value = "货源剩余货物数量")
+//    private BigDecimal residueGoodsWeight;
+//    @ApiModelProperty(value = "承运货物数量")
+//    private BigDecimal transportGoodsWeight;
+
+    @ApiModelProperty(value = "订单状态（1-未审核，2-未通过，3-进行中，4-已完成，5-已关闭）")
+    //新逻辑：1-未调度、2-未派车、3-未入厂、4-已入厂、5-已装车、6-已卸车、7-已上传、8-已签收、9-已关闭
+    private Integer orderStatus;
+
+//    @ApiModelProperty(value = "多装多卸类型")
+//    private String layType;
+//    @ApiModelProperty(value = "来源系统")
+//    private String orderSource;
+
+//    @ApiModelProperty(value = "通知单号")
+//    private String noticeNumber;
+//
+//    @ApiModelProperty(value = "司机税率")
+//    private BigDecimal driverTaxRate;
+//
+//    @ApiModelProperty(value = "tms到付运费金额")
+//    private BigDecimal tmsFreightAmount;
+
+
+
+
+
+//========================================新增字段==========================================
+    @ApiModelProperty(value = "付款方类型（0-委托方，1-收货方）")
+    private Integer payerType;
+
+    @ApiModelProperty(value = "收货方编码")
+    private String recipientId;
+    @ApiModelProperty(value = "收货方")
+    private String recipientName;
+
+    @ApiModelProperty(value = "整机编号")
+    private String machineNumber;
+
+    @ApiModelProperty(value = "是否库存（0-是，1-否）")
+    private Integer stockFlag;
+
+    @ApiModelProperty(value = "信息费")
+    private BigDecimal infoFee;
+    @ApiModelProperty(value = "信息费收款方方式")
+    private Integer infoFeePayeeType;
+    @ApiModelProperty(value = "信息费收款方")
+    private String infoFeePayee;
+    @ApiModelProperty(value = "信息费支付状态：PayStatusEnum")
+    private Integer infoFeeStatus;
+    @ApiModelProperty(value = "信息费应付单据号")
+    private String infoFeeDocumentNumber;
+    @ApiModelProperty(value = "订单类型（1-机械运输，2-大件运输，3-罐车运输，4-济南专线，5-江西专线）")
+    private Integer orderShippingType;
+
+    @ApiModelProperty(value = "订单结算状态：1未出账、2已出账、3部分结算、4已结算")
+    private Integer settlementStatus;
+
+    @ApiModelProperty(value = "订单运费结算时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date settlementTime;
+
+    @ApiModelProperty(value = "出账时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date paymentTime;
+
+    @ApiModelProperty(value = "应收对账单-单号")
+    private String reconciliationInnerNumber;
+
+    @ApiModelProperty(value = "已收运费")
+    private BigDecimal collectedFreight;
+    @ApiModelProperty(value = "未收运费")
+    private BigDecimal uncollectedFreight;
+    @ApiModelProperty(value = "少收运费")
+    private BigDecimal collectLessFreight;
+
+    @ApiModelProperty(value = "运单发票开具状态（0-未索取，1-已索取，2-已开票，3-部分索取）")
+    private Integer isInvoice;
+
+
+    @ApiModelProperty(value = "发票表ID")
+    private String invoiceId;
+
+    @ApiModelProperty(value = "车辆类型Id")
+    private String vehicleTypeId;
+
+    @ApiModelProperty(value = "车辆类型名称")
+    private String vehicleTypeName;
+
+    @ApiModelProperty(value = "承运人Id(订单为济南专线使用)")
+    private String carrier;
+
+    @ApiModelProperty(value = "承运人姓名(订单为济南专线使用)")
+    private String carrierName;
+
+    @ApiModelProperty(value = "数字物流平台用户Id")
+    private Long szwlUserId;
+
+    @ApiModelProperty("运费单价")
+    private BigDecimal freightUnitPrice;
+
+    @ApiModelProperty(value = "竞价状态 0-竞价中,1-已完成,2-已关闭")
+    private Integer biddingStatus;
+
+    @ApiModelProperty(value = "竞价备注")
+    private String biddingRemarks;
+
+    @ApiModelProperty(value = "货物保险金额")
+    private BigDecimal cargoInsuranceAmount;
+
+    @ApiModelProperty(value = "目的地")
+    private String destination;
+
+    @ApiModelProperty("运费")
+    private BigDecimal freightCharges;
+
+    @ApiModelProperty(value = "付款方名称")
+    private String payer;
+}

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java

@@ -214,4 +214,10 @@ public class UserPo {
 
     @ApiModelProperty(name = "有效期管理  0-否  1-是")
     private Integer validityPeriodManagement;
+
+    @ApiModelProperty(name = "业务员nc编码")
+    private String salespersonNcCode;
+
+    @ApiModelProperty(name = "制单员nc编码")
+    private String documentPreparerNcCode;
 }

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserShipperPo.java

@@ -206,4 +206,7 @@ public class UserShipperPo {
     private Integer monthlySettlementFlag;
     @ApiModelProperty(name = "货源单自动审核（1-是 2-否）")
     private Integer isAutoAuditOrder;
+
+    @ApiModelProperty(name = "客户nc编码")
+    private String customerNcCode;
 }