zhenghaoyu
2 years ago
14 changed files with 446 additions and 34 deletions
@ -0,0 +1,235 @@
|
||||
package com.logpm.trunkline.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import org.springblade.core.tenant.mp.TenantEntity; |
||||
|
||||
import java.util.Date; |
||||
|
||||
/** |
||||
* 运单; |
||||
* @author : http://www.chiner.pro
|
||||
* @date : 2023-7-4 |
||||
*/ |
||||
@Data |
||||
@ApiModel(value = "运单",description = "") |
||||
@TableName("logpm_mainline_waybill") |
||||
public class MainlineWaybill extends TenantEntity { |
||||
|
||||
/** 预留1 */ |
||||
@ApiModelProperty(name = "预留1",notes = "") |
||||
private String reserve1 ; |
||||
/** 预留2 */ |
||||
@ApiModelProperty(name = "预留2",notes = "") |
||||
private String reserve2 ; |
||||
/** 预留3 */ |
||||
@ApiModelProperty(name = "预留3",notes = "") |
||||
private String reserve3 ; |
||||
/** 预留4 */ |
||||
@ApiModelProperty(name = "预留4",notes = "") |
||||
private String reserve4 ; |
||||
/** 预留5 */ |
||||
@ApiModelProperty(name = "预留5",notes = "") |
||||
private String reserve5 ; |
||||
/** 运单号 */ |
||||
@ApiModelProperty(name = "运单号",notes = "") |
||||
private String waybillNumber ; |
||||
/** 订单自编号 */ |
||||
@ApiModelProperty(name = "订单自编号",notes = "") |
||||
private String orderSelfNumbering ; |
||||
/** 目的仓 */ |
||||
@ApiModelProperty(name = "目的仓",notes = "") |
||||
private Integer destinationBin ; |
||||
/** 目的仓名称 */ |
||||
@ApiModelProperty(name = "目的仓名称",notes = "") |
||||
private String destinationBinName ; |
||||
/** 发起仓 */ |
||||
@ApiModelProperty(name = "发起仓",notes = "") |
||||
private Integer initiatingBin ; |
||||
/** 客户车次 */ |
||||
@ApiModelProperty(name = "客户车次",notes = "") |
||||
private String customerTrainNumber ; |
||||
/** 品牌（订单来源） */ |
||||
@ApiModelProperty(name = "品牌（订单来源）",notes = "") |
||||
private String brand ; |
||||
/** 发货单位 */ |
||||
@ApiModelProperty(name = "发货单位",notes = "") |
||||
private String forwardingUnit ; |
||||
/** 发货人 */ |
||||
@ApiModelProperty(name = "发货人",notes = "") |
||||
private String consigner ; |
||||
/** 发货方电话 */ |
||||
@ApiModelProperty(name = "发货方电话",notes = "") |
||||
private String dispatchTelephone ; |
||||
/** 发货方地址 */ |
||||
@ApiModelProperty(name = "发货方地址",notes = "") |
||||
private String shipperAddress ; |
||||
/** 收货单位 */ |
||||
@ApiModelProperty(name = "收货单位",notes = "") |
||||
private String harvestUnit ; |
||||
/** 收货人 */ |
||||
@ApiModelProperty(name = "收货人",notes = "") |
||||
private String consignee ; |
||||
/** 收货人电话 */ |
||||
@ApiModelProperty(name = "收货人电话",notes = "") |
||||
private String harvesterTelephone ; |
||||
/** 收货人地址 */ |
||||
@ApiModelProperty(name = "收货人地址",notes = "") |
||||
private String harvesterAddress ; |
||||
/** 到站 */ |
||||
@ApiModelProperty(name = "到站",notes = "") |
||||
private Integer drawIn ; |
||||
/** 货物名称 */ |
||||
@ApiModelProperty(name = "货物名称",notes = "") |
||||
private String descriptionGoods ; |
||||
/** 参考一口价 */ |
||||
@ApiModelProperty(name = "参考一口价",notes = "") |
||||
private Double fixedPrice ; |
||||
/** 总价 */ |
||||
@ApiModelProperty(name = "总价",notes = "") |
||||
private Double totalPrices ; |
||||
/** 件数 */ |
||||
@ApiModelProperty(name = "件数",notes = "") |
||||
private Integer numberUnits ; |
||||
/** 总数 */ |
||||
@ApiModelProperty(name = "总数",notes = "") |
||||
private Integer totality ; |
||||
/** 总重量 */ |
||||
@ApiModelProperty(name = "总重量",notes = "") |
||||
private Double totalWeight ; |
||||
/** 总体积 */ |
||||
@ApiModelProperty(name = "总体积",notes = "") |
||||
private Double totalVolume ; |
||||
/** 运费 */ |
||||
@ApiModelProperty(name = "运费",notes = "") |
||||
private Double freight ; |
||||
/** 送货费 */ |
||||
@ApiModelProperty(name = "送货费",notes = "") |
||||
private Double deliveryExpense ; |
||||
/** 提货费 */ |
||||
@ApiModelProperty(name = "提货费",notes = "") |
||||
private Double pickCharge ; |
||||
/** 仓库管理费 */ |
||||
@ApiModelProperty(name = "仓库管理费",notes = "") |
||||
private Double warehouseOverhead ; |
||||
/** 仓储费 */ |
||||
@ApiModelProperty(name = "仓储费",notes = "") |
||||
private Double storageCharge ; |
||||
/** 装卸费 */ |
||||
@ApiModelProperty(name = "装卸费",notes = "") |
||||
private Integer terminalCharges ; |
||||
/** 其他费用 */ |
||||
@ApiModelProperty(name = "其他费用",notes = "") |
||||
private Double otherExpenses ; |
||||
/** 保价费 */ |
||||
@ApiModelProperty(name = "保价费",notes = "") |
||||
private Double insuranceFee ; |
||||
/** 总费用 */ |
||||
@ApiModelProperty(name = "总费用",notes = "") |
||||
private Double allInCost ; |
||||
/** 申明价值 */ |
||||
@ApiModelProperty(name = "申明价值",notes = "") |
||||
private Double declaredValue ; |
||||
/** 回扣 */ |
||||
@ApiModelProperty(name = "回扣",notes = "") |
||||
private Double kickback ; |
||||
/** 付款方式;1现付 2到付 3月付 4回付 5内部结算 6 多笔付 */ |
||||
@ApiModelProperty(name = "付款方式",notes = "1现付 2到付 3月付 4回付 5内部结算 6 多笔付") |
||||
private Integer paymentMethod ; |
||||
/** 现付 */ |
||||
@ApiModelProperty(name = "现付",notes = "") |
||||
private Double spotPayment ; |
||||
/** 到付 */ |
||||
@ApiModelProperty(name = "到付",notes = "") |
||||
private Double freightPayment ; |
||||
/** 月付 */ |
||||
@ApiModelProperty(name = "月付",notes = "") |
||||
private Double payMonthly ; |
||||
/** 回付 */ |
||||
@ApiModelProperty(name = "回付",notes = "") |
||||
private Double payback ; |
||||
/** 送货方式;1自提 2送货 3送货上门 4送货上楼有电梯 5 送货上楼无电梯 6送货卸货 7送货安装 */ |
||||
@ApiModelProperty(name = "送货方式",notes = "1自提 2送货 3送货上门 4送货上楼有电梯 5 送货上楼无电梯 6送货卸货 7送货安装") |
||||
private Integer shippingMethod ; |
||||
/** 紧急度;1正常 2急 3加急 4 特急 */ |
||||
@ApiModelProperty(name = "紧急度",notes = "1正常 2急 3加急 4 特急") |
||||
private Integer emergencyDegree ; |
||||
/** 回单数 */ |
||||
@ApiModelProperty(name = "回单数",notes = "") |
||||
private Integer returnSingular ; |
||||
/** 回单要求;1 签回单 2签原单 3 打收条 4 签信封 5签回章盖章 6 一份回单 7 两份回单 8三份回单 9 ...N+1份回单 */ |
||||
@ApiModelProperty(name = "回单要求",notes = "1 签回单 2签原单 3 打收条 4 签信封 5签回章盖章 6 一份回单 7 两份回单 8三份回单 9 ...N+1份回单") |
||||
private Integer requestReceipt ; |
||||
/** 运输方式;1 公路快运 2海运 3卡车航班 4空运 5普通汽班 6快递 */ |
||||
@ApiModelProperty(name = "运输方式",notes = "1 公路快运 2海运 3卡车航班 4空运 5普通汽班 6快递") |
||||
private Integer typeShipping ; |
||||
/** 运单标识;1 改 2 审 */ |
||||
@ApiModelProperty(name = "运单标识",notes = "1 改 2 审") |
||||
private Integer transportIdentification ; |
||||
/** 三方操作费 */ |
||||
@ApiModelProperty(name = "三方操作费",notes = "") |
||||
private Double operatingCost ; |
||||
/** 经办人 */ |
||||
@ApiModelProperty(name = "经办人",notes = "") |
||||
private String responsiblePerson ; |
||||
/** 制单时间 */ |
||||
@ApiModelProperty(name = "制单时间",notes = "") |
||||
private Date documentMakingTime ; |
||||
/** 审核状态;1 已审核 2 待审核 */ |
||||
@ApiModelProperty(name = "审核状态",notes = "1 已审核 2 待审核") |
||||
private Integer auditStatus ; |
||||
/** 结算状态;1 已结算 2 未结算 */ |
||||
@ApiModelProperty(name = "结算状态",notes = "1 已结算 2 未结算") |
||||
private Integer settlementStatus ; |
||||
/** 备注 */ |
||||
@ApiModelProperty(name = "备注",notes = "") |
||||
private String remark ; |
||||
/** 批次号 */ |
||||
@ApiModelProperty(name = "批次号",notes = "") |
||||
private String batchNumber ; |
||||
/** 送货司机 */ |
||||
@ApiModelProperty(name = "送货司机",notes = "") |
||||
private String deliveryDriver ; |
||||
/** 送货时间 */ |
||||
@ApiModelProperty(name = "送货时间",notes = "") |
||||
private Date deliveryTime ; |
||||
/** 送货件数 */ |
||||
@ApiModelProperty(name = "送货件数",notes = "") |
||||
private Integer numberDeliveries ; |
||||
/** 签收时间 */ |
||||
@ApiModelProperty(name = "签收时间",notes = "") |
||||
private String receiptTime ; |
||||
/** 文员确定时间 */ |
||||
@ApiModelProperty(name = "文员确定时间",notes = "") |
||||
private Date clerkTime ; |
||||
/** 服务类型;1 干线 2干仓配 */ |
||||
@ApiModelProperty(name = "服务类型",notes = "1 干线 2干仓配") |
||||
private Integer typeService ; |
||||
/** 服务号 */ |
||||
@ApiModelProperty(name = "服务号",notes = "") |
||||
private String serviceNumber ; |
||||
/** 冻结状态;1正常 2 冻结 */ |
||||
@ApiModelProperty(name = "冻结状态",notes = "1正常 2 冻结") |
||||
private Integer frozenState ; |
||||
/** 回单图片 */ |
||||
@ApiModelProperty(name = "回单图片",notes = "") |
||||
private String receiptPicture ; |
||||
/** 配送方式;1·自提 2·配送 */ |
||||
@ApiModelProperty(name = "配送方式",notes = "1·自提 2·配送") |
||||
private Integer modeDistribution ; |
||||
/** 状态;1已开单 2已入库 3已装车 4已发车 5已到达 6 中转出库 7签收 8配送 9 部分签收 10部分配送 11 部分装车 12部分入库 13 部分到达 14 部分中转出库 15 部分发车 16作废 17 短驳中 18 已中转 19 中转中 20 已接收 21 送货中 22 已送货 23 待补录 24 提货中 25 部分提货中 26 已提货 27部分已提货 28 网点中转中 29 中转已签收 30 预装车 31 部分短驳中 32 部分短驳完成 33 部分送货中 34 部分送货完成 35 部分卸车 36 已卸车 37 中转已到达 38 送货调度 39 部分送货调度 40 送货派单 41 部分送货派单 42 送货已派单 43 送货已拒绝 44 部分送货已拒绝 45 送货失败 46部分送货失败 47 提货调度 48 部分提货调度 49 提货派单 50 部分提货派单51 提货已接单 52 部分提货已接单 53提货已拒绝 54 部分提货已拒绝 55 提货失败 56部分提货失败 */ |
||||
@ApiModelProperty(name = "状态",notes = "1已开单 2已入库 3已装车 4已发车 5已到达 6 中转出库 7签收 8配送 9 部分签收 10部分配送 11 部分装车 12部分入库 13 部分到达 14 部分中转出库 15 部分发车 16作废 17 短驳中 18 已中转 19 中转中 20 已接收 21 送货中 22 已送货 23 待补录 24 提货中 25 部分提货中 26 已提货 27部分已提货 28 网点中转中 29 中转已签收 30 预装车 31 部分短驳中 32 部分短驳完成 33 部分送货中 34 部分送货完成 35 部分卸车 36 已卸车 37 中转已到达 38 送货调度 39 部分送货调度 40 送货派单 41 部分送货派单 42 送货已派单 43 送货已拒绝 44 部分送货已拒绝 45 送货失败 46部分送货失败 47 提货调度 48 部分提货调度 49 提货派单 50 部分提货派单51 提货已接单 52 部分提货已接单 53提货已拒绝 54 部分提货已拒绝 55 提货失败 56部分提货失败 ") |
||||
private Integer condition ; |
||||
/** 发起仓名称 */ |
||||
@ApiModelProperty(name = "发起仓名称",notes = "") |
||||
private String initiatingBinName ; |
||||
/** 标识 */ |
||||
@ApiModelProperty(name = "标识",notes = "") |
||||
private Integer identification ; |
||||
/** 付款人;1 发货付 2收货付 */ |
||||
@ApiModelProperty(name = "付款人",notes = "1 发货付 2收货付") |
||||
private Integer payer ; |
||||
|
||||
} |
||||
@ -0,0 +1,36 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.trunkline.feign; |
||||
|
||||
import org.springblade.common.constant.ModuleNameConstant; |
||||
import org.springframework.cloud.openfeign.FeignClient; |
||||
|
||||
/** |
||||
* 运单表 Feign接口类 |
||||
* |
||||
* @author zhy |
||||
* @since 2023-07-04 |
||||
*/ |
||||
@FeignClient( |
||||
value = ModuleNameConstant.APPLICATION_TRUNKLINE_NAME |
||||
) |
||||
public interface IMainlineWaybillClient { |
||||
|
||||
String API_PREFIX = "/client"; |
||||
String TOP = API_PREFIX + "/top"; |
||||
|
||||
} |
||||
@ -0,0 +1,22 @@
|
||||
package com.logpm.trunkline.controller; |
||||
|
||||
import com.logpm.trunkline.service.IMainlineWaybillService; |
||||
import io.swagger.annotations.Api; |
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.web.bind.annotation.RequestMapping; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
|
||||
/** |
||||
* 运单;(logpm_mainline_waybill)表控制层 |
||||
* @author : http://www.chiner.pro
|
||||
* @date : 2023-7-4 |
||||
*/ |
||||
@Api(tags = "运单对象功能接口") |
||||
@RestController |
||||
@RequestMapping("/mainlineWaybill") |
||||
public class MainlineWaybillController { |
||||
@Autowired |
||||
private IMainlineWaybillService mainlineWaybillService; |
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,60 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.trunkline.launcher; |
||||
|
||||
import org.springblade.core.auto.service.AutoService; |
||||
import org.springblade.core.launch.constant.NacosConstant; |
||||
import org.springblade.core.launch.service.LauncherService; |
||||
import org.springblade.core.launch.utils.PropsUtil; |
||||
import org.springframework.boot.builder.SpringApplicationBuilder; |
||||
|
||||
import java.util.Properties; |
||||
|
||||
/** |
||||
* 启动参数拓展 |
||||
* |
||||
* @author Chill |
||||
*/ |
||||
@AutoService(LauncherService.class) |
||||
public class TrunklineLauncherServiceImpl implements LauncherService { |
||||
|
||||
@Override |
||||
public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) { |
||||
Properties props = System.getProperties(); |
||||
// 开启多数据源
|
||||
PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "true"); |
||||
// 指定注册配置信息
|
||||
PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].data-id", NacosConstant.dataId(appName, profile)); |
||||
PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].group", NacosConstant.NACOS_CONFIG_GROUP); |
||||
PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].refresh", NacosConstant.NACOS_CONFIG_REFRESH); |
||||
// 指定注册IP
|
||||
// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.ip", "127.0.0.1");
|
||||
// 指定注册端口
|
||||
// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.port", "8200");
|
||||
// 自定义命名空间
|
||||
// PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", LauncherConstant.NACOS_NAMESPACE);
|
||||
// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", LauncherConstant.NACOS_NAMESPACE);
|
||||
// 自定义分组
|
||||
// PropsUtil.setProperty(props, "spring.cloud.nacos.config.group", NacosConstant.NACOS_CONFIG_GROUP);
|
||||
// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.group", NacosConstant.NACOS_CONFIG_GROUP);
|
||||
} |
||||
|
||||
@Override |
||||
public int getOrder() { |
||||
return 20; |
||||
} |
||||
} |
||||
@ -0,0 +1,15 @@
|
||||
package com.logpm.trunkline.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.logpm.trunkline.entity.MainlineWaybill; |
||||
import org.apache.ibatis.annotations.Mapper; |
||||
|
||||
/** |
||||
* 运单;(logpm_mainline_waybill)表数据库访问层 |
||||
* @author : http://www.chiner.pro
|
||||
* @date : 2023-7-4 |
||||
*/ |
||||
@Mapper |
||||
public interface MainlineWaybillMapper extends BaseMapper<MainlineWaybill>{ |
||||
|
||||
} |
||||
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="com.logpm.trunkline.mapper.MainlineWaybillMapper"> |
||||
|
||||
|
||||
</mapper> |
||||
@ -0,0 +1,10 @@
|
||||
package com.logpm.trunkline.service; |
||||
|
||||
/** |
||||
* 运单;(logpm_mainline_waybill)表服务接口 |
||||
* @author : http://www.chiner.pro
|
||||
* @date : 2023-7-4 |
||||
*/ |
||||
public interface IMainlineWaybillService { |
||||
|
||||
} |
||||
@ -0,0 +1,17 @@
|
||||
package com.logpm.trunkline.service.impl; |
||||
|
||||
import com.logpm.trunkline.mapper.MainlineWaybillMapper; |
||||
import com.logpm.trunkline.service.IMainlineWaybillService; |
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.stereotype.Service; |
||||
/** |
||||
* 运单;(logpm_mainline_waybill)表服务实现类 |
||||
* @author : http://www.chiner.pro
|
||||
* @date : 2023-7-4 |
||||
*/ |
||||
@Service |
||||
public class MainlineWaybillServiceImpl implements IMainlineWaybillService { |
||||
@Autowired |
||||
private MainlineWaybillMapper mainlineWaybillMapper; |
||||
|
||||
} |
||||
Loading…
Reference in new issue