gongdecai пре 4 година
родитељ
комит
50d733eacb
19 измењених фајлова са 646 додато и 3 уклоњено
  1. 2 3
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/GeneratorCodeByTables.java
  2. 21 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/TranCarInfoController.java
  3. 21 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/TranProcessInfoController.java
  4. 21 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/TranTaskInfoController.java
  5. 113 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranCarInfo.java
  6. 153 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranProcessInfo.java
  7. 144 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranTaskInfo.java
  8. 16 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/TranCarInfoMapper.java
  9. 16 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/TranProcessInfoMapper.java
  10. 16 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/TranTaskInfoMapper.java
  11. 16 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ITranCarInfoService.java
  12. 16 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ITranProcessInfoService.java
  13. 16 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ITranTaskInfoService.java
  14. 20 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranCarInfoServiceImpl.java
  15. 20 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java
  16. 20 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranTaskInfoServiceImpl.java
  17. 5 0
      winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranCarInfoMapper.xml
  18. 5 0
      winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranProcessInfoMapper.xml
  19. 5 0
      winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranTaskInfoMapper.xml

+ 2 - 3
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/GeneratorCodeByTables.java

@@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 /**
  * 生成代码
  *
- * @author SunTianjun
+ * @author gdc
  */
 public class GeneratorCodeByTables {
 
@@ -53,8 +53,7 @@ public class GeneratorCodeByTables {
     }
 
     public static void main(String[] args) throws IOException {
-//        generateByTables("Gongdc", "com.yh.saas.plugin.crew","crew_interview_info");
-        generateByTables("Gongdc", "com.yh.saas.plugin.yiliangyiyun","driver_payee_info");
+        generateByTables("Gongdc", "com.yh.saas.plugin.yiliangyiyun","tran_car_info");
     }
 
     /**

+ 21 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/TranCarInfoController.java

@@ -0,0 +1,21 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 记录车次 前端控制器
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-05-31
+ */
+@RestController
+@RequestMapping("/tranCarInfo")
+public class TranCarInfoController {
+
+}
+

+ 21 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/TranProcessInfoController.java

@@ -0,0 +1,21 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 记录调度 前端控制器
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-05-31
+ */
+@RestController
+@RequestMapping("/tranProcessInfo")
+public class TranProcessInfoController {
+
+}
+

+ 21 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/TranTaskInfoController.java

@@ -0,0 +1,21 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 记录运输任务 前端控制器
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-05-31
+ */
+@RestController
+@RequestMapping("/tranTaskInfo")
+public class TranTaskInfoController {
+
+}
+

+ 113 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranCarInfo.java

@@ -0,0 +1,113 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.activerecord.Model;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotations.Version;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.yh.saas.common.support.entity.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 记录车次
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-05-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tran_car_info")
+public class TranCarInfo extends BaseModel<TranCarInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 运输任务id
+     */
+    private String infoId;
+    /**
+     * 运输阶段id
+     */
+    private String processId;
+    /**
+     * 运输方式(1汽运2火运3船运)
+     */
+    private String tranType;
+    /**
+     * 司机姓名/联络员姓名
+     */
+    private String driver;
+    /**
+     * 司机电话/联络员电话
+     */
+    private String driverPhone;
+    /**
+     * 车牌号
+     */
+    private String carNo;
+    /**
+     * 车次
+     */
+    private String trainNo;
+    /**
+     * 航次
+     */
+    private String shipNo;
+    /**
+     * 车型
+     */
+    private String carModel;
+    /**
+     * 车长
+     */
+    private Float carLength;
+    /**
+     * 载重
+     */
+    private Float loadWeight;
+    /**
+     * 船名
+     */
+    private String shipName;
+    /**
+     * 发车日期/发船日期
+     */
+    private Date sendDateStart;
+    /**
+     * 到站日期/到港日期
+     */
+    private Date receiveDateEnd;
+    /**
+     * 状态标识
+     */
+    private String statusFlag;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 状态英文
+     */
+    private String statusEn;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

+ 153 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranProcessInfo.java

@@ -0,0 +1,153 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.activerecord.Model;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotations.Version;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.yh.saas.common.support.entity.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 记录调度
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-05-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tran_process_info")
+public class TranProcessInfo extends BaseModel<TranProcessInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 运输任务id
+     */
+    private String infoId;
+    /**
+     * 运输阶段编号
+     */
+    private String processNo;
+    /**
+     * 货名key
+     */
+    private String goodsNameKey;
+    /**
+     * 货名
+     */
+    private String goodsName;
+    /**
+     * 重量(吨)
+     */
+    private Float weight;
+    /**
+     * 运输方式(1汽运2火运3船运)
+     */
+    private String tranType;
+    /**
+     * 发货日期
+     */
+    private Date deliveryDateStart;
+    /**
+     * 最晚到货日期
+     */
+    private Date deliveryDateEnd;
+    /**
+     * 发货地省
+     */
+    private String sendPrivate;
+    /**
+     * 发货地市
+     */
+    private String sendCity;
+    /**
+     * 发货地区
+     */
+    private String sendArea;
+    /**
+     * 发货地详细地址
+     */
+    private String sendDetailedAddress;
+    /**
+     * 收货地省
+     */
+    private String receivePrivate;
+    /**
+     * 收货地市
+     */
+    private String receiveCity;
+    /**
+     * 收货地区
+     */
+    private String receiveArea;
+    /**
+     * 收货地详细地址
+     */
+    private String receiveDetailedAddress;
+    /**
+     * 发货人
+     */
+    private String sender;
+    /**
+     * 收货人
+     */
+    private String receiver;
+    /**
+     * 发货人电话
+     */
+    private String senderPhone;
+    /**
+     * 收货人电话
+     */
+    private String receiverPhone;
+    /**
+     * 签到数
+     */
+    private Long signCount;
+    /**
+     * 接单时间
+     */
+    private Date receivingDate;
+    /**
+     * 状态标识
+     */
+    private String statusFlag;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 状态英文
+     */
+    private String statusEn;
+    /**
+     * 最终阶段标识(1是)
+     */
+    private String endFlag;
+    /**
+     * 顺序
+     */
+    private Integer sort;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

+ 144 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranTaskInfo.java

@@ -0,0 +1,144 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotations.Version;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.yh.saas.common.support.entity.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 记录运输任务
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-05-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tran_task_info")
+public class TranTaskInfo extends BaseModel<TranTaskInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 公司id
+     */
+    private String compId;
+    /**
+     * 运输任务编号
+     */
+    private String taskNo;
+    /**
+     * 合同编号
+     */
+    private String contractNo;
+    /**
+     * 任务类型key
+     */
+    private String taskTypeKey;
+    /**
+     * 任务类型
+     */
+    private String taskType;
+    /**
+     * 货名key
+     */
+    private String goodsNameKey;
+    /**
+     * 货名
+     */
+    private String goodsName;
+    /**
+     * 重量(吨)
+     */
+    private Float weight;
+    /**
+     * 发货库类型(1自有库2临时库)
+     */
+    private String warehouseType;
+    /**
+     * 发货库点
+     */
+    private String sendWarehouse;
+    /**
+     * 采购编号
+     */
+    private String buyNo;
+    /**
+     * 收货库点
+     */
+    private String receiveWarehouse;
+    /**
+     * 始发地省
+     */
+    private String startPrivate;
+    /**
+     * 始发地市
+     */
+    private String startCity;
+    /**
+     * 始发地区
+     */
+    private String startArea;
+    /**
+     * 始发地详细地址
+     */
+    private String startDetailedAddress;
+    /**
+     * 终到地省
+     */
+    private String endPrivate;
+    /**
+     * 终到地市
+     */
+    private String endCity;
+    /**
+     * 终到地区
+     */
+    private String endArea;
+    /**
+     * 终到地详细地址
+     */
+    private String endDetailedAddress;
+    /**
+     * 当前中转地址
+     */
+    private String currentTransferAddress;
+    /**
+     * 运输方式(1汽运2火运3船运)
+     */
+    private String tranType;
+    /**
+     * 状态标识
+     */
+    private String statusFlag;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 状态英文
+     */
+    private String statusEn;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

+ 16 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/TranCarInfoMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.TranCarInfo;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 记录车次 Mapper 接口
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-05-31
+ */
+public interface TranCarInfoMapper extends BaseMapper<TranCarInfo> {
+
+}

+ 16 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/TranProcessInfoMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.TranProcessInfo;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 记录调度 Mapper 接口
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-05-31
+ */
+public interface TranProcessInfoMapper extends BaseMapper<TranProcessInfo> {
+
+}

+ 16 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/TranTaskInfoMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.TranTaskInfo;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 记录运输任务 Mapper 接口
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-05-31
+ */
+public interface TranTaskInfoMapper extends BaseMapper<TranTaskInfo> {
+
+}

+ 16 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ITranCarInfoService.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.TranCarInfo;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 记录车次 服务类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-05-31
+ */
+public interface ITranCarInfoService extends IService<TranCarInfo> {
+
+}

+ 16 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ITranProcessInfoService.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.TranProcessInfo;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 记录调度 服务类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-05-31
+ */
+public interface ITranProcessInfoService extends IService<TranProcessInfo> {
+
+}

+ 16 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ITranTaskInfoService.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.TranTaskInfo;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 记录运输任务 服务类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-05-31
+ */
+public interface ITranTaskInfoService extends IService<TranTaskInfo> {
+
+}

+ 20 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranCarInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.TranCarInfo;
+import com.yh.saas.plugin.yiliangyiyun.mapper.TranCarInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.ITranCarInfoService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 记录车次 服务实现类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-05-31
+ */
+@Service
+public class TranCarInfoServiceImpl extends ServiceImpl<TranCarInfoMapper, TranCarInfo> implements ITranCarInfoService {
+
+}

+ 20 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.TranProcessInfo;
+import com.yh.saas.plugin.yiliangyiyun.mapper.TranProcessInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.ITranProcessInfoService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 记录调度 服务实现类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-05-31
+ */
+@Service
+public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMapper, TranProcessInfo> implements ITranProcessInfoService {
+
+}

+ 20 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranTaskInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.TranTaskInfo;
+import com.yh.saas.plugin.yiliangyiyun.mapper.TranTaskInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.ITranTaskInfoService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 记录运输任务 服务实现类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-05-31
+ */
+@Service
+public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, TranTaskInfo> implements ITranTaskInfoService {
+
+}

+ 5 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranCarInfoMapper.xml

@@ -0,0 +1,5 @@
+<?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.yh.saas.plugin.yiliangyiyun.mapper.TranCarInfoMapper">
+
+</mapper>

+ 5 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranProcessInfoMapper.xml

@@ -0,0 +1,5 @@
+<?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.yh.saas.plugin.yiliangyiyun.mapper.TranProcessInfoMapper">
+
+</mapper>

+ 5 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranTaskInfoMapper.xml

@@ -0,0 +1,5 @@
+<?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.yh.saas.plugin.yiliangyiyun.mapper.TranTaskInfoMapper">
+
+</mapper>