oms发单

mhd_oms/src/main/java/com/mhd/oms/domain/resevationOrder/entity/ReservationAddressMulti.java

@@ -0,0 +1,67 @@
+package com.mhd.oms.domain.resevationOrder.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author: brb
+ * @description:
+ * @create: 2026-01-27 09:09
+ */
+@Data
+public class ReservationAddressMulti {
+
+
+    @ApiModelProperty(value = "ID")
+    private String id;
+    @ApiModelProperty(value = "组织表ID")
+    private Long organizationId;
+    @ApiModelProperty(value = "组织名称")
+    private String organizationName;
+    @ApiModelProperty(value = "一级组织表ID")
+    private Long topOrganizationId;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    @ApiModelProperty(value = "创建人用户ID")
+    private Long createBy;
+    @ApiModelProperty(value = "创建人姓名")
+    private String createByName;
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+    @ApiModelProperty(value = "修改人用户ID")
+    private Long updateBy;
+    @ApiModelProperty(value = "修改人姓名")
+    private String updateByName;
+    @ApiModelProperty(value = "删除标记：0-无状态，1-正常，2-已删除")
+    private Integer delFlag;
+    @ApiModelProperty(value = "货源单ID")
+    private String orderId;
+    @ApiModelProperty(value = "装卸货地县区编码")
+    private String areaCode;
+    @ApiModelProperty(value = "装卸货地名称")
+    private String areaName;
+    @ApiModelProperty(value = "装卸货详细地址")
+    private String address;
+    @ApiModelProperty(value = "装卸货地经度")
+    private String longitude;
+    @ApiModelProperty(value = "装货地纬度")
+    private String latitude;
+    @ApiModelProperty(value = "装卸货联系人")
+    private String contactName;
+    @ApiModelProperty(value = "装卸货联系人电话")
+    private String contactPhone;
+    @ApiModelProperty(value = "装卸货日期（年月日）")
+    private Date layDate;
+    @ApiModelProperty(value = "装卸货时间（上午、下午、24小时）")
+    private String layTime;
+    @ApiModelProperty(value = "装卸货时间id")
+    private String layTimeId;
+    @ApiModelProperty(value = "装卸货类型：0无状态1装货地址2卸货地址")
+    private Integer layType;
+    @ApiModelProperty(value = "序号")
+    private Integer sort;
+    @ApiModelProperty(value = "简称")
+    private String shortName;
+}

mhd_oms/src/main/java/com/mhd/oms/domain/resevationOrder/entity/ReservationCargoMulti.java

@@ -0,0 +1,35 @@
+package com.mhd.oms.domain.resevationOrder.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author: brb
+ * @description:
+ * @create: 2026-01-27 09:11
+ */
+@Data
+public class ReservationCargoMulti {
+
+    @ApiModelProperty(value = "主键ID")
+    private String id;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+    @ApiModelProperty(value = "装卸货ID")
+    private String layInfoId;
+    @ApiModelProperty(value = "货物类型ID")
+    private String goodsTypeId;
+    @ApiModelProperty(value = "货物类型")
+    private String goodsType;
+    @ApiModelProperty(value = "货物名称ID")
+    private String goodsNameId;
+    @ApiModelProperty(value = "货物名称")
+    private String goodsName;
+    @ApiModelProperty(value = "货物数量")
+    private BigDecimal cargoWeight;
+}

mhd_oms/src/main/java/com/mhd/oms/domain/resevationOrder/entity/ReservationOrder.java

