zhangyuewww 1 rok pred
rodič
commit
dfb4755ca1

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

@@ -53,7 +53,7 @@ public class GeneratorCodeByTables {
     }
 
     public static void main(String[] args) throws IOException {
-        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","status_record");
+        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","sales_transfer_info");
     }
 
     /**

+ 21 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/SalesTransferInfoController.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 Gdc
+ * @since 2023-02-23
+ */
+@RestController
+@RequestMapping("/salesTransferInfo")
+public class SalesTransferInfoController {
+
+}
+

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

@@ -0,0 +1,98 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import java.io.Serializable;
+
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+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 Gdc
+ * @since 2023-02-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("sales_transfer_info")
+public class SalesTransferInfo extends BaseModel<SalesTransferInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 公司id
+     */
+    private String compId;
+    /**
+     * 原合同编号
+     */
+    private String contractNo;
+    /**
+     * 原合同提示
+     */
+    private String pointOut;
+    /**
+     * 原出库任务
+     */
+    private String taskNo;
+    /**
+     * 新合同编号
+     */
+    private String contractNoNew;
+    /**
+     * 新合同提示
+     */
+    private String pointOutNew;
+    /**
+     * 新出库任务
+     */
+    private String taskNoNew;
+    /**
+     * 新运输任务
+     */
+    private String tranTaskNew;
+    /**
+     * 状态标识
+     */
+    private String statusFlag;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 状态英文
+     */
+    private String statusEn;
+    /**
+     * 审核状态
+     */
+    private String approveStatus;
+    /**
+     * 审核状态英文
+     */
+    private String approveStatusEn;
+    /**
+     * 工作流ID
+     */
+    private String workflowId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -61,6 +61,18 @@ public class TranCarInfo extends BaseModel<TranCarInfo> {
      * 司机姓名/联络员姓名
      */
     private String driver;
+    /**
+     * 销售转移id
+     */
+    private String salesTransferId;
+    /**
+     * 原运输任务
+     */
+    private String tranTaskOld;
+    /**
+     * 原运费
+     */
+    private Float tranPriceOld;
     /**
      * 计费方式(1按吨,2按车)
      */

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

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.SalesTransferInfo;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 记录销售转移信息 Mapper 接口
+ * </p>
+ *
+ * @author Gdc
+ * @since 2023-02-23
+ */
+public interface SalesTransferInfoMapper extends BaseMapper<SalesTransferInfo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.SalesTransferInfo;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 记录销售转移信息 服务类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2023-02-23
+ */
+public interface ISalesTransferInfoService extends IService<SalesTransferInfo> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.SalesTransferInfo;
+import com.yh.saas.plugin.yiliangyiyun.mapper.SalesTransferInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.ISalesTransferInfoService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 记录销售转移信息 服务实现类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2023-02-23
+ */
+@Service
+public class SalesTransferInfoServiceImpl extends ServiceImpl<SalesTransferInfoMapper, SalesTransferInfo> implements ISalesTransferInfoService {
+
+}

+ 5 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/SalesTransferInfoMapper.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.SalesTransferInfoMapper">
+
+</mapper>