gongdecai 3 years ago
parent
commit
3fbd9d71b7
13 changed files with 606 additions and 1 deletions
  1. 1 1
      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/SaleOrderController.java
  3. 21 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/SalePlanInfoController.java
  4. 213 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SaleOrder.java
  5. 236 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SalePlanInfo.java
  6. 16 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/SaleOrderMapper.java
  7. 16 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/SalePlanInfoMapper.java
  8. 16 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ISaleOrderService.java
  9. 16 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ISalePlanInfoService.java
  10. 20 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SaleOrderServiceImpl.java
  11. 20 0
      winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SalePlanInfoServiceImpl.java
  12. 5 0
      winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/SaleOrderMapper.xml
  13. 5 0
      winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/SalePlanInfoMapper.xml

+ 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("Gongdc", "com.yh.saas.plugin.yiliangyiyun","purchase_closing_report");
+        generateByTables("Gongdc", "com.yh.saas.plugin.yiliangyiyun","sale_order");
     }
 
     /**

+ 21 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/SaleOrderController.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-08-04
+ */
+@RestController
+@RequestMapping("/saleOrder")
+public class SaleOrderController {
+
+}
+

+ 21 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/SalePlanInfoController.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-08-04
+ */
+@RestController
+@RequestMapping("/salePlanInfo")
+public class SalePlanInfoController {
+
+}
+

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