@@ -0,0 +1,695 @@
+package com.mhd.oms.domain.resevationOrder.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 com.mhd.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+
+/**
+ * @author: brb
+ * @description:
+ * @create: 2026-01-26 13:39
+ */
+@Data
+@TableName("reservation_order")
+public class ReservationOrder {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ID_WORKER_STR)
+    private java.lang.String id;
+    @ApiModelProperty(value = "创建人")
+    @Excel(name = "创建人", width = 15)
+    private java.lang.String createBy;
+    @ApiModelProperty(value = "创建日期")
+    @Excel(name = "创建日期", width = 20)
+    @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")
+    @Excel(name = "货源单创建企业ID", width = 15)
+    private java.lang.String createCompanyId;
+    @ApiModelProperty(value = "更新人")
+    @Excel(name = "更新人", width = 15)
+    private java.lang.String updateBy;
+    @ApiModelProperty(value = "更新日期")
+    @Excel(name = "更新日期", width = 20)
+    @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 = "所属部门")
+    @Excel(name = "所属部门", width = 15)
+    private java.lang.String sysOrgCode;
+    @ApiModelProperty(value = "货源单号")
+    @Excel(name = "货源单号", width = 15)
+    private java.lang.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 = "装货地名称")
+    @Excel(name = "装货地名称", width = 15)
+    private java.lang.String loadingName;
+    @ApiModelProperty(value = "装货地县区编码")
+    @Excel(name = "装货地县区编码", width = 15)
+    private java.lang.String loadingAreaId;
+    @ApiModelProperty(value = "装货地详细地址")
+    @Excel(name = "装货地详细地址", width = 15)
+    private java.lang.String loadingAddress;
+    @ApiModelProperty(value = "装货地经度")
+    @Excel(name = "装货地经度", width = 15)
+    private java.lang.String loadingLongitude;
+    @ApiModelProperty(value = "装货地纬度")
+    @Excel(name = "装货地纬度", width = 15)
+    private java.lang.String loadingLatitude;
+    @ApiModelProperty(value = "装货单位")
+    private java.lang.String loadingUnit;
+    @ApiModelProperty(value = "发货人姓名")
+    @Excel(name = "发货人姓名", width = 15)
+    private java.lang.String freighterName;
+    @ApiModelProperty(value = "装货电话")
+    @Excel(name = "装货电话", width = 15)
+    private java.lang.String loadingPhone;
+    @ApiModelProperty(value = "装货时间日期（年月日）")
+    @Excel(name = "装货时间日期（年月日）", width = 15)
+    @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 = "卸货地名称")
+    @Excel(name = "卸货地名称", width = 15)
+    private java.lang.String unloadName;
+    @ApiModelProperty(value = "卸货地县区编码")
+    @Excel(name = "卸货地县区编码", width = 15)
+    private java.lang.String unloadAreaId;
+    @ApiModelProperty(value = "卸货地详细地址")
+    @Excel(name = "卸货地详细地址", width = 15)
+    private java.lang.String unloadAddress;
+    @ApiModelProperty(value = "卸货地经度")
+    @Excel(name = "卸货地经度", width = 15)
+    private java.lang.String unloadLongitude;
+    @ApiModelProperty(value = "卸货地纬度")
+    @Excel(name = "卸货地纬度", width = 15)
+    private java.lang.String unloadLatitude;
+    //    @ApiModelProperty(value = "卸货单位")
+//    private java.lang.String unloadUnit ;
+//    @ApiModelProperty(value = "收货人身份证号")
+//    private java.lang.String unloadIdentificationNumber;
+    @ApiModelProperty(value = "收货人姓名")
+    @Excel(name = "收货人姓名", width = 15)
+    private java.lang.String dischargerName ;
+    @ApiModelProperty(value = "卸货电话")
+    @Excel(name = "卸货电话", width = 15)
+    private java.lang.String unloadPhone ;
+    @ApiModelProperty(value = "卸货时间日期（年月日）")
+    @Excel(name = "卸货时间日期（年月日）", width = 15)
+    @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")
+    @Excel(name = "货物名称ID", width = 15)
+    private java.lang.String goodsNameId ;
+    @ApiModelProperty(value = "货物大类型")
+    @Excel(name = "货物大类型", width = 15)
+    private java.lang.String goodsType ;
+    @ApiModelProperty(value = "货物小类型")
+    @Excel(name = "货物小类型", width = 15)
+    private java.lang.String goodsName ;
+    @ApiModelProperty(value = "重量小（吨）")
+    @Excel(name = "重量小（吨）", width = 15)
+    private java.math.BigDecimal weightMin;
+    //    @ApiModelProperty(value = "货物重量")
+//    private BigDecimal goodsWeight;
+    @ApiModelProperty(value = "货物数量单位（吨/方/件）")
+    @Excel(name = "货物数量单位（吨/方/件）", width = 15)
+    private java.lang.String goodsUntis ;
+    @ApiModelProperty(value = "货物数量单位（吨/方/件）id",required = true)
+    private String goodsUntisId ;
+    @ApiModelProperty(value = "配载方式ID（0-数量，1-车次）")
+    @Excel(name = "配载方式ID（0-数量，1-车次）", width = 15)
+    private java.lang.Integer transportationModeId;
+    @ApiModelProperty(value = "配载方式名称")
+    @Excel(name = "配载方式名称", width = 15)
+    private java.lang.String transportationName ;
+    @ApiModelProperty(value = "车型车长ID")
+    @Excel(name = "车型车长ID", width = 15)
+    private java.lang.String carType ;
+    @ApiModelProperty(value = "车型车长名称")
+    @Excel(name = "车型车长名称", width = 15)
+    private java.lang.String carTypeName ;
+    @ApiModelProperty(value = "承运方ID")
+    @Excel(name = "承运方ID", width = 15)
+    private java.lang.String appointDriverEnterpriseId;
+    @ApiModelProperty(value = "承运方名称")
+    @Excel(name = "承运方名称", width = 15)
+    private java.lang.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")
+    @Excel(name = "服务要求ID", width = 15)
+    private java.lang.String serviceRequireId ;
+    @ApiModelProperty(value = "服务要求名称")
+    @Excel(name = "服务要求名称", width = 15)
+    private java.lang.String serviceRequire ;
+    @ApiModelProperty(value = "备注")
+    @Excel(name = "备注", width = 15)
+    private java.lang.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-导入）")
+    @Excel(name = "运单来源（0-后台发布、1-app发布、2-导入）", width = 15)
+    private java.lang.Integer waybillFrom;
+    //    @ApiModelProperty(value = "期望运费")
+//    @Excel(name = "期望运费", width = 15)
+//    private java.math.BigDecimal freightHope;
+    @ApiModelProperty(value = "货源是否关闭（0-否，1-是）")
+    @Excel(name = "货源是否关闭（0-否，1-是）", width = 15)
+    private java.lang.Integer isSource;
+    //    @ApiModelProperty(value = "货源是否被接单（0-否，1-是）")
+//	@Excel(name = "货源是否被接单（0-否，1-是）", width = 15)
+//    private java.lang.Integer isOrder;
+    @ApiModelProperty(value = "货源关闭时间")
+    @Excel(name = "货源关闭时间", width = 15)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private java.util.Date sourceCloseTime;
+    @ApiModelProperty(value = "货源关闭人用户ID")
+    @Excel(name = "货源关闭人用户ID", width = 15)
+    private java.lang.String executorId;
+    @ApiModelProperty(value = "是否删除（0-否，1-是）")
+    @Excel(name = "是否删除（0-否，1-是）", width = 15)
+    private java.lang.Integer isDelete;
+    @ApiModelProperty(value = "货物类型ID")
+    @Excel(name = "货物类型ID", width = 15)
+    private java.lang.String goodsTypeId ;
+    @ApiModelProperty(value = "货运线路（装货市县）")
+    private java.lang.String lineTitleLeft ;
+    @ApiModelProperty(value = "货运线路（卸货市县）")
+    private java.lang.String lineTitleRight ;
+    @ApiModelProperty(value = "是否为常发货源（0-否，1-是）")
+    @Excel(name = "是否为常发货源（0-否，1-是）", width = 15)
+    private java.lang.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 java.lang.Integer auditStatus;
+    @ApiModelProperty(value = "运单模式(0-普通模式,1-竞价模式)")
+    private java.lang.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 = "审核人")
+    @Excel(name = "审核人", width = 15)
+    private java.lang.String auditBy;
+    @ApiModelProperty(value = "发货运费")
+    private java.math.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 java.lang.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 java.lang.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 java.math.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-收货方）")
+    @Excel(name = "付款方类型（0-委托方，1-收货方）", width = 15)
+    private java.lang.Integer payerType;
+
+    @ApiModelProperty(value = "收货方编码")
+    private String recipientId;
+    @ApiModelProperty(value = "收货方")
+    private String recipientName;
+
+    @ApiModelProperty(value = "整机编号")
+    private String machineNumber;
+
+    @ApiModelProperty(value = "是否库存（0-是，1-否）")
+    @Excel(name = "是否库存（0-是，1-否）", width = 15)
+    private java.lang.Integer stockFlag;
+
+    @ApiModelProperty(value = "信息费")
+    private java.math.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 java.math.BigDecimal collectedFreight;
+    @ApiModelProperty(value = "未收运费")
+    private java.math.BigDecimal uncollectedFreight;
+    @ApiModelProperty(value = "少收运费")
+    private java.math.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;
+
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+
+    @ApiModelProperty("业务员")
+    private String salesmanName;
+
+    @ApiModelProperty("是否报关（0：否，1：是）")
+    private Integer isDeclare;
+
+    @ApiModelProperty("线路")
+    private String route;
+
+    @ApiModelProperty("柜类型")
+    private String containerType;
+
+    @ApiModelProperty("柜类型名称")
+    private String containerTypeName;
+
+    @ApiModelProperty("卡类型")
+    private String cardType;
+
+    @ApiModelProperty("卡类型名称")
+    private String cardTypeName;
+
+    @ApiModelProperty("外来柜号")
+    private String externalContainerNo;
+
+    @ApiModelProperty("中转地")
+    private String transitPlace;
+
+    @ApiModelProperty("托运人ID")
+    private String shipper;
+
+    @ApiModelProperty("托运人ID")
+    private String customsShipper;
+
+    @ApiModelProperty("托运人电话")
+    private String customsShipperTel;
+
+    @ApiModelProperty("卸货单位")
+    private String unloadingCompany;
+
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+
+    @ApiModelProperty("运费")
+    private BigDecimal freightFee;
+
+    @ApiModelProperty("卸货费")
+    private BigDecimal unloadingFee;
+
+    @ApiModelProperty("报关费")
+    private BigDecimal customsFee;
+
+    @ApiModelProperty("差货费")
+    private BigDecimal shortageFee;
+
+    @ApiModelProperty("杂费")
+    private BigDecimal miscellaneousFee;
+
+    @ApiModelProperty("其他费用")
+    private BigDecimal otherFee;
+
+    @ApiModelProperty("滞车费")
+    private BigDecimal detentionFee;
+
+    @ApiModelProperty("税率")
+    private BigDecimal taxRate;
+
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+
+    @ApiModelProperty("体积")
+    private BigDecimal volume;
+
+    @ApiModelProperty("内容详情")
+    private String detailContent;
+
+    @ApiModelProperty("报关线路")
+    private String customsRoute;
+
+    @ApiModelProperty("报关关口")
+    private String customsPort;
+
+    @ApiModelProperty("报关联系人")
+    private String customsContact;
+
+    @ApiModelProperty("报关联系人电话")
+    private String customsContactPhone;
+
+    @ApiModelProperty("报关备注")
+    private String customsRemark;
+
+    @ApiModelProperty(value = "组织ID")
+    private String orgId;
+
+    @ApiModelProperty(value = "所属组织")
+    @Excel(name = "所属组织", width = 15)
+    private String orgName;
+
+    @ApiModelProperty(value = "组织ID")
+    private Long organizationId;
+
+    @ApiModelProperty(value = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty(value = "上级组织ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("货物类型")
+    private String goodsCategory;
+
+    @ApiModelProperty("客户编码nc")
+    private String customerCodeNc;
+
+    @ApiModelProperty("制单人编码nc")
+    private String makerCodeNc;
+
+    @ApiModelProperty("业务员编码nc")
+    private String salesmanCodeNc;
+
+    @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 documentDate;
+}

mhd_oms/src/main/java/com/mhd/oms/domain/resevationOrder/repository/facade/IOmsAddressMultiService.java

@@ -0,0 +1,15 @@
+package com.mhd.oms.domain.resevationOrder.repository.facade;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mhd.oms.domain.resevationOrder.entity.ReservationOrder;
+import com.mhd.oms.interfaces.dto.resevationOrder.OmsOrderAddDTO;
+
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SignatureException;
+import java.security.spec.InvalidKeySpecException;
+
+public interface IOmsAddressMultiService extends IService<ReservationOrder> {
+
+    void save(OmsOrderAddDTO tmsOrderAddDTO) throws InvalidKeySpecException, NoSuchAlgorithmException, InvalidKeyException, SignatureException;
+}

mhd_oms/src/main/java/com/mhd/oms/domain/resevationOrder/repository/mapper/ReservationOrderMapper.java

@@ -0,0 +1,14 @@
+package com.mhd.oms.domain.resevationOrder.repository.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mhd.oms.domain.resevationOrder.entity.ReservationOrder;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author: 
+ * @description: ResevationOrder数据访问层
+ * @create: 
+ */
+@Mapper
+public interface ReservationOrderMapper extends BaseMapper<ReservationOrder> {
+}

mhd_oms/src/main/java/com/mhd/oms/domain/resevationOrder/repository/mapper/TmsOrderAccountMapper.java

@@ -0,0 +1,9 @@
+package com.mhd.oms.domain.resevationOrder.repository.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mhd.oms.interfaces.dto.resevationOrder.OmsOrderAccount;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TmsOrderAccountMapper extends BaseMapper<OmsOrderAccount> {
+}

mhd_oms/src/main/java/com/mhd/oms/domain/resevationOrder/repository/po/SzwlConfigSwitchVO.java

@@ -0,0 +1,183 @@
+package com.mhd.oms.domain.resevationOrder.repository.po;
+
+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 com.mhd.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 数字物流系统配置同步表
+ */
+@Data
+public class SzwlConfigSwitchVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "是否使用支付宝充值(0-否,1-是)")
+    private Integer isAlipayRecharge;
+
+    @ApiModelProperty(value = "申请运费是否需要审核（0-否，1-是）")
+    private Integer isNeedToBeApproved;
+
+    @ApiModelProperty(value = "线下油卡/加油审核通过即支付(0-否,1-是)")
+    private Integer isApprovedPayment;
+
+    @ApiModelProperty(value = "系统支付方式：0-无，1-网商，2-通联，3-网商+通联，4-农行, 5-微信支付，6-平安银行")
+    private Integer paymentType;
+
+    @ApiModelProperty(value = "是否自动提现  0-否 1-是")
+    private Integer isAutomaticWithdrawal;
+
+    @ApiModelProperty(value = "是否允许车队司机接单(0-否,1-是)")
+    private Integer isMotorcadeDriverReceiving;
+
+    @ApiModelProperty(value = "自动审核用户信息(0-否，1-是)")
+    private Integer automaticCheckUserInfo;
+
+    @ApiModelProperty(value = "是否允许司机未认证接单（0-否，1-是）")
+    private Integer isUncertifiedOrders;
+
+    @ApiModelProperty(value = "司机默认审核通过(0-否,1-是)")
+    private Integer isAutomaticAuditDriver;
+
+    @ApiModelProperty(value = "是否允许未认证绑卡：0-否，1-是")
+    private Integer isBindcardUnauth;
+
+    @ApiModelProperty(value = "车队长邀请司机自动加入：0-否，1-是")
+    private Integer isInviteTeamAuth;
+
+    @ApiModelProperty(value = "证件信息到期提醒：0-否，1-是")
+    private Integer isInfoUpdate;
+
+    @ApiModelProperty(value = "是否必须是营运车辆：0-否，1-是")
+    private Integer isOperationVehicle;
+
+    @ApiModelProperty(value = "客户投诉弹框（0-否，1-是）")
+    private Integer isComplaintAlert;
+
+    @ApiModelProperty(value = "登录页验证码登录(0-否,1-是)")
+    private Integer isVerifiedCode;
+
+    @ApiModelProperty(value = "是否校验车辆信息（0-否，1-是）")
+    private Integer isVehicleInformation;
+
+    @ApiModelProperty(value = "是否使用小额打款(0-使用,1-不使用)")
+    private Integer isSmallAmountPayment;
+
+    @ApiModelProperty(value = "ETC是否自动上报：0-否，1-是")
+    private Integer isEtcAutoReport;
+
+    @ApiModelProperty(value = "短信默认发送平台(0-乐信通,1-网上行,腾讯云)")
+    private Integer smsSendingPlatform;
+
+    @ApiModelProperty(value = "OCR识别与签章默认方式(0-E签宝,1-放心签1，2-放心签2，3-E签宝saas)")
+    private Integer ocrDefault;
+
+    @ApiModelProperty(value = "保险使用类型(0-平安.默认,1-永诚,2-华泰)")
+    private Integer isInsuranceType;
+
+    @ApiModelProperty(value = "ETC使用类型：0-万金油，1-路耘")
+    private Integer etcType;
+
+    @ApiModelProperty(value = "使用地图类型：0-高德地图，1-百度地图")
+    private Integer mapType;
+
+    @ApiModelProperty(value = "是否使用电子围栏:0-否,1-是")
+    private Integer isElectricFence;
+
+    @ApiModelProperty(value = "网络货运位置信息上报平台：0-不上报、1-部平台")
+    private Integer uploadLocationPlatform;
+
+    @ApiModelProperty(value = "网络货运接入环境：0-部平台测试，1-部平台正式,2-江苏")
+    private Integer networkFreightEnvironment;
+
+    @ApiModelProperty(value = "单点登录：0-否，1-是")
+    private Integer isSingleSign;
+
+    @ApiModelProperty(value = "实名认证人脸识别（1-开启，2-关闭）")
+    private Integer faceRecognitionSwitch;
+
+    @ApiModelProperty(value = "实名认证人脸识别服务方（1-）")
+    private Integer faceRecognitionProvider;
+
+    @ApiModelProperty("营业执照OCR识别（1-开启，2-关闭）")
+    private Integer businessOcrSwitch;
+
+    @ApiModelProperty("营业执照OCR识别服务方（1-E签宝）")
+    private Integer businessOcrProvider;
+
+    @ApiModelProperty("身份证OCR识别")
+    private Integer idcardOcrSwitch;
+
+    @ApiModelProperty("身份证OCR服务方（1-E签宝）")
+    private Integer idcardOcrProvider;
+
+    @ApiModelProperty("驾驶证OCR识别（1-开启，2-关闭）")
+    private Integer driversOcrSwitch;
+
+    @ApiModelProperty("驾驶证OCR识别服务方（1-E签宝）")
+    private Integer driversOcrProvider;
+
+    @ApiModelProperty("行驶证OCR识别（1-开启，2-关闭）")
+    private Integer drivingOcrSwitch;
+
+    @ApiModelProperty("行驶证OCR识别服务方（1-E签宝）")
+    private Integer drivingOcrProvider;
+
+    @ApiModelProperty(value = "银行卡OCR识别（1-关闭，2-开启）")
+    private Integer bankCardOcrSwitch;
+
+    @ApiModelProperty(value = "银行卡OCR识别服务方（1-E签宝）")
+    private Integer bankCardOcrProvider;
+
+    @ApiModelProperty("从业资格证核验（1-开启，2-关闭）")
+    private Integer certificateVerificationSwitch;
+
+    @ApiModelProperty("从业资格证核验服务方（1-E签宝）")
+    private Integer certificateVerificationProvider;
+
+    @ApiModelProperty("道路运输经营许可证核验（1-开启，2-关闭）")
+    private Integer roadTransportVerification;
+
+    @ApiModelProperty("道路运输经营许可证核验服务方（1-E签宝）")
+    private Integer roadTransportVerificationProvider;
+
+    @ApiModelProperty("道路运输证核验（1-开启，2-关闭）")
+    private Integer transportVerificationSwitch;
+
+    @ApiModelProperty("道路运输证核验服务方（1-）")
+    private Integer transportVerificationProvider;
+
+    @ApiModelProperty(name = "组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty(name = "组织表name")
+    private String organizationName;
+
+    @ApiModelProperty(name = "一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty(value = "开启推广码（1-开启，2-关闭）")
+    private Integer isPromoCode;
+
+    @ApiModelProperty(value = "是否推送网货上报数据（1-开启，2-关闭）")
+    private Integer isPushReportData;
+
+    @ApiModelProperty(value = "是否拍照上传磅单（1-开启，2-关闭）")
+    private Integer takePhotoPound;
+
+    @ApiModelProperty(value = "承运人和承运企业并存（1-开启，2-关闭）")
+    private Integer coexistenceRoleSwitch;
+
+    @ApiModelProperty(value = "代收款协议生成开关（1-开启，2-关闭）")
+    private Integer motorcadeCollectionSwitch;
+
+    @ApiModelProperty(value = "是否开启拼单（1-开启，2-关闭）")
+    private Integer splicingOrderSwitch;
+}

mhd_oms/src/main/java/com/mhd/oms/domain/resevationOrder/service/SysConfigSwitchService.java

@@ -0,0 +1,18 @@
+package com.mhd.oms.domain.resevationOrder.service;
+
+import com.mhd.common.core.domain.entity.SysConfigSwitch;
+
+/**
+ * @Description: 系统配置开关服务接口
+ * @Author: 
+ * @Date: 2026-01-26
+ * @Version: V1.0
+ */
+public interface SysConfigSwitchService {
+    /**
+     * 根据系统组织代码查询配置
+     *
+     * @return 系统配置开关对象
+     */
+    SysConfigSwitch queryBySysOrgCode();
+}

mhd_oms/src/main/java/com/mhd/oms/domain/resevationOrder/service/TmsOrderService.java

@@ -0,0 +1,25 @@
+package com.mhd.oms.domain.resevationOrder.service;
+
+/**
+ * @Description: TMS订单服务接口
+ * @Author: 
+ * @Date: 2026-01-26
+ * @Version: V1.0
+ */
+public interface TmsOrderService {
+    /**
+     * 根据销售员代码查询制单人代码
+     *
+     * @param salesmanCode 销售员代码
+     * @return 制单人代码
+     */
+    String selectByMakerCodeNc(String salesmanCode);
+
+    /**
+     * 根据销售员代码查询制单人代码1
+     *
+     * @param salesmanCode 销售员代码
+     * @return 制单人代码1
+     */
+    String selectByMakerCodeNc1(String salesmanCode);
+}

mhd_oms/src/main/java/com/mhd/oms/domain/resevationOrder/service/impl/SysConfigSwitchServiceImpl.java

@@ -0,0 +1,111 @@
+//package com.mhd.oms.domain.resevationOrder.service.impl;
+//
+//import cn.hutool.core.collection.CollUtil;
+//import cn.hutool.core.util.ObjectUtil;
+//import cn.hutool.json.JSONUtil;
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson2.JSONObject;
+//import com.mhd.common.core.domain.entity.SysConfigSwitch;
+//import com.mhd.common.core.domain.po.thirdparty.SysDepartInterfaceInfoPo;
+//import com.mhd.common.core.domain.thirdparty.SysDepartInterfaceInfoDTO;
+//import com.mhd.common.core.exception.ServiceException;
+//import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
+//import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+//import com.mhd.common.core.utils.IgnoreNullUtil;
+//import com.mhd.common.core.web.domain.AjaxResult;
+//import com.mhd.common.security.utils.SecurityUtils;
+//import com.mhd.oms.domain.resevationOrder.service.SysConfigSwitchService;
+//import com.mhd.system.api.domain.WlhyLoginUser;
+//import com.mhd.system.api.model.LoginUser;
+//import org.springframework.beans.BeanUtils;
+//import org.springframework.stereotype.Service;
+//
+//import java.math.BigDecimal;
+//import java.util.ArrayList;
+//import java.util.List;
+//
+///**
+// * @Description: 系统配置开关服务实现类
+// * @Author:
+// * @Date: 2026-01-26
+// * @Version: V1.0
+// */
+//@Service
+//public class SysConfigSwitchServiceImpl implements SysConfigSwitchService {
+//
+//    @Override
+//    public SysConfigSwitch queryBySysOrgCode() {
+//        //开关配置改造方案，使用组织和租户，租户即一级组织，默认查询当前登录用户组织下的配置信息，如果没有，则查询一级组织
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        if (ObjectUtil.isNull(loginUser)) {
+//            throw new DigitalLogisticsException(UserError.TIMEOUT);
+//        }
+//        Long organizationId = loginUser.getUserPo().getTopOrganizationId();
+//        SysConfigSwitch sysConfigSwitch = sysConfigSwitchMapper.queryBySysOrgCode(organizationId.toString());
+//        if(null == sysConfigSwitch) {
+//            //继续查询该组织的上级组织，如果上级组织没有，则继续查询上级组织的上级组织，直到一级组织
+//            List<Long> orgList = new ArrayList<>();
+//            AjaxResult ajaxResult = productServiceFeign.selectTopOrganizationList(organizationId);
+//            if ("200".equals(String.valueOf(ajaxResult.get("code")))) {
+//                orgList = JSON.parseArray(JSONObject.toJSONString(ajaxResult.get("data")), Long.class);
+//            }
+//            if(null != orgList && orgList.size()>0){
+//                for (Long aLong : orgList) {
+//                    sysConfigSwitch = sysConfigSwitchMapper.queryBySysOrgCode(aLong.toString());
+//                    if(null != sysConfigSwitch){
+//                        break;
+//                    }
+//                }
+//            }
+//        }
+//
+//        if (ObjectUtil.isNull(sysConfigSwitch)){
+//            throw new ServiceException("未获取到系统配置");
+//        }
+//        //获取数字物流配置
+//        SzwlConfigSwitchVO szwlConfigSwitch = new SzwlConfigSwitchVO();
+//        AjaxResult userConfigSwitchInfoByFeign = systemServiceFeign.getUserConfigSwitchInfoByFeign(loginUser);
+//        if ("200".equals(String.valueOf(userConfigSwitchInfoByFeign.get("code")))) {
+//            szwlConfigSwitch = JSONUtil.toBean(JSONObject.toJSONString(userConfigSwitchInfoByFeign.get("data")), SzwlConfigSwitchVO.class);
+//        } else {
+//            throw new ServiceException("获取公共配置失败");
+//        }
+//        if (ObjectUtil.isNotNull(szwlConfigSwitch)){
+//            BeanUtils.copyProperties(szwlConfigSwitch, sysConfigSwitch, IgnoreNullUtil.getNullPropertyNames(szwlConfigSwitch));
+//        }
+//
+//        //查询电子围栏的半径信息
+//        SysDepartInterfaceInfoDTO sysDepartInterfaceInfoDTO = new SysDepartInterfaceInfoDTO();
+//        sysDepartInterfaceInfoDTO.setInterfaceType("electronic_fence");
+//        sysDepartInterfaceInfoDTO.setInterfaceTypeKey("electronic_fence");
+//        List<SysDepartInterfaceInfoPo> sysDepartInterfaceInfoPos = thirdPartyServiceFeign.queryListByFeign(sysDepartInterfaceInfoDTO);
+//        if (CollUtil.isEmpty(sysDepartInterfaceInfoPos) || sysDepartInterfaceInfoPos.size() < 1) {
+//            sysConfigSwitch.setElectronicFence(BigDecimal.ZERO);
+//        } else {
+//            String interfaceTypeValue = sysDepartInterfaceInfoPos.get(0).getInterfaceTypeValue();
+//            BigDecimal electronicFence = new BigDecimal(interfaceTypeValue);
+//            sysConfigSwitch.setElectronicFence(electronicFence);
+//        }
+//
+//        sysDepartInterfaceInfoDTO.setInterfaceType("electronic_fence");
+//        sysDepartInterfaceInfoDTO.setInterfaceTypeKey("electronic_fence_load");
+//        List<SysDepartInterfaceInfoPo> sysDepartInterfaceInfoPosLoad = thirdPartyServiceFeign.queryListByFeign(sysDepartInterfaceInfoDTO);
+//        if (CollUtil.isEmpty(sysDepartInterfaceInfoPosLoad) || sysDepartInterfaceInfoPosLoad.size() < 1) {
+//            sysConfigSwitch.setElectronicFenceLoad(BigDecimal.ZERO);
+//        } else {
+//            String interfaceTypeValue = sysDepartInterfaceInfoPosLoad.get(0).getInterfaceTypeValue();
+//            BigDecimal electronicFenceLoad = new BigDecimal(interfaceTypeValue);
+//            sysConfigSwitch.setElectronicFenceLoad(electronicFenceLoad);
+//        }
+//
+//        //当前用户竞价权限
+//        WlhyLoginUser wlhyLoginUser = SecurityUtils.getLoginUser().getWlhyLoginUser();
+//        TmsDriver tmsDriver = tmsDriverMapper.getByDriverId(wlhyLoginUser.getId());
+//        if (ObjectUtil.isNotNull(tmsDriver)) {
+//            sysConfigSwitch.setIsDriverBidding(tmsDriver.getIsDriverBidding());
+//        } else {
+//            sysConfigSwitch.setIsDriverBidding(0);
+//        }
+//        return sysConfigSwitch;
+//    }
+//}

mhd_oms/src/main/java/com/mhd/oms/domain/resevationOrder/service/impl/TmsOrderServiceImpl.java

@@ -0,0 +1,26 @@
+package com.mhd.oms.domain.resevationOrder.service.impl;
+
+import com.mhd.oms.domain.resevationOrder.service.TmsOrderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: TMS订单服务实现类
+ * @Author: 
+ * @Date: 2026-01-26
+ * @Version: V1.0
+ */
+@Service
+public class TmsOrderServiceImpl implements TmsOrderService {
+
+    @Override
+    public String selectByMakerCodeNc(String salesmanCode) {
+
+        return "";
+    }
+
+    @Override
+    public String selectByMakerCodeNc1(String salesmanCode) {
+
+        return "";
+    }
+}