销售收入上缴-v1.0

src/main/java/com/chinaitop/depot/intelligent/priceApproval/controller/BusinessFsSaleRevenueController.java

@@ -0,0 +1,69 @@
+package com.chinaitop.depot.intelligent.priceApproval.controller;
+
+
+import com.chinaitop.depot.intelligent.common.ResponseEntity;
+import com.chinaitop.depot.intelligent.priceApproval.model.*;
+import com.chinaitop.depot.intelligent.priceApproval.service.BusinessFsSaleRevenueService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴 前端控制器
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+@RestController
+@RequestMapping("/business-fs-sale-revenue")
+@Api(tags = "销售收入上缴")
+public class BusinessFsSaleRevenueController {
+    @Resource
+    private BusinessFsSaleRevenueService saleRevenueService;
+
+    @GetMapping("/getContractInfo/{orgId}")
+    @ApiOperation(value = "合同编号下拉", notes = "包含合同其它信息")
+    public ResponseEntity<List<BusinessContract>> getContractInfo(@PathVariable("orgId") Integer orgId) {
+        return ResponseEntity.ok(saleRevenueService.getContractInfo(orgId));
+    }
+
+    @GetMapping("/getContractInfoById/{id}")
+    @ApiOperation(value = "合同信息", notes = "合同编号下拉id")
+    public ResponseEntity<List<BusinessContractDetail>> getContractInfoList(@PathVariable("id") Integer id) {
+        return ResponseEntity.ok(saleRevenueService.getContractInfoList(id));
+    }
+
+    @GetMapping("/getConsistenceAccountInfo/{orgId}/{basicStorehouseId}/{warehouseId}")
+    @ApiOperation(value = "质检损益信息", notes = "质检损益信息")
+    public ResponseEntity<List<BusinessFsSaleRevenueInspectionLoss>> getQualityInfo(@PathVariable("orgId") Integer orgId,
+                                                                                    @PathVariable("basicStorehouseId") Integer basicStorehouseId,
+                                                                                    @PathVariable("warehouseId") Integer warehouseId) {
+        return ResponseEntity.ok(saleRevenueService.getQualityInfo(orgId, basicStorehouseId, warehouseId));
+    }
+
+    @GetMapping("/getConsistenceAccountInfo/{contractNumber}")
+    @ApiOperation(value = "三账一致性-会计账", notes = "会计账")
+    public ResponseEntity<List<BusinessFsSaleRevenueThreeConsistence>> getConsistenceAccountInfo(@PathVariable("contractNumber") String contractNumber) {
+        return ResponseEntity.ok(saleRevenueService.getConsistenceAccountInfo(contractNumber));
+    }
+
+    @GetMapping("/getOutStorageInfo/{contractNumber}")
+    @ApiOperation(value = "三账一致性-实际出库情况*", notes = "实际出库情况")
+    public ResponseEntity<List<BusinessFsSaleRevenueThreeConsistence>> getOutStorageInfo(@PathVariable("contractNumber") String contractNumber) {
+        return ResponseEntity.ok(saleRevenueService.getOutStorageInfo(contractNumber));
+    }
+
+    @PostMapping("/save")
+    @ApiOperation(value = "销售收入上缴新增*", notes = "新增")
+    public ResponseEntity save(@Validated @RequestBody BusinessFsSaleRevenue param) {
+        saleRevenueService.saveData(param);
+        return ResponseEntity.ok();
+    }
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/mapper/BusinessFsSaleRevenueApprovalPriceMapper.java

@@ -0,0 +1,16 @@
+package com.chinaitop.depot.intelligent.priceApproval.mapper;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueApprovalPrice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-原核定入库价格 Mapper 接口
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+public interface BusinessFsSaleRevenueApprovalPriceMapper extends BaseMapper<BusinessFsSaleRevenueApprovalPrice> {
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/mapper/BusinessFsSaleRevenueDiffPriceMapper.java

@@ -0,0 +1,16 @@
+package com.chinaitop.depot.intelligent.priceApproval.mapper;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueDiffPrice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-差额上缴 Mapper 接口
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+public interface BusinessFsSaleRevenueDiffPriceMapper extends BaseMapper<BusinessFsSaleRevenueDiffPrice> {
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/mapper/BusinessFsSaleRevenueInspectionLossMapper.java

@@ -0,0 +1,16 @@
+package com.chinaitop.depot.intelligent.priceApproval.mapper;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueInspectionLoss;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-质检损益信息 Mapper 接口
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+public interface BusinessFsSaleRevenueInspectionLossMapper extends BaseMapper<BusinessFsSaleRevenueInspectionLoss> {
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/mapper/BusinessFsSaleRevenueMapper.java

@@ -0,0 +1,27 @@
+package com.chinaitop.depot.intelligent.priceApproval.mapper;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.*;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴 Mapper 接口
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+public interface BusinessFsSaleRevenueMapper extends BaseMapper<BusinessFsSaleRevenue> {
+
+    List<BusinessContract> getContractInfo(@Param("orgId") Integer orgId);
+
+    List<BusinessContractDetail> getContractInfoList(@Param("id") Integer id);
+
+    List<BusinessFsSaleRevenueInspectionLoss> getQualityInfo(Map<String, Object> map);
+
+    List<BusinessFsSaleRevenueThreeConsistence> getConsistenceAccountInfo(@Param("contractNumber") String contractNumber);
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/mapper/BusinessFsSaleRevenueSettleMapper.java

@@ -0,0 +1,16 @@
+package com.chinaitop.depot.intelligent.priceApproval.mapper;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueSettle;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-结算信息 Mapper 接口
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+public interface BusinessFsSaleRevenueSettleMapper extends BaseMapper<BusinessFsSaleRevenueSettle> {
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/mapper/BusinessFsSaleRevenueThreeConsistenceMapper.java

@@ -0,0 +1,16 @@
+package com.chinaitop.depot.intelligent.priceApproval.mapper;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueThreeConsistence;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-三账一致性 Mapper 接口
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+public interface BusinessFsSaleRevenueThreeConsistenceMapper extends BaseMapper<BusinessFsSaleRevenueThreeConsistence> {
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/model/BusinessContractDetail.java

@@ -14,6 +14,12 @@ public class BusinessContractDetail {
     @ApiModelProperty(value = "主键ID")
     private Integer id;
 
+    @ApiModelProperty(value = "仓房名称(销售收入上缴)")
+    private String houseName;
+
+    @ApiModelProperty(value = "货位名称(销售收入上缴)")
+    private String warehouseName;
+
     @ApiModelProperty(value = "粮油品种编码")
     private String grainKind;
 

src/main/java/com/chinaitop/depot/intelligent/priceApproval/model/BusinessFsSaleRevenue.java

@@ -0,0 +1,99 @@
+package com.chinaitop.depot.intelligent.priceApproval.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("business_fs_sale_revenue")
+@ApiModel(value="BusinessFsSaleRevenue对象", description="财务监管-销售收入上缴")
+public class BusinessFsSaleRevenue implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("createname")
+    private String createname;
+
+    @ApiModelProperty(value = "创建日期")
+    @TableField("createdate")
+    private Date createdate;
+
+    @ApiModelProperty(value = "更新人")
+    @TableField("updatename")
+    private String updatename;
+
+    @ApiModelProperty(value = "更新日期")
+    @TableField("updatedate")
+    private Date updatedate;
+
+    @ApiModelProperty(value = "上报库区；org_info的id；")
+    @TableField("org_id")
+    private Integer orgId;
+
+    @ApiModelProperty(value = "上报时间")
+    @TableField("report_time")
+    private Date reportTime;
+
+    @ApiModelProperty(value = "计划类型")
+    @TableField("plan_type")
+    private String planType;
+
+    @ApiModelProperty(value = "销往单位")
+    @TableField("sales_unit")
+    private String salesUnit;
+
+    @ApiModelProperty(value = "合同编号；business_contract的ID；")
+    @TableField("contract_id")
+    private Integer contractId;
+
+    @ApiModelProperty(value = "问题跟踪反馈")
+    @TableField("problem_feedback")
+    private String problemFeedback;
+
+    @ApiModelProperty(value = "状态 0：保存；1：上报；2：已核定；")
+    @TableField("status")
+    private Integer status;
+
+    @ApiModelProperty(value = "质检损益信息")
+    @TableField(exist = false)
+    private List<BusinessFsSaleRevenueInspectionLoss> inspectionLossList;
+
+    @ApiModelProperty(value = "三账一致性")
+    @TableField(exist = false)
+    private List<BusinessFsSaleRevenueThreeConsistence> threeConsistenceList;
+
+    @ApiModelProperty(value = "结算信息")
+    @TableField(exist = false)
+    private List<BusinessFsSaleRevenueSettle> revenueSettleList;
+
+    @ApiModelProperty(value = "原核定入库价格")
+    @TableField(exist = false)
+    private List<BusinessFsSaleRevenueApprovalPrice> approvalPriceList;
+
+    @ApiModelProperty(value = "差额上缴")
+    @TableField(exist = false)
+    private List<BusinessFsSaleRevenueDiffPrice> DiffPriceList;
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/model/BusinessFsSaleRevenueApprovalPrice.java

@@ -0,0 +1,72 @@
+package com.chinaitop.depot.intelligent.priceApproval.model;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-原核定入库价格
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("business_fs_sale_revenue_approval_price")
+@ApiModel(value="BusinessFsSaleRevenueApprovalPrice对象", description="财务监管-销售收入上缴-原核定入库价格")
+public class BusinessFsSaleRevenueApprovalPrice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("createname")
+    private String createname;
+
+    @ApiModelProperty(value = "创建日期")
+    @TableField("createdate")
+    private Date createdate;
+
+    @ApiModelProperty(value = "更新人")
+    @TableField("updatename")
+    private String updatename;
+
+    @ApiModelProperty(value = "更新日期")
+    @TableField("updatedate")
+    private Date updatedate;
+
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID；")
+    @TableField("fs_sale_revenue_id")
+    private Integer fsSaleRevenueId;
+
+    @ApiModelProperty(value = "原粮专卡ID；grain_situation_card的ID；")
+    @TableField("grain_situation_card_id")
+    private Integer grainSituationCardId;
+
+    @ApiModelProperty(value = "入库金额")
+    @TableField("storage_amount")
+    private BigDecimal storageAmount;
+
+    @ApiModelProperty(value = "文件号")
+    @TableField("document_number")
+    private String documentNumber;
+
+    @ApiModelProperty(value = "文档上传")
+    @TableField("document_upload")
+    private String documentUpload;
+
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/model/BusinessFsSaleRevenueDiffPrice.java

@@ -0,0 +1,76 @@
+package com.chinaitop.depot.intelligent.priceApproval.model;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-差额上缴
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("business_fs_sale_revenue_diff_price")
+@ApiModel(value="BusinessFsSaleRevenueDiffPrice对象", description="财务监管-销售收入上缴-差额上缴")
+public class BusinessFsSaleRevenueDiffPrice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("createname")
+    private String createname;
+
+    @ApiModelProperty(value = "创建日期")
+    @TableField("createdate")
+    private Date createdate;
+
+    @ApiModelProperty(value = "更新人")
+    @TableField("updatename")
+    private String updatename;
+
+    @ApiModelProperty(value = "更新日期")
+    @TableField("updatedate")
+    private Date updatedate;
+
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID；")
+    @TableField("fs_sale_revenue_id")
+    private Integer fsSaleRevenueId;
+
+    @ApiModelProperty(value = "项目类型 1：销售；2：损耗；3：入库（用负数表示）；4：交易手续费（用负数表示）；")
+    @TableField("project_type")
+    private Integer projectType;
+
+    @ApiModelProperty(value = "数量")
+    @TableField("total_quantity")
+    private BigDecimal totalQuantity;
+
+    @ApiModelProperty(value = "省平台修改-数量")
+    @TableField("province_total_quantity")
+    private BigDecimal provinceTotalQuantity;
+
+    @ApiModelProperty(value = "金额")
+    @TableField("total_amount")
+    private BigDecimal totalAmount;
+
+    @ApiModelProperty(value = "省平台修改-金额")
+    @TableField("province_total_amount")
+    private BigDecimal provinceTotalAmount;
+
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/model/BusinessFsSaleRevenueInspectionLoss.java

@@ -0,0 +1,126 @@
+package com.chinaitop.depot.intelligent.priceApproval.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-质检损益信息
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("business_fs_sale_revenue_inspection_loss")
+@ApiModel(value="BusinessFsSaleRevenueInspectionLoss对象", description="财务监管-销售收入上缴-质检损益信息")
+public class BusinessFsSaleRevenueInspectionLoss implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("createname")
+    private String createname;
+
+    @ApiModelProperty(value = "创建日期")
+    @TableField("createdate")
+    private Date createdate;
+
+    @ApiModelProperty(value = "更新人")
+    @TableField("updatename")
+    private String updatename;
+
+    @ApiModelProperty(value = "更新日期")
+    @TableField("updatedate")
+    private Date updatedate;
+
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID；")
+    @TableField("fs_sale_revenue_id")
+    private Integer fsSaleRevenueId;
+
+    @ApiModelProperty(value = "出库质检报告；business_qc_quality_inspection的id；")
+    @TableField("qc_quality_inspection_id_out")
+    private Integer qcQualityInspectionIdOut;
+
+    @ApiModelProperty(value = "入库质检报告；business_qc_quality_inspection的id；")
+    @TableField("qc_quality_inspection_id_in")
+    private Integer qcQualityInspectionIdIn;
+
+    @ApiModelProperty(value = "损溢损失信息；business_gslr_loss_collect的id；")
+    @TableField("gslr_loss_collect_id")
+    private Integer gslrLossCollectId;
+
+    // 业务数据
+    @ApiModelProperty(value = "报告单号-入库单号")
+    @TableField(exist = false)
+    private String zjbgdhIn;
+
+    @ApiModelProperty(value = "仓房名称")
+    @TableField(exist = false)
+    private String storehouseName;
+
+    @ApiModelProperty(value = "货位名称")
+    @TableField(exist = false)
+    private String warehouseName;
+
+    @ApiModelProperty(value = "入仓杂质")
+    @TableField(exist = false)
+    private String zzIn;
+
+    @ApiModelProperty(value = "入仓水分")
+    @TableField(exist = false)
+    private String sfIn;
+
+    @ApiModelProperty(value = "报告单号-出库单号")
+    @TableField(exist = false)
+    private String zjbgdhOut;
+
+    @ApiModelProperty(value = "出仓杂质")
+    @TableField(exist = false)
+    private String zzOut;
+
+    @ApiModelProperty(value = "出仓水分")
+    @TableField(exist = false)
+    private String sfOut;
+
+    @ApiModelProperty(value = "实际损耗量（公斤）")
+    @TableField(exist = false)
+    private String actualLossQuantity;
+
+    @ApiModelProperty(value = "定额损耗小计（公斤）")
+    @TableField(exist = false)
+    private String quotaLoss;
+
+    @ApiModelProperty(value = "保管损耗（公斤）")
+    @TableField(exist = false)
+    private String naturalLoss;
+
+    @ApiModelProperty(value = "水分减量（公斤）")
+    @TableField(exist = false)
+    private String moistureLoss;
+
+    @ApiModelProperty(value = "杂质减量（公斤）")
+    @TableField(exist = false)
+    private String impurityReductionQuality;
+
+    @ApiModelProperty(value = "超耗数量（公斤）")
+    @TableField(exist = false)
+    private String excessLossQuantity;
+
+    @ApiModelProperty(value = "超耗原因")
+    @TableField(exist = false)
+    private String lossProfitReason;
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/model/BusinessFsSaleRevenueSettle.java

@@ -0,0 +1,108 @@
+package com.chinaitop.depot.intelligent.priceApproval.model;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-结算信息
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("business_fs_sale_revenue_settle")
+@ApiModel(value="BusinessFsSaleRevenueSettle对象", description="财务监管-销售收入上缴-结算信息")
+public class BusinessFsSaleRevenueSettle implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("createname")
+    private String createname;
+
+    @ApiModelProperty(value = "创建日期")
+    @TableField("createdate")
+    private Date createdate;
+
+    @ApiModelProperty(value = "更新人")
+    @TableField("updatename")
+    private String updatename;
+
+    @ApiModelProperty(value = "更新日期")
+    @TableField("updatedate")
+    private Date updatedate;
+
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID；")
+    @TableField("fs_sale_revenue_id")
+    private Integer fsSaleRevenueId;
+
+    @ApiModelProperty(value = "business_fs_out_confirm的ID；")
+    @TableField("fs_out_confirm_id")
+    private Integer fsOutConfirmId;
+
+    @ApiModelProperty(value = "省平台修改-出库验收确认-销往单位")
+    @TableField("province_acceptance_unit")
+    private String provinceAcceptanceUnit;
+
+    @ApiModelProperty(value = "省平台修改-出库确认单-数量（吨）")
+    @TableField("province_total_settle_quantity")
+    private BigDecimal provinceTotalSettleQuantity;
+
+    @ApiModelProperty(value = "省平台修改-出库确认单-金额，单位：元")
+    @TableField("province_total_settle_amount")
+    private BigDecimal provinceTotalSettleAmount;
+
+    @ApiModelProperty(value = "省平台修改-贷款收回情况-单位")
+    @TableField("province_loan_recovery_unit")
+    private String provinceLoanRecoveryUnit;
+
+    @ApiModelProperty(value = "省平台修改-贷款收回情况-数量")
+    @TableField("province_loan_recovery_quantity")
+    private BigDecimal provinceLoanRecoveryQuantity;
+
+    @ApiModelProperty(value = "省平台修改-贷款收回情况-金额")
+    @TableField("province_loan_recovery_amount")
+    private BigDecimal provinceLoanRecoveryAmount;
+
+    @ApiModelProperty(value = "省平台修改-销售发票情况-单位")
+    @TableField("province_invoice_unit")
+    private String provinceInvoiceUnit;
+
+    @ApiModelProperty(value = "省平台修改-销售发票情况-发票数量")
+    @TableField("province_invoice_quantity")
+    private Integer provinceInvoiceQuantity;
+
+    @ApiModelProperty(value = "省平台修改-销售发票情况-发票单价")
+    @TableField("province_invoice_unit_price")
+    private BigDecimal provinceInvoiceUnitPrice;
+
+    @ApiModelProperty(value = "省平台修改-销售发票情况-发票金额")
+    @TableField("province_invoice_amount")
+    private BigDecimal provinceInvoiceAmount;
+
+    @ApiModelProperty(value = "省平台修改-贷款归还-日期")
+    @TableField("province_loan_return_time")
+    private Date provinceLoanReturnTime;
+
+    @ApiModelProperty(value = "省平台修改-贷款归还-金额")
+    @TableField("province_loan_return_amount")
+    private BigDecimal provinceLoanReturnAmount;
+
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/model/BusinessFsSaleRevenueThreeConsistence.java

@@ -0,0 +1,134 @@
+package com.chinaitop.depot.intelligent.priceApproval.model;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-三账一致性
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("business_fs_sale_revenue_three_consistence")
+@ApiModel(value="BusinessFsSaleRevenueThreeConsistence对象", description="财务监管-销售收入上缴-三账一致性")
+public class BusinessFsSaleRevenueThreeConsistence implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("createname")
+    private String createname;
+
+    @ApiModelProperty(value = "创建日期")
+    @TableField("createdate")
+    private Date createdate;
+
+    @ApiModelProperty(value = "更新人")
+    @TableField("updatename")
+    private String updatename;
+
+    @ApiModelProperty(value = "更新日期")
+    @TableField("updatedate")
+    private Date updatedate;
+
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID")
+    @TableField("fs_sale_revenue_id")
+    private Integer fsSaleRevenueId;
+
+    @ApiModelProperty(value = "年")
+    @TableField("year")
+    private Date year;
+
+    @ApiModelProperty(value = "月份")
+    @TableField("month")
+    private String month;
+
+    @ApiModelProperty(value = "出库情况-仓号；basic_storehouse的id；仓房id")
+    @TableField("basic_storehouse_id")
+    private Integer basicStorehouseId;
+
+    @ApiModelProperty(value = "basic_warehouse的id；货位id;")
+    @TableField("warehouse_id")
+    private Integer warehouseId;
+
+    @ApiModelProperty(value = "出库情况-其中：损耗")
+    @TableField("loss")
+    private BigDecimal loss;
+
+    @ApiModelProperty(value = "省平台修改-出库情况-其中：损耗")
+    @TableField("province_loss")
+    private BigDecimal provinceLoss;
+
+    @ApiModelProperty(value = "出库情况-保管账数量")
+    @TableField("custody_account_quantity")
+    private BigDecimal custodyAccountQuantity;
+
+    @ApiModelProperty(value = "省平台修改-出库情况-保管账数量")
+    @TableField("province_custody_account_quantity")
+    private String provinceCustodyAccountQuantity;
+
+    @ApiModelProperty(value = "出库情况-统计账数量，单位：公斤；")
+    @TableField("statistical_account_quantity")
+    private BigDecimal statisticalAccountQuantity;
+
+    @ApiModelProperty(value = "省平台修改-出库情况-统计账数量，单位：公斤；")
+    @TableField("province_statistical_account_quantity")
+    private BigDecimal provinceStatisticalAccountQuantity;
+
+    @ApiModelProperty(value = "完成时间")
+    @TableField("complete_time")
+    private Date completeTime;
+
+    @ApiModelProperty(value = "省平台修改-完成时间")
+    @TableField("province_complete_time")
+    private Date provinceCompleteTime;
+
+    @ApiModelProperty(value = "会计账-数量，单位：公斤")
+    @TableField("accounting_quantity")
+    private BigDecimal accountingQuantity;
+
+    @ApiModelProperty(value = "省平台修改-会计账-数量，单位：公斤；")
+    @TableField("province_accounting_quantity")
+    private BigDecimal provinceAccountingQuantity;
+
+    @ApiModelProperty(value = "会计账-单价，单位：元/公斤")
+    @TableField("accounting_unit_price")
+    private BigDecimal accountingUnitPrice;
+
+    @ApiModelProperty(value = "省平台修改-会计账-单价，单位：元/公斤")
+    @TableField("province_accounting_unit_price")
+    private BigDecimal provinceAccountingUnitPrice;
+
+    @ApiModelProperty(value = "会计账-金额，单位：元")
+    @TableField("accounting_amount")
+    private BigDecimal accountingAmount;
+
+    @ApiModelProperty(value = "省平台修改-会计账-金额，单位：元")
+    @TableField("province_accounting_amount")
+    private BigDecimal provinceAccountingAmount;
+
+    @ApiModelProperty(value = "仓房名称")
+    @TableField(exist = false)
+    private String storehouseName;
+
+    @ApiModelProperty(value = "货位名称")
+    @TableField(exist = false)
+    private String warehouseName;
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/BusinessFsSaleRevenueApprovalPriceService.java

@@ -0,0 +1,16 @@
+package com.chinaitop.depot.intelligent.priceApproval.service;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueApprovalPrice;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-原核定入库价格 服务类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+public interface BusinessFsSaleRevenueApprovalPriceService extends IService<BusinessFsSaleRevenueApprovalPrice> {
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/BusinessFsSaleRevenueDiffPriceService.java

@@ -0,0 +1,16 @@
+package com.chinaitop.depot.intelligent.priceApproval.service;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueDiffPrice;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-差额上缴 服务类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+public interface BusinessFsSaleRevenueDiffPriceService extends IService<BusinessFsSaleRevenueDiffPrice> {
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/BusinessFsSaleRevenueInspectionLossService.java

@@ -0,0 +1,16 @@
+package com.chinaitop.depot.intelligent.priceApproval.service;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueInspectionLoss;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-质检损益信息 服务类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+public interface BusinessFsSaleRevenueInspectionLossService extends IService<BusinessFsSaleRevenueInspectionLoss> {
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/BusinessFsSaleRevenueService.java

@@ -0,0 +1,29 @@
+package com.chinaitop.depot.intelligent.priceApproval.service;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴 服务类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+public interface BusinessFsSaleRevenueService extends IService<BusinessFsSaleRevenue> {
+
+    void saveData(BusinessFsSaleRevenue param);
+
+    List<BusinessContract> getContractInfo(Integer orgId);
+
+    List<BusinessContractDetail> getContractInfoList(Integer id);
+
+    List<BusinessFsSaleRevenueInspectionLoss> getQualityInfo(Integer orgId, Integer basicStorehouseId, Integer warehouseId);
+
+    List<BusinessFsSaleRevenueThreeConsistence> getConsistenceAccountInfo(String contractNumber);
+
+    List<BusinessFsSaleRevenueThreeConsistence> getOutStorageInfo(String contractNumber);
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/BusinessFsSaleRevenueSettleService.java

@@ -0,0 +1,16 @@
+package com.chinaitop.depot.intelligent.priceApproval.service;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueSettle;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-结算信息 服务类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+public interface BusinessFsSaleRevenueSettleService extends IService<BusinessFsSaleRevenueSettle> {
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/BusinessFsSaleRevenueThreeConsistenceService.java

@@ -0,0 +1,16 @@
+package com.chinaitop.depot.intelligent.priceApproval.service;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueThreeConsistence;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-三账一致性 服务类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+public interface BusinessFsSaleRevenueThreeConsistenceService extends IService<BusinessFsSaleRevenueThreeConsistence> {
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/impl/BusinessFsSaleRevenueApprovalPriceServiceImpl.java

@@ -0,0 +1,20 @@
+package com.chinaitop.depot.intelligent.priceApproval.service.impl;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueApprovalPrice;
+import com.chinaitop.depot.intelligent.priceApproval.mapper.BusinessFsSaleRevenueApprovalPriceMapper;
+import com.chinaitop.depot.intelligent.priceApproval.service.BusinessFsSaleRevenueApprovalPriceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-原核定入库价格 服务实现类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+@Service
+public class BusinessFsSaleRevenueApprovalPriceServiceImpl extends ServiceImpl<BusinessFsSaleRevenueApprovalPriceMapper, BusinessFsSaleRevenueApprovalPrice> implements BusinessFsSaleRevenueApprovalPriceService {
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/impl/BusinessFsSaleRevenueDiffPriceServiceImpl.java

@@ -0,0 +1,20 @@
+package com.chinaitop.depot.intelligent.priceApproval.service.impl;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueDiffPrice;
+import com.chinaitop.depot.intelligent.priceApproval.mapper.BusinessFsSaleRevenueDiffPriceMapper;
+import com.chinaitop.depot.intelligent.priceApproval.service.BusinessFsSaleRevenueDiffPriceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-差额上缴 服务实现类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+@Service
+public class BusinessFsSaleRevenueDiffPriceServiceImpl extends ServiceImpl<BusinessFsSaleRevenueDiffPriceMapper, BusinessFsSaleRevenueDiffPrice> implements BusinessFsSaleRevenueDiffPriceService {
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/impl/BusinessFsSaleRevenueInspectionLossServiceImpl.java

@@ -0,0 +1,20 @@
+package com.chinaitop.depot.intelligent.priceApproval.service.impl;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueInspectionLoss;
+import com.chinaitop.depot.intelligent.priceApproval.mapper.BusinessFsSaleRevenueInspectionLossMapper;
+import com.chinaitop.depot.intelligent.priceApproval.service.BusinessFsSaleRevenueInspectionLossService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-质检损益信息 服务实现类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+@Service
+public class BusinessFsSaleRevenueInspectionLossServiceImpl extends ServiceImpl<BusinessFsSaleRevenueInspectionLossMapper, BusinessFsSaleRevenueInspectionLoss> implements BusinessFsSaleRevenueInspectionLossService {
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/impl/BusinessFsSaleRevenueServiceImpl.java

@@ -0,0 +1,131 @@
+package com.chinaitop.depot.intelligent.priceApproval.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.chinaitop.depot.intelligent.priceApproval.mapper.*;
+import com.chinaitop.depot.intelligent.priceApproval.model.*;
+import com.chinaitop.depot.intelligent.priceApproval.service.BusinessFsSaleRevenueService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴 服务实现类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+@Service
+public class BusinessFsSaleRevenueServiceImpl extends ServiceImpl<BusinessFsSaleRevenueMapper, BusinessFsSaleRevenue> implements BusinessFsSaleRevenueService {
+    @Resource
+    private BusinessFsSaleRevenueMapper saleRevenueMapper;
+    @Resource
+    private BusinessFsSaleRevenueInspectionLossMapper saleRevenueInspectionLossMapper;
+    @Resource
+    private BusinessFsSaleRevenueThreeConsistenceMapper threeConsistenceMapper;
+    @Resource
+    private BusinessFsSaleRevenueSettleMapper settleMapper;
+    @Resource
+    private BusinessFsSaleRevenueApprovalPriceMapper approvalPriceMapper;
+    @Resource
+    private BusinessFsSaleRevenueDiffPriceMapper diffPriceMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveData(BusinessFsSaleRevenue param) {
+        // 保存主表
+        saleRevenueMapper.insert(param);
+        // 保存子表-质检损益信息
+        this.saveInspectionLoss(param);
+        // 保存子表-三账一致性
+        this.saveThreeConsistence(param);
+        // 保存子表-结算信息
+        this.saveSettle(param);
+        // 保存子表-原核定入库价格
+        this.saveApprovalPrice(param);
+        // 保存子表-差价上缴
+        this.saveDiffPrice(param);
+    }
+
+    @Override
+    public List<BusinessContract> getContractInfo(Integer orgId) {
+        return saleRevenueMapper.getContractInfo(orgId);
+    }
+
+    @Override
+    public List<BusinessContractDetail> getContractInfoList(Integer id) {
+        return saleRevenueMapper.getContractInfoList(id);
+    }
+
+    @Override
+    public List<BusinessFsSaleRevenueInspectionLoss> getQualityInfo(Integer orgId, Integer basicStorehouseId, Integer warehouseId) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("orgId", orgId);
+        map.put("basicStorehouseId", basicStorehouseId);
+        map.put("warehouseId", warehouseId);
+        return saleRevenueMapper.getQualityInfo(map);
+    }
+
+    @Override
+    public List<BusinessFsSaleRevenueThreeConsistence> getConsistenceAccountInfo(String contractNumber) {
+        return saleRevenueMapper.getConsistenceAccountInfo(contractNumber);
+    }
+
+    @Override
+    public List<BusinessFsSaleRevenueThreeConsistence> getOutStorageInfo(String contractNumber) {
+        return null;
+    }
+
+    // 保存子表-质检损益信息
+    private void saveInspectionLoss(BusinessFsSaleRevenue param) {
+        if (CollectionUtils.isNotEmpty(param.getInspectionLossList())) {
+            param.getInspectionLossList().forEach(inspectionLoss -> {
+                inspectionLoss.setFsSaleRevenueId(param.getId());
+                saleRevenueInspectionLossMapper.insert(inspectionLoss);
+            });
+        }
+    }
+
+    // 保存子表-三账一致性
+    private void saveThreeConsistence(BusinessFsSaleRevenue param) {
+        if (CollectionUtils.isNotEmpty(param.getThreeConsistenceList())) {
+            param.getThreeConsistenceList().forEach(threeConsistence -> {
+                threeConsistence.setFsSaleRevenueId(param.getId());
+                threeConsistenceMapper.insert(threeConsistence);
+            });
+        }
+    }
+    // 保存子表-结算信息
+    private void saveSettle(BusinessFsSaleRevenue param) {
+        if (CollectionUtils.isNotEmpty(param.getRevenueSettleList())) {
+            param.getRevenueSettleList().forEach(settle -> {
+                settle.setFsSaleRevenueId(param.getId());
+                settleMapper.insert(settle);
+            });
+        }
+    }
+    // 保存子表-原核定入库价格
+    private void saveApprovalPrice(BusinessFsSaleRevenue param) {
+        if (CollectionUtils.isNotEmpty(param.getApprovalPriceList())) {
+            param.getApprovalPriceList().forEach(approvalPrice -> {
+                approvalPrice.setFsSaleRevenueId(param.getId());
+                approvalPriceMapper.insert(approvalPrice);
+            });
+        }
+    }
+    // 保存子表-差价上缴
+    private void saveDiffPrice(BusinessFsSaleRevenue param) {
+        if (CollectionUtils.isNotEmpty(param.getDiffPriceList())) {
+            param.getDiffPriceList().forEach(diffPrice -> {
+                diffPrice.setFsSaleRevenueId(param.getId());
+                diffPriceMapper.insert(diffPrice);
+            });
+        }
+    }
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/impl/BusinessFsSaleRevenueSettleServiceImpl.java

@@ -0,0 +1,20 @@
+package com.chinaitop.depot.intelligent.priceApproval.service.impl;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueSettle;
+import com.chinaitop.depot.intelligent.priceApproval.mapper.BusinessFsSaleRevenueSettleMapper;
+import com.chinaitop.depot.intelligent.priceApproval.service.BusinessFsSaleRevenueSettleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-结算信息 服务实现类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+@Service
+public class BusinessFsSaleRevenueSettleServiceImpl extends ServiceImpl<BusinessFsSaleRevenueSettleMapper, BusinessFsSaleRevenueSettle> implements BusinessFsSaleRevenueSettleService {
+
+}

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/impl/BusinessFsSaleRevenueThreeConsistenceServiceImpl.java

@@ -0,0 +1,20 @@
+package com.chinaitop.depot.intelligent.priceApproval.service.impl;
+
+import com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueThreeConsistence;
+import com.chinaitop.depot.intelligent.priceApproval.mapper.BusinessFsSaleRevenueThreeConsistenceMapper;
+import com.chinaitop.depot.intelligent.priceApproval.service.BusinessFsSaleRevenueThreeConsistenceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-三账一致性 服务实现类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-24
+ */
+@Service
+public class BusinessFsSaleRevenueThreeConsistenceServiceImpl extends ServiceImpl<BusinessFsSaleRevenueThreeConsistenceMapper, BusinessFsSaleRevenueThreeConsistence> implements BusinessFsSaleRevenueThreeConsistenceService {
+
+}

src/main/resources/mapper/priceApproval/BusinessFsSaleRevenueApprovalPriceMapper.xml

@@ -0,0 +1,24 @@
+<?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.chinaitop.depot.intelligent.priceApproval.mapper.BusinessFsSaleRevenueApprovalPriceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueApprovalPrice">
+        <id column="id" property="id" />
+        <result column="createname" property="createname" />
+        <result column="createdate" property="createdate" />
+        <result column="updatename" property="updatename" />
+        <result column="updatedate" property="updatedate" />
+        <result column="fs_sale_revenue_id" property="fsSaleRevenueId" />
+        <result column="grain_situation_card_id" property="grainSituationCardId" />
+        <result column="storage_amount" property="storageAmount" />
+        <result column="document_number" property="documentNumber" />
+        <result column="document_upload" property="documentUpload" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, createname, createdate, updatename, updatedate, fs_sale_revenue_id, grain_situation_card_id, storage_amount, document_number, document_upload
+    </sql>
+
+</mapper>

src/main/resources/mapper/priceApproval/BusinessFsSaleRevenueDiffPriceMapper.xml

@@ -0,0 +1,25 @@
+<?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.chinaitop.depot.intelligent.priceApproval.mapper.BusinessFsSaleRevenueDiffPriceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueDiffPrice">
+        <id column="id" property="id" />
+        <result column="createname" property="createname" />
+        <result column="createdate" property="createdate" />
+        <result column="updatename" property="updatename" />
+        <result column="updatedate" property="updatedate" />
+        <result column="fs_sale_revenue_id" property="fsSaleRevenueId" />
+        <result column="project_type" property="projectType" />
+        <result column="total_quantity" property="totalQuantity" />
+        <result column="province_total_quantity" property="provinceTotalQuantity" />
+        <result column="total_amount" property="totalAmount" />
+        <result column="province_total_amount" property="provinceTotalAmount" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, createname, createdate, updatename, updatedate, fs_sale_revenue_id, project_type, total_quantity, province_total_quantity, total_amount, province_total_amount
+    </sql>
+
+</mapper>

src/main/resources/mapper/priceApproval/BusinessFsSaleRevenueInspectionLossMapper.xml

@@ -0,0 +1,23 @@
+<?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.chinaitop.depot.intelligent.priceApproval.mapper.BusinessFsSaleRevenueInspectionLossMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueInspectionLoss">
+        <id column="id" property="id" />
+        <result column="createname" property="createname" />
+        <result column="createdate" property="createdate" />
+        <result column="updatename" property="updatename" />
+        <result column="updatedate" property="updatedate" />
+        <result column="fs_sale_revenue_id" property="fsSaleRevenueId" />
+        <result column="qc_quality_inspection_id_out" property="qcQualityInspectionIdOut" />
+        <result column="qc_quality_inspection_id_in" property="qcQualityInspectionIdIn" />
+        <result column="gslr_loss_collect_id" property="gslrLossCollectId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, createname, createdate, updatename, updatedate, fs_sale_revenue_id, qc_quality_inspection_id_out, qc_quality_inspection_id_in, gslr_loss_collect_id
+    </sql>
+
+</mapper>

src/main/resources/mapper/priceApproval/BusinessFsSaleRevenueMapper.xml

@@ -0,0 +1,154 @@
+<?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.chinaitop.depot.intelligent.priceApproval.mapper.BusinessFsSaleRevenueMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenue">
+        <id column="id" property="id" />
+        <result column="createname" property="createname" />
+        <result column="createdate" property="createdate" />
+        <result column="updatename" property="updatename" />
+        <result column="updatedate" property="updatedate" />
+        <result column="org_id" property="orgId" />
+        <result column="report_time" property="reportTime" />
+        <result column="plan_type" property="planType" />
+        <result column="sales_unit" property="salesUnit" />
+        <result column="contract_id" property="contractId" />
+        <result column="problem_feedback" property="problemFeedback" />
+        <result column="status" property="status" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, createname, createdate, updatename, updatedate, org_id, report_time, plan_type, sales_unit, contract_id, problem_feedback, status
+    </sql>
+    <select id="getContractInfo" parameterType="integer" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessContract">
+        SELECT
+            id,
+            contract_number contractNumber,
+            contract_title contractTitle,
+            signing_time signingTime,
+            attachment
+        FROM
+          business_contract
+        WHERE
+          audit_state = 2
+        AND in_application != 3
+        AND in_application != 4
+        AND contract_type = 3148
+        AND org_id = #{orgId}
+    </select>
+    <select id="getContractInfoList" parameterType="integer" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessContractDetail">
+        SELECT
+            swd.id,
+            swd.house_name houseName,
+	        swd.warehouse_name warehouseName,
+            swd.grain_kind grainKind,
+            be.enumname grainKindName,
+            swd.in_count inCount,
+            swd.in_price inPrice,
+            swd.in_detail_total_price inDetailTotalPrice
+        FROM
+            business_store_ware_detail swd
+        LEFT JOIN basic_enum be ON be.enumId = swd.grain_kind
+        WHERE
+            swd.zid = #{id}
+    </select>
+    <select id="getQualityInfo" parameterType="map" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueInspectionLoss">
+        SELECT
+            t1.qcQualityInspectionIdIn,
+            t1.zjbgdhIn,
+            t1.storehouseName,
+            t1.warehouseName,
+            t1.zzIn,
+            t1.sfIn,
+            t2.qcQualityInspectionIdOut,
+            t2.zjbgdhOut,
+            t2.zzOut,
+            t2.sfOut,
+            t3.gslrLossCollectId,
+            t3.actualLossQuantity,
+            t3.quotaLoss,
+            t3.naturalLoss,
+            t3.moistureLoss,
+            t3.impurityReductionQuality,
+            t3.excessLossQuantity,
+            t3.lossProfitReason
+        FROM
+        (
+        SELECT
+                qi.id qcQualityInspectionIdIn,
+                qi.org_id,
+                qi.zjbgdh zjbgdhIn,
+                bs.storehouse_name storehouseName,
+                bw.warehouse_name warehouseName,
+                SUM(CASE WHEN qii.inspection_item_id = 7619 THEN qii.inspection_value ELSE 0 END) zzIn,
+                SUM(CASE WHEN qii.inspection_item_id = 9528239 THEN qii.inspection_value ELSE 0 END) sfIn
+        FROM
+                business_qc_quality_inspection qi
+        LEFT JOIN basic_storehouse bs ON qi.basic_storehouse_id = bs.storehouse_id
+        LEFT JOIN basic_warehouse bw ON qi.warehouse_id = bw.warehouse_id
+        LEFT JOIN business_qc_quality_inspection_item qii ON qi.id = qii.qc_quality_inspection_id
+        WHERE
+                qi.jylb = '01'
+        AND qi.org_id = #{orgId}
+        AND qi.basic_storehouse_id = #{basicStorehouseId}
+        AND qi.warehouse_id = #{warehouseId}
+        ) t1 INNER JOIN
+        (
+        SELECT
+                qi.id qcQualityInspectionIdOut,
+                qi.org_id,
+                qi.zjbgdh zjbgdhOut,
+                bs.storehouse_name storehouseName,
+                bw.warehouse_name warehouseName,
+                SUM(CASE WHEN qii.inspection_item_id = 7619 THEN qii.inspection_value ELSE 0 END) zzOut,
+                SUM(CASE WHEN qii.inspection_item_id = 9528239 THEN qii.inspection_value ELSE 0 END) sfOut
+        FROM
+                business_qc_quality_inspection qi
+        LEFT JOIN basic_storehouse bs ON qi.basic_storehouse_id = bs.storehouse_id
+        LEFT JOIN basic_warehouse bw ON qi.warehouse_id = bw.warehouse_id
+        LEFT JOIN business_qc_quality_inspection_item qii ON qi.id = qii.qc_quality_inspection_id
+        WHERE
+                qi.jylb = '02'
+        AND qi.org_id = #{orgId}
+        AND qi.basic_storehouse_id = #{basicStorehouseId}
+        AND qi.warehouse_id = #{warehouseId}
+        ) t2 ON t1.org_id = t2.org_id
+        INNER JOIN
+        (
+        SELECT
+            lc.id gslrLossCollectId,
+            lc.org_id,
+            lc.actual_loss_quantity actualLossQuantity,
+            (
+                lc.natural_loss + lc.moisture_loss + lc.impurity_reduction_quality
+            ) quotaLoss,
+            lc.natural_loss naturalLoss,
+            lc.moisture_loss moistureLoss,
+            lc.impurity_reduction_quality impurityReductionQuality,
+            lc.excess_loss_quantity excessLossQuantity,
+            lc.loss_profit_reason lossProfitReason
+        FROM
+            business_gslr_loss_collect lc
+        WHERE
+            lc.org_id = #{orgId}
+        AND lc.basic_storehouse_id = #{basicStorehouseId}
+        AND lc.warehouse_id = #{warehouseId}
+        ) t3 ON t1.org_id = t3.org_id
+    </select>
+    <select id="getConsistenceAccountInfo" parameterType="string" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueThreeConsistence">
+        SELECT
+            sr.id fsSaleRevenueId,
+            ca.`year`,
+            ca.`month`,
+            ca.accounting_quantity accountingQuantity,
+            ca.accounting_amount accountingAmount
+        FROM
+            business_fs_sale_revenue_three_consistence_account ca
+        LEFT JOIN business_fs_sale_revenue sr ON sr.id = ca.fs_sale_revenue_id
+        LEFT JOIN business_contract bc ON sr.contract_id = bc.id
+        WHERE
+            contract_number = #{contractNumber}
+    </select>
+</mapper>

src/main/resources/mapper/priceApproval/BusinessFsSaleRevenueSettleMapper.xml

@@ -0,0 +1,33 @@
+<?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.chinaitop.depot.intelligent.priceApproval.mapper.BusinessFsSaleRevenueSettleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueSettle">
+        <id column="id" property="id" />
+        <result column="createname" property="createname" />
+        <result column="createdate" property="createdate" />
+        <result column="updatename" property="updatename" />
+        <result column="updatedate" property="updatedate" />
+        <result column="fs_sale_revenue_id" property="fsSaleRevenueId" />
+        <result column="fs_out_confirm_id" property="fsOutConfirmId" />
+        <result column="province_acceptance_unit" property="provinceAcceptanceUnit" />
+        <result column="province_total_settle_quantity" property="provinceTotalSettleQuantity" />
+        <result column="province_total_settle_amount" property="provinceTotalSettleAmount" />
+        <result column="province_loan_recovery_unit" property="provinceLoanRecoveryUnit" />
+        <result column="province_loan_recovery_quantity" property="provinceLoanRecoveryQuantity" />
+        <result column="province_loan_recovery_amount" property="provinceLoanRecoveryAmount" />
+        <result column="province_invoice_unit" property="provinceInvoiceUnit" />
+        <result column="province_invoice_quantity" property="provinceInvoiceQuantity" />
+        <result column="province_invoice_unit_price" property="provinceInvoiceUnitPrice" />
+        <result column="province_invoice_amount" property="provinceInvoiceAmount" />
+        <result column="province_loan_return_time" property="provinceLoanReturnTime" />
+        <result column="province_loan_return_amount" property="provinceLoanReturnAmount" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, createname, createdate, updatename, updatedate, fs_sale_revenue_id, fs_out_confirm_id, province_acceptance_unit, province_total_settle_quantity, province_total_settle_amount, province_loan_recovery_unit, province_loan_recovery_quantity, province_loan_recovery_amount, province_invoice_unit, province_invoice_quantity, province_invoice_unit_price, province_invoice_amount, province_loan_return_time, province_loan_return_amount
+    </sql>
+
+</mapper>

src/main/resources/mapper/priceApproval/BusinessFsSaleRevenueThreeConsistenceMapper.xml

@@ -0,0 +1,38 @@
+<?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.chinaitop.depot.intelligent.priceApproval.mapper.BusinessFsSaleRevenueThreeConsistenceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueThreeConsistence">
+        <id column="id" property="id" />
+        <result column="createname" property="createname" />
+        <result column="createdate" property="createdate" />
+        <result column="updatename" property="updatename" />
+        <result column="updatedate" property="updatedate" />
+        <result column="fs_sale_revenue_id" property="fsSaleRevenueId" />
+        <result column="year" property="year" />
+        <result column="month" property="month" />
+        <result column="basic_storehouse_id" property="basicStorehouseId" />
+        <result column="warehouse_id" property="warehouseId" />
+        <result column="loss" property="loss" />
+        <result column="province_loss" property="provinceLoss" />
+        <result column="custody_account_quantity" property="custodyAccountQuantity" />
+        <result column="province_custody_account_quantity" property="provinceCustodyAccountQuantity" />
+        <result column="statistical_account_quantity" property="statisticalAccountQuantity" />
+        <result column="province_statistical_account_quantity" property="provinceStatisticalAccountQuantity" />
+        <result column="complete_time" property="completeTime" />
+        <result column="province_complete_time" property="provinceCompleteTime" />
+        <result column="accounting_quantity" property="accountingQuantity" />
+        <result column="province_accounting_quantity" property="provinceAccountingQuantity" />
+        <result column="accounting_unit_price" property="accountingUnitPrice" />
+        <result column="province_accounting_unit_price" property="provinceAccountingUnitPrice" />
+        <result column="accounting_amount" property="accountingAmount" />
+        <result column="province_accounting_amount" property="provinceAccountingAmount" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, createname, createdate, updatename, updatedate, fs_sale_revenue_id, year, month, basic_storehouse_id, warehouse_id, loss, province_loss, custody_account_quantity, province_custody_account_quantity, statistical_account_quantity, province_statistical_account_quantity, complete_time, province_complete_time, accounting_quantity, province_accounting_quantity, accounting_unit_price, province_accounting_unit_price, accounting_amount, province_accounting_amount
+    </sql>
+
+</mapper>

src/main/resources/mapper/priceApproval/BusinessFsStoragePriceApprovalMapper.xml

@@ -35,6 +35,7 @@
             audit_state = 2
         AND in_application != 3
         AND in_application != 4
+        AND contract_type = 3147
         <if test="orgId != null and orgId != ''">
             AND org_id = #{orgId}
         </if>