@@ -0,0 +1,213 @@
+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-08-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("sale_order")
+public class SaleOrder extends BaseModel<SaleOrder> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 计划表id
+     */
+    private String planId;
+    /**
+     * 公司id
+     */
+    private String compId;
+    /**
+     * 用户id
+     */
+    private String commonId;
+    /**
+     * 合同编号
+     */
+    private String contractNo;
+    /**
+     * 销售计划
+     */
+    private String salePlan;
+    /**
+     * 客户
+     */
+    private String customer;
+    /**
+     * 货名key
+     */
+    private String goodsNameKey;
+    /**
+     * 货名
+     */
+    private String goodsName;
+    /**
+     * 冻结定金(元)
+     */
+    private Float freezingDeposit;
+    /**
+     * 拖欠定金(元)
+     */
+    private Float defaultDeposit;
+    /**
+     * 平仓应付(元)
+     */
+    private Float closingPositionPayable;
+    /**
+     * 点价(元/吨)
+     */
+    private Float pointPrice;
+    /**
+     * 单价(元/吨)
+     */
+    private Float unitPrice;
+    /**
+     * 基差(元/吨)
+     */
+    private Float basis;
+    /**
+     * 卸车费(元/吨)
+     */
+    private Float unloadingCharge;
+    /**
+     * 发票费(元/吨)
+     */
+    private Float invoiceFee;
+    /**
+     * 平仓价格(元/吨)
+     */
+    private Float closeRate;
+    /**
+     * 平仓基差(元/吨)
+     */
+    private Float closingBasis;
+    /**
+     * 成交价格(元/吨)
+     */
+    private Float transactionPrice;
+    /**
+     * 交易数量(吨)
+     */
+    private Float transactionsNumber;
+    /**
+     * 平仓数量(吨)
+     */
+    private Float closingQuantity;
+    /**
+     * 可平仓量(吨)
+     */
+    private Float openPosition;
+    /**
+     * 已平仓量(吨)
+     */
+    private Float closedPosition;
+    /**
+     * 已成交量(吨)
+     */
+    private Float cumulativeTurnover;
+    /**
+     * 交易目标
+     */
+    private String tradingTarget;
+    /**
+     * 卖方
+     */
+    private String seller;
+    /**
+     * 卖方电话
+     */
+    private String sellerPhone;
+    /**
+     * 装袋备注
+     */
+    private String baggingNotes;
+    /**
+     * 包装费
+     */
+    private Float packingFee;
+    /**
+     * 结算价格
+     */
+    private Float settlementPrice;
+    /**
+     * 发票类型key
+     */
+    private String typeKey;
+    /**
+     * 发票类型
+     */
+    private String type;
+    /**
+     * 包装方式
+     */
+    private String packingType;
+    /**
+     * 包装方式key(1大袋2小袋3散装)
+     */
+    private String packingTypeKey;
+    /**
+     * 交易类型
+     */
+    private String transactionType;
+    /**
+     * 平仓日期
+     */
+    private Date closePositionDate;
+    /**
+     * 提交时间
+     */
+    private Date submissionDate;
+    /**
+     * 状态标识(1待审核3已通过5已成交7已完成)
+     */
+    private String statusFlag;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 状态英文
+     */
+    private String statusEn;
+    /**
+     * 审核流id
+     */
+    private String workflowId;
+    /**
+     * 审核状态
+     */
+    private String approveStatus;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -0,0 +1,236 @@
+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-08-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("sale_plan_info")
+public class SalePlanInfo extends BaseModel<SalePlanInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 公司id
+     */
+    private String compId;
+    /**
+     * 销售计划编号
+     */
+    private String salePlanNo;
+    /**
+     * 销售计划类型(1期货2现货)
+     */
+    private String salePlanType;
+    /**
+     * 销售计划类型key
+     */
+    private String salePlanTypeKey;
+    /**
+     * 标题
+     */
+    private String title;
+    /**
+     * 货名key
+     */
+    private String goodsNameKey;
+    /**
+     * 货名
+     */
+    private String goodsName;
+    /**
+     * 重量(吨)
+     */
+    private Float weight;
+    /**
+     * 计划销售量(吨)
+     */
+    private Float plannedSaleVolume;
+    /**
+     * 最小成交量(吨)
+     */
+    private Float minimumVolume;
+    /**
+     * 包装方式(1大袋2小袋3散装)
+     */
+    private String packingType;
+    /**
+     * 包装方式key
+     */
+    private String packingTypeKey;
+    /**
+     * 单价(元/吨)
+     */
+    private String unitPrice;
+    /**
+     * 销售价格(元/吨)
+     */
+    private String salePrice;
+    /**
+     * 基差(元/吨)
+     */
+    private String basisPrice;
+    /**
+     * 价格类型(1期货盘面价+基差2定价销售)
+     */
+    private String priceType;
+    /**
+     * 价格类型key
+     */
+    private String priceTypeKey;
+    /**
+     * 收货库
+     */
+    private String receiveWarehouse;
+    /**
+     * 收货库所在地省
+     */
+    private String receivePrivate;
+    /**
+     * 收货库所在地市
+     */
+    private String receiveCity;
+    /**
+     * 收货库所在地区
+     */
+    private String receiveArea;
+    /**
+     * 运费承担方(1可议2卖方承担3买方承担)
+     */
+    private String freightPayer;
+    /**
+     * 运费承担方key
+     */
+    private String freightPayerKey;
+    /**
+     * 装袋备注
+     */
+    private String baggingNotes;
+    /**
+     * 买方
+     */
+    private String buyer;
+    /**
+     * 买方电话
+     */
+    private String buyerPhone;
+    /**
+     * 水分
+     */
+    private String waterContent;
+    /**
+     * 杂质
+     */
+    private String impurity;
+    /**
+     * 霉变粒
+     */
+    private String mildewGrain;
+    /**
+     * 不完善粒
+     */
+    private String imperfectGrain;
+    /**
+     * 容重
+     */
+    private String bulkDensity;
+    /**
+     * 热损伤
+     */
+    private String jiaorenli;
+    /**
+     * 蛋白
+     */
+    private String protein;
+    /**
+     * 品级key
+     */
+    private String gradeKey;
+    /**
+     * 品级
+     */
+    private String grade;
+    /**
+     * 粒型key
+     */
+    private String grainKey;
+    /**
+     * 粒型
+     */
+    private String grain;
+    /**
+     * 产出年份key
+     */
+    private String outputYearKey;
+    /**
+     * 产出年份
+     */
+    private String outputYear;
+    /**
+     * 产出地省
+     */
+    private String outputPrivate;
+    /**
+     * 产出地市
+     */
+    private String outputCity;
+    /**
+     * 状态标识
+     */
+    private String statusFlag;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 状态英文
+     */
+    private String statusEn;
+    /**
+     * 显示1隐藏0
+     */
+    private String showFlag;
+    /**
+     * 粮信id
+     */
+    private String liangxinId;
+    /**
+     * 用户ID
+     */
+    private String commonId;
+    /**
+     * pc端标识
+     */
+    private String pcFlag;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.SaleOrder;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 销售订单 Mapper 接口
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-04
+ */
+public interface SaleOrderMapper extends BaseMapper<SaleOrder> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.SalePlanInfo;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 记录销售计划 Mapper 接口
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-04
+ */
+public interface SalePlanInfoMapper extends BaseMapper<SalePlanInfo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.SaleOrder;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 销售订单 服务类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-04
+ */
+public interface ISaleOrderService extends IService<SaleOrder> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.SalePlanInfo;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 记录销售计划 服务类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-04
+ */
+public interface ISalePlanInfoService extends IService<SalePlanInfo> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.SaleOrder;
+import com.yh.saas.plugin.yiliangyiyun.mapper.SaleOrderMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.ISaleOrderService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 销售订单 服务实现类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-04
+ */
+@Service
+public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder> implements ISaleOrderService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.SalePlanInfo;
+import com.yh.saas.plugin.yiliangyiyun.mapper.SalePlanInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.ISalePlanInfoService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 记录销售计划 服务实现类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-04
+ */
+@Service
+public class SalePlanInfoServiceImpl extends ServiceImpl<SalePlanInfoMapper, SalePlanInfo> implements ISalePlanInfoService {
+
+}

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

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