销售报表

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

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/SalesClosingReportController.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-05
+ */
+@RestController
+@RequestMapping("/salesClosingReport")
+public class SalesClosingReportController {
+
+}
+

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/SalesDeliveryReportController.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-05
+ */
+@RestController
+@RequestMapping("/salesDeliveryReport")
+public class SalesDeliveryReportController {
+
+}
+

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SalesClosingReport.java

@@ -0,0 +1,141 @@
+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-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("sales_closing_report")
+public class SalesClosingReport extends BaseModel<SalesClosingReport> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 公司id
+     */
+    private String compId;
+    /**
+     * 合同编号
+     */
+    private String contractNo;
+    /**
+     * 平仓日期
+     */
+    private Date closePositionDate;
+    /**
+     * 平仓数量（吨）
+     */
+    private Float closingQuantity;
+    /**
+     * 基差（元/吨）
+     */
+    private Float basisPrice;
+    /**
+     * 成交价格（元/吨）
+     */
+    private Float transactionPrice;
+    /**
+     * 平仓价格（元/吨）
+     */
+    private Float closeRate;
+    /**
+     * 付款日期
+     */
+    private Date paymentDate;
+    /**
+     * 收款日期
+     */
+    private Date collectionDate;
+    /**
+     * 应付金额（元/吨）
+     */
+    private Float amountIngPayable;
+    /**
+     * 已付金额（元/吨）
+     */
+    private Float amountEdPayable;
+    /**
+     * 未付金额（元/吨）
+     */
+    private Float amountNotPayable;
+    /**
+     * 应收金额（元/吨）
+     */
+    private Float collectionIngPayable;
+    /**
+     * 已收金额（元/吨）
+     */
+    private Float collectionEdPayable;
+    /**
+     * 未收金额（元/吨）
+     */
+    private Float collectionNotPayable;
+    /**
+     * 客户
+     */
+    private String customerName;
+    /**
+     * 库点
+     */
+    private String warehouseName;
+    /**
+     * 状态标识
+     */
+    private String statusFlag;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 状态英文
+     */
+    private String statusEn;
+    /**
+     * 审核状态
+     */
+    private String approveStatus;
+    /**
+     * 付款截图
+     */
+    private String paymentScreenshot;
+    /**
+     * 收款截图
+     */
+    private String collectionScreenshot;
+    /**
+     * 审核流id
+     */
+    private String workflowId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SalesDeliveryReport.java

@@ -0,0 +1,165 @@
+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-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("sales_delivery_report")
+public class SalesDeliveryReport extends BaseModel<SalesDeliveryReport> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 公司id
+     */
+    private String compId;
+    /**
+     * 合同编号
+     */
+    private String contractNo;
+    /**
+     * 货名key
+     */
+    private String goodsNameKey;
+    /**
+     * 货名
+     */
+    private String goodsName;
+    /**
+     * 仓位编号
+     */
+    private String positionNumber;
+    /**
+     * 派车编号
+     */
+    private String tranCarNo;
+    /**
+     * 车牌号
+     */
+    private String carNo;
+    /**
+     * 出库日期
+     */
+    private Date retrievalDate;
+    /**
+     * 水分
+     */
+    private String waterContent;
+    /**
+     * 蛋白
+     */
+    private String protein;
+    /**
+     * 结算单价（元/吨）
+     */
+    private Float settlementPrice;
+    /**
+     * 净重（吨）
+     */
+    private Float netWeight;
+    /**
+     * 应收金额（元/吨）
+     */
+    private Float collectionIngPayable;
+    /**
+     * 已收金额（元/吨）
+     */
+    private Float collectionEdPayable;
+    /**
+     * 未收金额（元/吨）
+     */
+    private Float collectionNotPayable;
+    /**
+     * 收款截图
+     */
+    private String collectionScreenshot;
+    /**
+     * 收款日期
+     */
+    private Date collectionDate;
+    /**
+     * 已开发票(元)
+     */
+    private Float alreadyInvoice;
+    /**
+     * 客户
+     */
+    private String customerName;
+    /**
+     * 库点
+     */
+    private String warehouseName;
+    /**
+     * 单价（元/吨）
+     */
+    private Float unitPrice;
+    /**
+     * 基差（元/吨）
+     */
+    private Float basisPrice;
+    /**
+     * 发票费（元/吨）
+     */
+    private Float invoiceFee;
+    /**
+     * 状态标识
+     */
+    private String statusFlag;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 状态英文
+     */
+    private String statusEn;
+    /**
+     * 审核状态
+     */
+    private String approveStatus;
+    /**
+     * 客户确认状态标识（1是3否）
+     */
+    private String customerConfirmationStatusFlag;
+    /**
+     * 客户确认状态
+     */
+    private String customerConfirmationStatus;
+    /**
+     * 审核流id
+     */
+    private String workflowId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/SalesClosingReportMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.SalesClosingReport;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 销售平仓报表 Mapper 接口
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-05
+ */
+public interface SalesClosingReportMapper extends BaseMapper<SalesClosingReport> {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/SalesDeliveryReportMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.SalesDeliveryReport;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 销售出库报表 Mapper 接口
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-05
+ */
+public interface SalesDeliveryReportMapper extends BaseMapper<SalesDeliveryReport> {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ISalesClosingReportService.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.SalesClosingReport;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 销售平仓报表 服务类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-05
+ */
+public interface ISalesClosingReportService extends IService<SalesClosingReport> {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ISalesDeliveryReportService.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.SalesDeliveryReport;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 销售出库报表 服务类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-05
+ */
+public interface ISalesDeliveryReportService extends IService<SalesDeliveryReport> {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchaseOrderServiceImpl.java

@@ -52,7 +52,7 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
     @Autowired
     private IWarehouseInOutInfoService warehouseInOutInfoService;
     @Autowired
-    private IWorkflowService workflowService;
+    private INewWorkflowService workflowService;
     @Autowired
     private GeTuiUtils geTuiUtils;
     @Autowired

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SalesClosingReportServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.SalesClosingReport;
+import com.yh.saas.plugin.yiliangyiyun.mapper.SalesClosingReportMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.ISalesClosingReportService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 销售平仓报表 服务实现类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-05
+ */
+@Service
+public class SalesClosingReportServiceImpl extends ServiceImpl<SalesClosingReportMapper, SalesClosingReport> implements ISalesClosingReportService {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SalesDeliveryReportServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.SalesDeliveryReport;
+import com.yh.saas.plugin.yiliangyiyun.mapper.SalesDeliveryReportMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.ISalesDeliveryReportService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 销售出库报表 服务实现类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-05
+ */
+@Service
+public class SalesDeliveryReportServiceImpl extends ServiceImpl<SalesDeliveryReportMapper, SalesDeliveryReport> implements ISalesDeliveryReportService {
+
+}

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

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