Merge branch 'dev' of depot-qinghai/depot-smart-storage-qinghai into master

src/main/java/com/chinaitop/depot/intelligent/basicData/controller/TJctableController.java

@@ -62,5 +62,4 @@ public class TJctableController {
     }
 
 
-
 }

src/main/java/com/chinaitop/depot/intelligent/basicData/param/TJctableParam.java

@@ -81,5 +81,6 @@ public class TJctableParam implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private Date updatetime;
 
-
+    @ApiModelProperty(value = "检测设备编码")
+    private String vDevCode;
 }

src/main/java/com/chinaitop/depot/intelligent/basicData/service/TJctableService.java

@@ -24,4 +24,5 @@ public interface TJctableService extends IService<TJctable> {
     int updateData(TJctableParam param);
 
     int deleteData(String id);
+
 }

src/main/java/com/chinaitop/depot/intelligent/basicData/service/impl/TJctableServiceImpl.java

@@ -86,4 +86,6 @@ public class TJctableServiceImpl extends ServiceImpl<TJctableMapper, TJctable> i
     public int deleteData(String id) {
         return tJctableMapper.deleteById(id);
     }
+
+
 }

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/controller/BusinessFsInConfirmController.java

@@ -3,8 +3,7 @@ package com.chinaitop.depot.intelligent.financialSupervision.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaitop.depot.intelligent.common.ResponseEntity;
-import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsInConfirm;
-import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsLoan;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessContract;
 import com.chinaitop.depot.intelligent.financialSupervision.param.*;
 import com.chinaitop.depot.intelligent.financialSupervision.service.BusinessFsInConfirmService;
 import com.chinaitop.depot.intelligent.financialSupervision.vo.BusinessFsInConfirmDetailVO;
@@ -16,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * <p>
  * 财务监管-入库确认单 前端控制器
@@ -63,7 +64,12 @@ public class BusinessFsInConfirmController {
         return ResponseEntity.ok(businessFsInConfirmService.getDataById(id));
     }
 
+    @GetMapping("/getContractData")
+    @ApiOperation(value = "获取采购合同编号", notes = "获取采购合同编号")
+    public ResponseEntity<List<BusinessContract>> getContractData(Integer orgId) {
 
+        return ResponseEntity.ok(businessFsInConfirmService.getContractData(orgId));
+    }
     @GetMapping("/getByContractId/{id}")
     @ApiOperation(value = "通过合同id获取带出数据", notes = "通过合同id获取带出数据")
     public ResponseEntity<GetFsConfirmByContractIdVO> getByContractId(@PathVariable("id") String id) {

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/controller/BusinessFsInterestMaintainController.java

@@ -0,0 +1,63 @@
+package com.chinaitop.depot.intelligent.financialSupervision.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaitop.depot.intelligent.common.ResponseEntity;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsInterestMaintain;
+import com.chinaitop.depot.intelligent.financialSupervision.param.*;
+import com.chinaitop.depot.intelligent.financialSupervision.service.BusinessFsInterestMaintainService;
+import com.chinaitop.depot.intelligent.financialSupervision.vo.BusinessFsInConfirmDetailVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 财务监管-利息维护 前端控制器
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+@RestController
+@RequestMapping("/business-fs-interest-maintain")
+@Api(value = "BusinessFsInterestMaintain", description = "利息维护控制类")
+public class BusinessFsInterestMaintainController {
+
+    @Autowired
+    private BusinessFsInterestMaintainService businessFsInterestMaintainService;
+
+    @GetMapping("/getList")
+    @ApiOperation(value = "查询 利息维护 信息列表", notes = "查询 利息维护 信息列表")
+    public ResponseEntity<Page<BusinessFsInterestMaintain>> getList(@Validated BusinessFsInterestMaintainPageParam pageParam) {
+
+        return ResponseEntity.ok(businessFsInterestMaintainService.getList(pageParam));
+    }
+
+    @PostMapping("/save")
+    @ApiOperation(value = "利息维护新增", notes = "新增")
+    public ResponseEntity save(@Validated @RequestBody BusinessFsInterestMaintainParam param) {
+        return ResponseEntity.ok(businessFsInterestMaintainService.saveData(param));
+    }
+
+    @PutMapping("/update")
+    @ApiOperation(value = "利息维护修改", notes = "修改")
+    public ResponseEntity update(@Validated @RequestBody BusinessFsInterestMaintainParam param) {
+        return ResponseEntity.ok(businessFsInterestMaintainService.updateData(param));
+    }
+
+    @DeleteMapping("/delete/{id}")
+    @ApiOperation(value = "利息维护删除", notes = "id删除")
+    public ResponseEntity delete(@PathVariable("id") Integer id) {
+        return ResponseEntity.ok(businessFsInterestMaintainService.deleteData(id));
+    }
+
+    @GetMapping("/getById/{id}")
+    @ApiOperation(value = "利息维护详情", notes = "id获取详情")
+    public ResponseEntity<BusinessFsInterestMaintain> getById(@PathVariable("id") String id) {
+        return ResponseEntity.ok(businessFsInterestMaintainService.getDataById(id));
+    }
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/controller/BusinessFsOutConfirmContractItemController.java

@@ -0,0 +1,20 @@
+package com.chinaitop.depot.intelligent.financialSupervision.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-出库验收确认-合同元素 前端控制器
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+@RestController
+@RequestMapping("/business-fs-out-confirm-contract-item")
+public class BusinessFsOutConfirmContractItemController {
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/controller/BusinessFsOutConfirmController.java

@@ -0,0 +1,82 @@
+package com.chinaitop.depot.intelligent.financialSupervision.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaitop.depot.intelligent.common.ResponseEntity;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessContract;
+import com.chinaitop.depot.intelligent.financialSupervision.param.*;
+import com.chinaitop.depot.intelligent.financialSupervision.service.BusinessFsOutConfirmService;
+import com.chinaitop.depot.intelligent.financialSupervision.service.BusinessFsStatisticalAccountService;
+import com.chinaitop.depot.intelligent.financialSupervision.vo.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-出库验收确认 前端控制器
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+@RestController
+@RequestMapping("/business-fs-out-confirm")
+@Api(value = "BusinessFsInterestMaintain", description = "出库验收确认控制类")
+public class BusinessFsOutConfirmController {
+
+    @Autowired
+    private BusinessFsOutConfirmService businessFsOutConfirmService;
+
+    @Autowired
+    private BusinessFsStatisticalAccountService businessFsStatisticalAccountService;
+
+
+      @GetMapping("/getList")
+      @ApiOperation(value = "查询 出库验收确认 信息列表", notes = "查询 出库验收确认 信息列表")
+      public ResponseEntity<Page<BusinessFsOutConfirmPageVO>> getList(@Validated BusinessFsOutConfirmPageParam pageParam) {
+
+          return ResponseEntity.ok(businessFsOutConfirmService.getList(pageParam));
+      }
+
+      @PostMapping("/save")
+      @ApiOperation(value = "出库验收确认新增", notes = "新增")
+      public ResponseEntity save(@Validated @RequestBody BusinessFsOutConfirmAddParam param) {
+          return ResponseEntity.ok(businessFsOutConfirmService.saveData(param));
+      }
+      @PutMapping("/update")
+      @ApiOperation(value = "出库验收确认修改", notes = "修改")
+      public ResponseEntity update(@Validated @RequestBody BusinessFsOutConfirmUpdateParam param) {
+          return ResponseEntity.ok(businessFsOutConfirmService.updateData(param));
+      }
+
+      @DeleteMapping("/delete/{id}")
+      @ApiOperation(value = "出库验收确认删除", notes = "id删除")
+      public ResponseEntity delete(@PathVariable("id") Integer id) {
+          return ResponseEntity.ok(businessFsOutConfirmService.deleteData(id));
+      }
+
+      @GetMapping("/getById/{id}")
+      @ApiOperation(value = "出库验收确认详情", notes = "id获取详情")
+      public ResponseEntity<BusinessFsOutConfirmDetailVO> getById(@PathVariable("id") String id) {
+          return ResponseEntity.ok(businessFsOutConfirmService.getDataById(id));
+      }
+
+    @GetMapping("/getContractData")
+    @ApiOperation(value = "获取销售合同编号", notes = "获取合同编号")
+    public ResponseEntity<List<BusinessContract>> getContractData(Integer orgId) {
+
+        return ResponseEntity.ok(businessFsOutConfirmService.getContractData(orgId));
+    }
+
+    @GetMapping("/getByContractId/{id}")
+    @ApiOperation(value = "通过合同id获取带出数据", notes = "通过合同id获取带出数据")
+    public ResponseEntity<GetFsOutConfirmByContractVO> getByContractId(@PathVariable("id") String id) {
+        return ResponseEntity.ok(businessFsOutConfirmService.getByContractId(id));
+    }
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/controller/BusinessFsOutConfirmDiffPriceItemController.java

@@ -0,0 +1,20 @@
+package com.chinaitop.depot.intelligent.financialSupervision.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-出库验收确认-差额上缴元素 前端控制器
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+@RestController
+@RequestMapping("/business-fs-out-confirm-diff-price-item")
+public class BusinessFsOutConfirmDiffPriceItemController {
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/mapper/BusinessFsInterestMaintainMapper.java

@@ -0,0 +1,20 @@
+package com.chinaitop.depot.intelligent.financialSupervision.mapper;
+
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsInterestMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 财务监管-利息维护 Mapper 接口
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+@Mapper
+public interface BusinessFsInterestMaintainMapper extends BaseMapper<BusinessFsInterestMaintain> {
+
+    String selectNum();
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/mapper/BusinessFsOutConfirmContractItemMapper.java

@@ -0,0 +1,18 @@
+package com.chinaitop.depot.intelligent.financialSupervision.mapper;
+
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmContractItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-出库验收确认-合同元素 Mapper 接口
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+@Mapper
+public interface BusinessFsOutConfirmContractItemMapper extends BaseMapper<BusinessFsOutConfirmContractItem> {
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/mapper/BusinessFsOutConfirmDiffPriceItemMapper.java

@@ -0,0 +1,18 @@
+package com.chinaitop.depot.intelligent.financialSupervision.mapper;
+
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-出库验收确认-差额上缴元素 Mapper 接口
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+@Mapper
+public interface BusinessFsOutConfirmDiffPriceItemMapper extends BaseMapper<BusinessFsOutConfirmDiffPriceItem> {
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/mapper/BusinessFsOutConfirmMapper.java

@@ -0,0 +1,32 @@
+package com.chinaitop.depot.intelligent.financialSupervision.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.chinaitop.depot.intelligent.financialSupervision.vo.BusinessFsOutConfirmPageVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-出库验收确认 Mapper 接口
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+@Mapper
+public interface BusinessFsOutConfirmMapper extends BaseMapper<BusinessFsOutConfirm> {
+
+    Double selectSum(@Param("id") String id,
+                     @Param("grainKind") Integer grainKind,
+                     @Param("grainAttribute") Integer grainAttribute);
+
+    Page<BusinessFsOutConfirmPageVO> selectMyPage(@Param("page") Page<BusinessFsOutConfirmPageVO> page,
+                                                  @Param("contractNumber") String contractNumber,
+                                                  @Param("orgId") Integer orgId);
+
+    String selectOutboundConfirmationNumber();
+
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/model/BusinessFsInterestMaintain.java

@@ -0,0 +1,82 @@
+package com.chinaitop.depot.intelligent.financialSupervision.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-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("business_fs_interest_maintain")
+@ApiModel(value="BusinessFsInterestMaintain对象", description="财务监管-利息维护")
+public class BusinessFsInterestMaintain 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 = "粮库id；org_info的id；")
+    @TableField("org_id")
+    private Integer orgId;
+
+    @ApiModelProperty(value = "利息单号")
+    @TableField("interest_bill_no")
+    private String interestBillNo;
+
+    @ApiModelProperty(value = "年")
+    @TableField("year")
+    private Integer year;
+
+    @ApiModelProperty(value = "月")
+    @TableField("month")
+    private Integer month;
+
+    @ApiModelProperty(value = "农发行实收利息；单位：万元；")
+    @TableField("actual_interest_received")
+    private BigDecimal actualInterestReceived;
+
+    @ApiModelProperty(value = "对其他扣款；单位：万元；")
+    @TableField("other_deduction")
+    private BigDecimal otherDeduction;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
+    @ApiModelProperty(value = "日期")
+    @TableField(exist = false)
+    private String yearAndMonth;
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/model/BusinessFsOutConfirm.java

@@ -0,0 +1,112 @@
+package com.chinaitop.depot.intelligent.financialSupervision.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-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("business_fs_out_confirm")
+@ApiModel(value="BusinessFsOutConfirm对象", description="财务监管-销售收入上缴-出库验收确认")
+public class BusinessFsOutConfirm 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 = "合同编号；business_contract的ID；")
+    @TableField("contract_id")
+    private Integer contractId;
+
+    @ApiModelProperty(value = "出库确认单-出库确认时间")
+    @TableField("outbound_confirmation_time")
+    private Date outboundConfirmationTime;
+
+    @ApiModelProperty(value = "出库确认单号")
+    @TableField("outbound_confirmation_number")
+    private String outboundConfirmationNumber;
+
+    @ApiModelProperty(value = "出库确认单-小计-总结算数量（吨）")
+    @TableField("total_settle_quantity")
+    private BigDecimal totalSettleQuantity;
+
+    @ApiModelProperty(value = "出库确认单-小计-总结算金额，单位：元")
+    @TableField("total_settle_amount")
+    private BigDecimal totalSettleAmount;
+
+    @ApiModelProperty(value = "贷款信息-贷款收回单位")
+    @TableField("loan_recovery_unit")
+    private String loanRecoveryUnit;
+
+    @ApiModelProperty(value = "贷款信息-贷款收回数量")
+    @TableField("loan_recovery_quantity")
+    private BigDecimal loanRecoveryQuantity;
+
+    @ApiModelProperty(value = "贷款信息-贷款收回金额")
+    @TableField("loan_recovery_amount")
+    private BigDecimal loanRecoveryAmount;
+
+    @ApiModelProperty(value = "贷款信息-贷款归还时间")
+    @TableField("loan_return_time")
+    private Date loanReturnTime;
+
+    @ApiModelProperty(value = "贷款信息-贷款归还金额")
+    @TableField("loan_return_amount")
+    private BigDecimal loanReturnAmount;
+
+    @ApiModelProperty(value = "销售发票情况-单位")
+    @TableField("invoice_unit")
+    private String invoiceUnit;
+
+    @ApiModelProperty(value = "销售发票情况-发票数量")
+    @TableField("invoice_quantity")
+    private Integer invoiceQuantity;
+
+    @ApiModelProperty(value = "销售发票情况-发票单价")
+    @TableField("invoice_unit_price")
+    private BigDecimal invoiceUnitPrice;
+
+    @ApiModelProperty(value = "销售发票情况-发票金额")
+    @TableField("invoice_amount")
+    private BigDecimal invoiceAmount;
+
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/model/BusinessFsOutConfirmContractItem.java

@@ -0,0 +1,94 @@
+package com.chinaitop.depot.intelligent.financialSupervision.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;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-出库验收确认-合同元素
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("business_fs_out_confirm_contract_item")
+@ApiModel(value="BusinessFsOutConfirmContractItem对象", description="财务监管-销售收入上缴-出库验收确认-合同元素")
+public class BusinessFsOutConfirmContractItem 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_out_confirm的ID；")
+    @TableField("fs_out_confirm_id")
+    @NotNull(message = "fs_out_confirm_id不能为空")
+    private Integer fsOutConfirmId;
+
+    @ApiModelProperty(value = "仓房id；basic_storehouse的id；")
+    @TableField("basic_storehouse_id")
+    @NotNull(message = "仓房id不能为空")
+    private Integer basicStorehouseId;
+
+    @ApiModelProperty(value = "货位id；basic_warehouse的id；")
+    @TableField("warehouse_id")
+    @NotNull(message = "货位id不能为空")
+    private Integer warehouseId;
+
+    @ApiModelProperty(value = "粮食品种id；basic_enum的id；")
+    @TableField("grain_variety_id")
+    @NotNull(message = "粮食品种id不能为空")
+    private Integer grainVarietyId;
+
+    @ApiModelProperty(value = "粮食性质id；basic_enum的id；")
+    @TableField("grain_nature_id")
+    @NotNull(message = "粮食性质id不能为空")
+    private Integer grainNatureId;
+
+    @ApiModelProperty(value = "结算数量（吨）")
+    @TableField("settle_quantity")
+    @NotNull(message = "结算数量不能为空")
+    private BigDecimal settleQuantity;
+
+    @ApiModelProperty(value = "结算价格（元/吨）")
+    @TableField("settle_price")
+    @NotNull(message = "结算价格不能为空")
+    private BigDecimal settlePrice;
+
+    @ApiModelProperty(value = "结算金额")
+    @TableField("settle_amount")
+    @NotNull(message = "结算金额不能为空")
+    private BigDecimal settleAmount;
+
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/model/BusinessFsOutConfirmDiffPriceItem.java

@@ -0,0 +1,74 @@
+package com.chinaitop.depot.intelligent.financialSupervision.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;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-出库验收确认-差额上缴元素
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("business_fs_out_confirm_diff_price_item")
+@ApiModel(value="BusinessFsOutConfirmDiffPriceItem对象", description="财务监管-销售收入上缴-出库验收确认-差额上缴元素")
+public class BusinessFsOutConfirmDiffPriceItem 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_out_confirm的ID；")
+    @TableField("fs_out_confirm_id")
+    @NotNull(message = "fs_out_confirm_id不能为空")
+    private Integer fsOutConfirmId;
+
+    @ApiModelProperty(value = "项目类型 1：销售；2：损耗；3：入库（用负数表示）；4：交易手续费（用负数表示）；")
+    @TableField("project_type")
+    @NotNull(message = "项目类型不能为空")
+    private Integer projectType;
+
+    @ApiModelProperty(value = "数量")
+    @TableField("quantity")
+    @NotNull(message = "数量不能为空")
+    private BigDecimal quantity;
+
+    @ApiModelProperty(value = "金额")
+    @TableField("amount")
+    @NotNull(message = "金额不能为空")
+    private BigDecimal amount;
+
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/param/BusinessFsInterestMaintainPageParam.java

@@ -0,0 +1,31 @@
+package com.chinaitop.depot.intelligent.financialSupervision.param;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author hjc
+ * @date 2024/7/23 14:46
+ */
+@Data
+public class BusinessFsInterestMaintainPageParam {
+    /** 当前页 */
+    @ApiModelProperty(value = "页码")
+    private Integer pageNum;
+
+    /** 每页条数 */
+    @ApiModelProperty(value = "每页条数")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "单位id；org_info的ID；")
+    @NotNull(message = "单位id不能为空")
+    private Integer orgId;
+
+
+    @ApiModelProperty(value = "利息单号")
+    private String interestBillNo;
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/param/BusinessFsInterestMaintainParam.java

@@ -0,0 +1,73 @@
+package com.chinaitop.depot.intelligent.financialSupervision.param;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 财务监管-利息维护
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+@Data
+public class BusinessFsInterestMaintainParam implements Serializable {
+
+
+
+    @ApiModelProperty(value = "主键ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "创建人")
+    private String createname;
+
+    @ApiModelProperty(value = "创建日期")
+    private Date createdate;
+
+    @ApiModelProperty(value = "更新人")
+    private String updatename;
+
+    @ApiModelProperty(value = "更新日期")
+    private Date updatedate;
+
+    @ApiModelProperty(value = "粮库id；org_info的id；")
+    @NotNull(message = "库区id不能为空")
+    private Integer orgId;
+
+  /*  @ApiModelProperty(value = "利息单号")
+    private String interestBillNo;*/
+
+    @ApiModelProperty(value = "年")
+    @NotNull(message = "年不能为空")
+    private Integer year;
+
+    @ApiModelProperty(value = "月")
+    @NotNull(message = "月不能为空")
+    private Integer month;
+
+    @ApiModelProperty(value = "农发行实收利息；单位：万元；")
+    @NotNull(message = "农发行实收利息不能为空")
+    private BigDecimal actualInterestReceived;
+
+    @ApiModelProperty(value = "对其他扣款；单位：万元；")
+    @NotNull(message = "对其他扣款不能为空")
+    private BigDecimal otherDeduction;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/param/BusinessFsInterestainPageParam.java

@@ -0,0 +1,32 @@
+package com.chinaitop.depot.intelligent.financialSupervision.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author hjc
+ * @date 2024/7/2 18:08
+ */
+@Data
+public class BusinessFsInterestainPageParam {
+
+    /** 当前页 */
+    @ApiModelProperty(value = "页码")
+    private Integer pageNum;
+
+    /** 每页条数 */
+    @ApiModelProperty(value = "每页条数")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "合同编号")
+    private String contractNumber;
+
+    @ApiModelProperty(value = "入库确认单-入库确认单号")
+    private String receiptNumber;
+
+    @ApiModelProperty(value = "单位id；org_info的ID；")
+    @NotNull(message = "单位id不能为空")
+    private Integer orgId;
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/param/BusinessFsOutConfirmAddParam.java

@@ -0,0 +1,96 @@
+package com.chinaitop.depot.intelligent.financialSupervision.param;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsInConfirmContractItem;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmContractItem;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 财务监管-入库确认单
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-04
+ */
+@Data
+public class BusinessFsOutConfirmAddParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "org_info的id；")
+    @NotNull(message = "库区id不能为空")
+    private Integer orgId;
+
+    @ApiModelProperty(value = "合同id；business_contract的ID；")
+    @NotNull(message = "合同id不能为空")
+    private Integer contractId;
+
+    @ApiModelProperty(value = "出库确认单-出库确认时间")
+    @NotNull(message = "出库确认时间不能为空")
+    private Date outboundConfirmationTime;
+
+   /* @ApiModelProperty(value = "出库确认单号")
+    @NotBlank(message = "出库确认单号不能为空")
+    private String outboundConfirmationNumber;*/
+
+    @ApiModelProperty(value = "出库确认单-小计-总结算数量（吨）")
+    @NotNull(message = "总结算数量不能为空")
+    private BigDecimal totalSettleQuantity;
+
+    @ApiModelProperty(value = "出库确认单-小计-总结算金额，单位：元")
+    @NotNull(message = "总结算金额不能为空")
+    private BigDecimal totalSettleAmount;
+
+    @ApiModelProperty(value = "贷款信息-贷款收回单位")
+    @NotBlank(message = "贷款收回单位不能为空")
+    private String loanRecoveryUnit;
+
+    @ApiModelProperty(value = "贷款信息-贷款收回数量")
+    @NotNull(message = "贷款收回数量不能为空")
+    private BigDecimal loanRecoveryQuantity;
+
+    @ApiModelProperty(value = "贷款信息-贷款收回金额")
+    @NotNull(message = "贷款收回金额不能为空")
+    private BigDecimal loanRecoveryAmount;
+
+    @ApiModelProperty(value = "贷款信息-贷款归还时间")
+    @NotNull(message = "贷款归还时间不能为空")
+    private Date loanReturnTime;
+
+    @ApiModelProperty(value = "贷款信息-贷款归还金额")
+    @NotNull(message = "贷款归还金额不能为空")
+    private BigDecimal loanReturnAmount;
+
+    @ApiModelProperty(value = "销售发票情况-单位")
+    @NotBlank(message = "单位不能为空")
+    private String invoiceUnit;
+
+    @ApiModelProperty(value = "销售发票情况-发票数量")
+    @NotNull(message = "发票数量不能为空")
+    private Integer invoiceQuantity;
+
+    @ApiModelProperty(value = "销售发票情况-发票单价")
+    @NotNull(message = "发票单价不能为空")
+    private BigDecimal invoiceUnitPrice;
+
+    @ApiModelProperty(value = "销售发票情况-发票金额")
+    @NotNull(message = "发票金额不能为空")
+    private BigDecimal invoiceAmount;
+
+    @ApiModelProperty(value = "合同详情")
+    private List<BusinessFsOutConfirmContractItem> fsOutConfirmContractItemList;
+
+    @ApiModelProperty(value = "差价上缴详情")
+    private List<BusinessFsOutConfirmDiffPriceItem> fsOutConfirmDiffPriceItemList;
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/param/BusinessFsOutConfirmPageParam.java

@@ -0,0 +1,29 @@
+package com.chinaitop.depot.intelligent.financialSupervision.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author hjc
+ * @date 2024/7/23 15:44
+ */
+@Data
+public class BusinessFsOutConfirmPageParam {
+
+    /** 当前页 */
+    @ApiModelProperty(value = "页码")
+    private Integer pageNum;
+
+    /** 每页条数 */
+    @ApiModelProperty(value = "每页条数")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "合同编号")
+    private String contractNumber;
+
+    @ApiModelProperty(value = "单位id；org_info的ID；")
+    @NotNull(message = "单位id不能为空")
+    private Integer orgId;
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/param/BusinessFsOutConfirmUpdateParam.java

@@ -0,0 +1,98 @@
+package com.chinaitop.depot.intelligent.financialSupervision.param;
+
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmContractItem;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 财务监管-入库确认单
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-04
+ */
+@Data
+public class BusinessFsOutConfirmUpdateParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+    @ApiModelProperty(value = "org_info的id；")
+    @NotNull(message = "库区id不能为空")
+    private Integer orgId;
+
+    @ApiModelProperty(value = "合同id；business_contract的ID；")
+    @NotNull(message = "合同id不能为空")
+    private Integer contractId;
+
+    @ApiModelProperty(value = "出库确认单-出库确认时间")
+    @NotNull(message = "出库确认时间不能为空")
+    private Date outboundConfirmationTime;
+
+/*    @ApiModelProperty(value = "出库确认单号")
+    @NotBlank(message = "出库确认单号不能为空")
+    private String outboundConfirmationNumber;*/
+
+    @ApiModelProperty(value = "出库确认单-小计-总结算数量（吨）")
+    @NotNull(message = "总结算数量不能为空")
+    private BigDecimal totalSettleQuantity;
+
+    @ApiModelProperty(value = "出库确认单-小计-总结算金额，单位：元")
+    @NotNull(message = "总结算金额不能为空")
+    private BigDecimal totalSettleAmount;
+
+    @ApiModelProperty(value = "贷款信息-贷款收回单位")
+    @NotBlank(message = "贷款收回单位不能为空")
+    private String loanRecoveryUnit;
+
+    @ApiModelProperty(value = "贷款信息-贷款收回数量")
+    @NotNull(message = "贷款收回数量不能为空")
+    private BigDecimal loanRecoveryQuantity;
+
+    @ApiModelProperty(value = "贷款信息-贷款收回金额")
+    @NotNull(message = "贷款收回金额不能为空")
+    private BigDecimal loanRecoveryAmount;
+
+    @ApiModelProperty(value = "贷款信息-贷款归还时间")
+    @NotNull(message = "贷款归还时间不能为空")
+    private Date loanReturnTime;
+
+    @ApiModelProperty(value = "贷款信息-贷款归还金额")
+    @NotNull(message = "贷款归还金额不能为空")
+    private BigDecimal loanReturnAmount;
+
+    @ApiModelProperty(value = "销售发票情况-单位")
+    @NotBlank(message = "单位不能为空")
+    private String invoiceUnit;
+
+    @ApiModelProperty(value = "销售发票情况-发票数量")
+    @NotNull(message = "发票数量不能为空")
+    private Integer invoiceQuantity;
+
+    @ApiModelProperty(value = "销售发票情况-发票单价")
+    @NotNull(message = "发票单价不能为空")
+    private BigDecimal invoiceUnitPrice;
+
+    @ApiModelProperty(value = "销售发票情况-发票金额")
+    @NotNull(message = "发票金额不能为空")
+    private BigDecimal invoiceAmount;
+
+    @ApiModelProperty(value = "合同详情")
+    private List<BusinessFsOutConfirmContractItem> fsOutConfirmContractItemList;
+
+    @ApiModelProperty(value = "差价上缴详情")
+    private List<BusinessFsOutConfirmDiffPriceItem> fsOutConfirmDiffPriceItemList;
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/service/BusinessFsInConfirmService.java

@@ -1,9 +1,9 @@
 package com.chinaitop.depot.intelligent.financialSupervision.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessContract;
 import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsInConfirm;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsAccountUpdateParam;
 import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsInConfirmAddParam;
 import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsInConfirmPageParam;
 import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsInConfirmUpdateParam;
@@ -11,6 +11,8 @@ import com.chinaitop.depot.intelligent.financialSupervision.vo.BusinessFsInConfi
 import com.chinaitop.depot.intelligent.financialSupervision.vo.BusinessFsInConfirmPageVO;
 import com.chinaitop.depot.intelligent.financialSupervision.vo.GetFsConfirmByContractIdVO;
 
+import java.util.List;
+
 /**
  * <p>
  * 财务监管-入库确认单 服务类
@@ -69,4 +71,12 @@ public interface BusinessFsInConfirmService extends IService<BusinessFsInConfirm
     *@date 2024/7/4 18:06
     */
     int updateData(BusinessFsInConfirmUpdateParam param);
+
+    /**
+    *获取采购合同编号
+    *
+    *@author hjc
+    *@date 2024/7/24 17:52
+    */
+    List<BusinessContract> getContractData(Integer orgId);
 }

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/service/BusinessFsInterestMaintainService.java

@@ -0,0 +1,59 @@
+package com.chinaitop.depot.intelligent.financialSupervision.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsInterestMaintain;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsInConfirmPageParam;
+import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsInterestMaintainPageParam;
+import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsInterestMaintainParam;
+
+/**
+ * <p>
+ * 财务监管-利息维护 服务类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+public interface BusinessFsInterestMaintainService extends IService<BusinessFsInterestMaintain> {
+
+    /**
+    *查询 利息维护 信息列表
+    *
+    *@author hjc
+    *@date 2024/7/23 14:41
+    */
+    Page<BusinessFsInterestMaintain> getList(BusinessFsInterestMaintainPageParam pageParam);
+
+    /**
+    *利息维护新增
+    *
+    *@author hjc
+    *@date 2024/7/23 14:58
+    */
+    int saveData(BusinessFsInterestMaintainParam param);
+
+    /**
+    *利息维护修改
+    *
+    *@author hjc
+    *@date 2024/7/23 14:59
+    */
+    int updateData(BusinessFsInterestMaintainParam param);
+
+    /**
+    *利息维护删除
+    *
+    *@author hjc
+    *@date 2024/7/23 15:12
+    */
+    int deleteData(Integer id);
+
+    /**
+    *利息维护详情
+    *
+    *@author hjc
+    *@date 2024/7/23 15:32
+    */
+    BusinessFsInterestMaintain getDataById(String id);
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/service/BusinessFsOutConfirmContractItemService.java

@@ -0,0 +1,16 @@
+package com.chinaitop.depot.intelligent.financialSupervision.service;
+
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmContractItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-出库验收确认-合同元素 服务类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+public interface BusinessFsOutConfirmContractItemService extends IService<BusinessFsOutConfirmContractItem> {
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/service/BusinessFsOutConfirmDiffPriceItemService.java

@@ -0,0 +1,16 @@
+package com.chinaitop.depot.intelligent.financialSupervision.service;
+
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-出库验收确认-差额上缴元素 服务类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+public interface BusinessFsOutConfirmDiffPriceItemService extends IService<BusinessFsOutConfirmDiffPriceItem> {
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/service/BusinessFsOutConfirmService.java

@@ -0,0 +1,82 @@
+package com.chinaitop.depot.intelligent.financialSupervision.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessContract;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirm;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsOutConfirmAddParam;
+import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsOutConfirmPageParam;
+import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsOutConfirmUpdateParam;
+import com.chinaitop.depot.intelligent.financialSupervision.vo.BusinessFsOutConfirmDetailVO;
+import com.chinaitop.depot.intelligent.financialSupervision.vo.BusinessFsOutConfirmPageVO;
+import com.chinaitop.depot.intelligent.financialSupervision.vo.GetFsConfirmByContractIdVO;
+import com.chinaitop.depot.intelligent.financialSupervision.vo.GetFsOutConfirmByContractVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-出库验收确认 服务类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+public interface BusinessFsOutConfirmService extends IService<BusinessFsOutConfirm> {
+
+    /**
+    *通过合同id获取带出数据
+    *
+    *@author hjc
+    *@date 2024/7/23 16:37
+    */
+    GetFsOutConfirmByContractVO getByContractId(String id);
+
+    /**
+    *获取销售合同编号
+    *
+    *@author hjc
+    *@date 2024/7/23 16:55
+    */
+    List<BusinessContract> getContractData(Integer orgId);
+
+    /**
+    *出库验收确认详情
+    *
+    *@author hjc
+    *@date 2024/7/24 9:12
+    */
+    BusinessFsOutConfirmDetailVO getDataById(String id);
+
+    /**
+    *出库验收确认删除
+    *
+    *@author hjc
+    *@date 2024/7/24 10:42
+    */
+    int deleteData(Integer id);
+
+    /**
+    *出库验收确认新增
+    *
+    *@author hjc
+    *@date 2024/7/24 11:09
+    */
+    int saveData(BusinessFsOutConfirmAddParam param);
+
+    /**
+    *出库验收确认修改
+    *
+    *@author hjc
+    *@date 2024/7/24 11:18
+    */
+    int updateData(BusinessFsOutConfirmUpdateParam param);
+
+    /**
+    *查询 出库验收确认 信息列表
+    *
+    *@author hjc
+    *@date 2024/7/24 11:25
+    */
+    Page<BusinessFsOutConfirmPageVO> getList(BusinessFsOutConfirmPageParam pageParam);
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/service/impl/BusinessFsInConfirmServiceImpl.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.intelligent.financialSupervision.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,7 +13,6 @@ import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsInCo
 import com.chinaitop.depot.intelligent.financialSupervision.mapper.BusinessFsInConfirmMapper;
 import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsInConfirmContractItem;
 import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessStoreWareDetail;
-import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsAccountUpdateParam;
 import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsInConfirmAddParam;
 import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsInConfirmPageParam;
 import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsInConfirmUpdateParam;
@@ -75,6 +75,19 @@ public class BusinessFsInConfirmServiceImpl extends ServiceImpl<BusinessFsInConf
 
     }
 
+    /**
+     *获取采购合同编号
+     *
+     *@author hjc
+     *@date 2024/7/24 17:52
+     */
+    @Override
+    public List<BusinessContract> getContractData(Integer orgId) {
+        return businessContractMapper.selectList(new LambdaQueryWrapper<BusinessContract>()
+                .eq(BusinessContract::getAuditState, 2)
+                .eq(BusinessContract::getContractType, "3147")
+                .eq(BusinessContract::getOrgId, orgId));
+    }
 
     /**
      * 通过合同id获取带出数据
@@ -102,7 +115,8 @@ public class BusinessFsInConfirmServiceImpl extends ServiceImpl<BusinessFsInConf
         //获取合同详情信息
         List<BusinessStoreWareDetail> storeWareDetailList = businessStoreWareDetailMapper.selectList(
                 Wrappers.lambdaQuery(BusinessStoreWareDetail.class)
-                        .eq(BusinessStoreWareDetail::getZid, id));
+                        .eq(BusinessStoreWareDetail::getZid, id)
+                        .eq(BusinessStoreWareDetail::getType, "contract"));
 
         List<BusinessStoreWareDetailVO> storeWareDetailVOList = new ArrayList<>();
 
@@ -130,13 +144,10 @@ public class BusinessFsInConfirmServiceImpl extends ServiceImpl<BusinessFsInConf
                     sum = 0.0;
                 }
                 //用总的减去填写的数量
-                double num = 0;
-                if (businessStoreWareDetail.getInCount() != null) {
-                    num = Double.parseDouble(businessStoreWareDetail.getInCount()) - sum;
-                } else {
-                    businessStoreWareDetail.setInCount("0.0");
-                    num = Double.parseDouble(businessStoreWareDetail.getInCount()) - sum;
+                if (businessStoreWareDetail.getOutCount() == null){
+                    businessStoreWareDetail.setOutCount("0.0");
                 }
+                double num =Double.parseDouble(businessStoreWareDetail.getOutCount()) - sum;
 
                 if (num <= 0) {
                     storeWareDetailVO.setInCount("0.0");

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/service/impl/BusinessFsInterestMaintainServiceImpl.java

@@ -0,0 +1,144 @@
+package com.chinaitop.depot.intelligent.financialSupervision.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsInterestMaintain;
+import com.chinaitop.depot.intelligent.financialSupervision.mapper.BusinessFsInterestMaintainMapper;
+import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsInConfirmPageParam;
+import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsInterestMaintainPageParam;
+import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsInterestMaintainParam;
+import com.chinaitop.depot.intelligent.financialSupervision.service.BusinessFsInterestMaintainService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chinaitop.depot.intelligent.utils.OrderNumberUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 财务监管-利息维护 服务实现类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+@Service
+public class BusinessFsInterestMaintainServiceImpl extends ServiceImpl<BusinessFsInterestMaintainMapper, BusinessFsInterestMaintain> implements BusinessFsInterestMaintainService {
+
+    @Autowired
+    private BusinessFsInterestMaintainMapper businessFsInterestMaintainMapper;
+
+    /**
+     * 查询 利息维护 信息列表
+     *
+     * @author hjc
+     * @date 2024/7/23 14:41
+     */
+    @Override
+    public Page<BusinessFsInterestMaintain> getList(BusinessFsInterestMaintainPageParam pageParam) {
+
+        Page<BusinessFsInterestMaintain> page = new Page<>(pageParam.getPageNum(), pageParam.getPageSize());
+
+        LambdaQueryWrapper<BusinessFsInterestMaintain> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(BusinessFsInterestMaintain::getOrgId, pageParam.getOrgId());
+        if (StringUtils.isNotBlank(pageParam.getInterestBillNo())) {
+            wrapper.like(BusinessFsInterestMaintain::getInterestBillNo, pageParam.getInterestBillNo());
+        }
+        wrapper.orderByDesc(BusinessFsInterestMaintain::getCreatedate);
+        Page<BusinessFsInterestMaintain> maintainPage = businessFsInterestMaintainMapper.selectPage(page, wrapper);
+        List<BusinessFsInterestMaintain> records = maintainPage.getRecords();
+        if (CollectionUtil.isNotEmpty(records)){
+            for (BusinessFsInterestMaintain maintain : records) {
+
+                if (maintain.getMonth()>=10){
+                    String yearAndMonth = maintain.getYear()+"-"+maintain.getMonth();
+                    maintain.setYearAndMonth(yearAndMonth);
+                }
+                if (maintain.getMonth()<10){
+                    String yearAndMonth = maintain.getYear()+"-0"+maintain.getMonth();
+                    maintain.setYearAndMonth(yearAndMonth);
+                }
+
+            }
+        }
+      return maintainPage;
+
+
+    }
+
+    /**
+     * 利息维护新增
+     *
+     * @author hjc
+     * @date 2024/7/23 14:58
+     */
+    @Override
+    public int saveData(BusinessFsInterestMaintainParam param) {
+
+        String interestBillNo = businessFsInterestMaintainMapper.selectNum();
+        String s = OrderNumberUtil.initNum("LXDH", 3, interestBillNo);
+        BusinessFsInterestMaintain businessFsInterestMaintain = new BusinessFsInterestMaintain();
+        BeanUtils.copyProperties(param, businessFsInterestMaintain);
+
+        businessFsInterestMaintain.setInterestBillNo(s);
+        businessFsInterestMaintain.setCreatedate(new Date());
+
+        return businessFsInterestMaintainMapper.insert(businessFsInterestMaintain);
+    }
+
+    /**
+     * 利息维护修改
+     *
+     * @author hjc
+     * @date 2024/7/23 14:59
+     */
+    @Override
+    public int updateData(BusinessFsInterestMaintainParam param) {
+
+        BusinessFsInterestMaintain businessFsInterestMaintain = new BusinessFsInterestMaintain();
+        BeanUtils.copyProperties(param, businessFsInterestMaintain);
+
+        businessFsInterestMaintain.setUpdatedate(new Date());
+
+        return businessFsInterestMaintainMapper.updateById(businessFsInterestMaintain);
+    }
+
+    /**
+    *利息维护删除
+    *
+    *@author hjc
+    *@date 2024/7/23 15:12
+    */
+    @Override
+    public int deleteData(Integer id) {
+        return businessFsInterestMaintainMapper.deleteById(id);
+    }
+
+    /**
+     *利息维护详情
+     *
+     *@author hjc
+     *@date 2024/7/23 15:32
+     */
+    @Override
+    public BusinessFsInterestMaintain getDataById(String id) {
+
+        BusinessFsInterestMaintain maintain = businessFsInterestMaintainMapper.selectById(id);
+
+        if (maintain.getMonth()>=10){
+            String yearAndMonth = maintain.getYear()+"-"+maintain.getMonth();
+            maintain.setYearAndMonth(yearAndMonth);
+        }
+        if (maintain.getMonth()<10){
+            String yearAndMonth = maintain.getYear()+"-0"+maintain.getMonth();
+            maintain.setYearAndMonth(yearAndMonth);
+        }
+        return maintain;
+    }
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/service/impl/BusinessFsOutConfirmContractItemServiceImpl.java

@@ -0,0 +1,20 @@
+package com.chinaitop.depot.intelligent.financialSupervision.service.impl;
+
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmContractItem;
+import com.chinaitop.depot.intelligent.financialSupervision.mapper.BusinessFsOutConfirmContractItemMapper;
+import com.chinaitop.depot.intelligent.financialSupervision.service.BusinessFsOutConfirmContractItemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-出库验收确认-合同元素 服务实现类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+@Service
+public class BusinessFsOutConfirmContractItemServiceImpl extends ServiceImpl<BusinessFsOutConfirmContractItemMapper, BusinessFsOutConfirmContractItem> implements BusinessFsOutConfirmContractItemService {
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/service/impl/BusinessFsOutConfirmDiffPriceItemServiceImpl.java

@@ -0,0 +1,20 @@
+package com.chinaitop.depot.intelligent.financialSupervision.service.impl;
+
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
+import com.chinaitop.depot.intelligent.financialSupervision.mapper.BusinessFsOutConfirmDiffPriceItemMapper;
+import com.chinaitop.depot.intelligent.financialSupervision.service.BusinessFsOutConfirmDiffPriceItemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-出库验收确认-差额上缴元素 服务实现类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+@Service
+public class BusinessFsOutConfirmDiffPriceItemServiceImpl extends ServiceImpl<BusinessFsOutConfirmDiffPriceItemMapper, BusinessFsOutConfirmDiffPriceItem> implements BusinessFsOutConfirmDiffPriceItemService {
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/service/impl/BusinessFsOutConfirmServiceImpl.java

@@ -0,0 +1,398 @@
+package com.chinaitop.depot.intelligent.financialSupervision.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaitop.depot.intelligent.basicData.mapper.BasicStorehouseMapper;
+import com.chinaitop.depot.intelligent.basicData.model.BasicStorehouse;
+import com.chinaitop.depot.intelligent.basicData.param.StorehouseAndLqVO;
+import com.chinaitop.depot.intelligent.financialSupervision.mapper.*;
+import com.chinaitop.depot.intelligent.financialSupervision.model.*;
+import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsOutConfirmAddParam;
+import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsOutConfirmPageParam;
+import com.chinaitop.depot.intelligent.financialSupervision.param.BusinessFsOutConfirmUpdateParam;
+import com.chinaitop.depot.intelligent.financialSupervision.service.BusinessFsOutConfirmService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chinaitop.depot.intelligent.financialSupervision.vo.*;
+import com.chinaitop.depot.intelligent.grainReserves.mapper.BasicEnumMapper;
+import com.chinaitop.depot.intelligent.grainReserves.mapper.BasicWarehouseMapper;
+import com.chinaitop.depot.intelligent.grainReserves.model.BasicEnum;
+import com.chinaitop.depot.intelligent.grainReserves.model.BasicWarehouse;
+import com.chinaitop.depot.intelligent.utils.OrderNumberUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-出库验收确认 服务实现类
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-23
+ */
+@Service
+public class BusinessFsOutConfirmServiceImpl extends ServiceImpl<BusinessFsOutConfirmMapper, BusinessFsOutConfirm> implements BusinessFsOutConfirmService {
+
+    @Autowired
+    private BusinessFsOutConfirmMapper businessFsOutConfirmMapper;
+
+    @Autowired
+    private BusinessContractMapper businessContractMapper;
+
+    @Autowired
+    private BasicEnumMapper basicEnumMapper;
+
+    @Autowired
+    private BusinessStoreWareDetailMapper businessStoreWareDetailMapper;
+
+    @Autowired
+    private BusinessFsOutConfirmContractItemMapper businessFsOutConfirmContractItemMapper;
+
+    @Autowired
+    private BusinessFsOutConfirmDiffPriceItemMapper businessFsOutConfirmDiffPriceItemMapper;
+
+    @Autowired
+    private BasicStorehouseMapper basicStorehouseMapper;
+
+    @Autowired
+    private BasicWarehouseMapper basicWarehouseMapper;
+
+    /**
+     * 获取销售合同编号
+     *
+     * @author hjc
+     * @date 2024/7/23 16:56
+     */
+    @Override
+    public List<BusinessContract> getContractData(Integer orgId) {
+        return businessContractMapper.selectList(new LambdaQueryWrapper<BusinessContract>()
+                .eq(BusinessContract::getAuditState, 2)
+                .eq(BusinessContract::getContractType, "3148")
+                .eq(BusinessContract::getOrgId, orgId));
+    }
+
+    /**
+     * 通过合同id获取带出数据
+     *
+     * @author hjc
+     * @date 2024/7/23 16:37
+     */
+    @Override
+    public GetFsOutConfirmByContractVO getByContractId(String id) {
+
+        GetFsOutConfirmByContractVO vo = new GetFsOutConfirmByContractVO();
+        //获取合同信息
+        BusinessContract businessContract = businessContractMapper.selectById(id);
+        if (ObjectUtils.isNotEmpty(businessContract)) {
+            vo.setContractNumber(businessContract.getContractNumber());
+            vo.setContractTitle(businessContract.getContractTitle());
+            vo.setPurchaseUnit(businessContract.getPurchaseUnit());
+            BasicEnum basicEnum = basicEnumMapper.selectById(businessContract.getContractType());
+            if (ObjectUtils.isNotEmpty(basicEnum)) {
+                vo.setContractType(basicEnum.getEnumname());
+            }
+
+        }
+        //获取合同详情信息
+        List<BusinessStoreWareDetail> storeWareDetailList = businessStoreWareDetailMapper.selectList(
+                Wrappers.lambdaQuery(BusinessStoreWareDetail.class)
+                        .eq(BusinessStoreWareDetail::getZid, id)
+                        .eq(BusinessStoreWareDetail::getType, "contract"));
+
+        List<BusinessStoreWareDetailDataVO> storeWareDetailVOList = new ArrayList<>();
+
+        if (CollectionUtil.isNotEmpty(storeWareDetailList)) {
+            for (BusinessStoreWareDetail businessStoreWareDetail : storeWareDetailList) {
+                BusinessStoreWareDetailDataVO storeWareDetailVO = new BusinessStoreWareDetailDataVO();
+
+                storeWareDetailVO.setId(businessStoreWareDetail.getId());
+                //获取仓房
+                BasicEnum houseInfo = basicEnumMapper.selectById(businessStoreWareDetail.getHouseId());
+                if (ObjectUtils.isNotEmpty(houseInfo)) {
+                    storeWareDetailVO.setBasicStorehouseId(businessStoreWareDetail.getHouseId());
+                    storeWareDetailVO.setBasicStorehouseName(houseInfo.getEnumname());
+                }
+
+                //获取货位
+                BasicEnum warehouse = basicEnumMapper.selectById(businessStoreWareDetail.getWarehouseId());
+                if (ObjectUtils.isNotEmpty(warehouse)) {
+                    storeWareDetailVO.setWarehouseId(businessStoreWareDetail.getWarehouseId());
+                    storeWareDetailVO.setWarehouseName(warehouse.getEnumname());
+                }
+
+                //获取品种
+                BasicEnum grainKind = basicEnumMapper.selectById(businessStoreWareDetail.getGrainKind());
+                if (ObjectUtils.isNotEmpty(grainKind)) {
+                    storeWareDetailVO.setGrainVarietyId(businessStoreWareDetail.getGrainKind());
+                    storeWareDetailVO.setGrainVarietyName(grainKind.getEnumname());
+                }
+                //获取性质
+                BasicEnum grainAttribute = basicEnumMapper.selectById(businessStoreWareDetail.getGrainAttribute());
+                if (ObjectUtils.isNotEmpty(grainAttribute)) {
+                    storeWareDetailVO.setGrainNatureId(businessStoreWareDetail.getGrainAttribute());
+                    storeWareDetailVO.setGrainNatureName(grainAttribute.getEnumname());
+                }
+
+                //销售合同使用轮出价格，数量和总价
+                storeWareDetailVO.setSettlePrice(businessStoreWareDetail.getOutPrice() == null ? "0.0" : businessStoreWareDetail.getOutPrice());
+
+                //获取保存的确认单数量
+                Double sum = businessFsOutConfirmMapper.selectSum(id, businessStoreWareDetail.getGrainKind(), businessStoreWareDetail.getGrainAttribute());
+                if (sum == null) {
+                    sum = 0.0;
+                }
+                //用总的减去填写的数量
+                if (businessStoreWareDetail.getOutCount() == null) {
+                    businessStoreWareDetail.setOutCount("0.0");
+                }
+                double num = Double.parseDouble(businessStoreWareDetail.getOutCount()) - sum;
+
+                if (num <= 0) {
+                    storeWareDetailVO.setSettleQuantity("0.0");
+                    storeWareDetailVOList.add(storeWareDetailVO);
+                } else {
+                    storeWareDetailVO.setSettleQuantity(Double.toString(num));
+                    storeWareDetailVOList.add(storeWareDetailVO);
+                }
+            }
+        }
+
+
+        List<BusinessStoreWareDetailDataVO> list = new ArrayList<>();
+
+        //通过仓房，货位，品种，性质进行汇总
+        Map<String, List<BusinessStoreWareDetailDataVO>> collect =
+                storeWareDetailVOList.stream().collect(Collectors.groupingBy(this::fetchGroupKey));
+
+
+        Set<Map.Entry<String, List<BusinessStoreWareDetailDataVO>>> entries = collect.entrySet();
+
+        for (Map.Entry<String, List<BusinessStoreWareDetailDataVO>> entry : entries) {
+            int sum = 0;
+            List<BusinessStoreWareDetailDataVO> value = entry.getValue();
+            List<String> collect1 = value.stream().map(BusinessStoreWareDetailDataVO::getSettleQuantity).collect(Collectors.toList());
+            for (String s : collect1) {
+                sum += Double.parseDouble(s);
+            }
+            BusinessStoreWareDetailDataVO storeWareDetailVO = value.get(0);
+            storeWareDetailVO.setSettleQuantity(String.valueOf(sum));
+            list.add(storeWareDetailVO);
+        }
+
+
+        vo.setStoreWareDetailDataVOList(list);
+
+        return vo;
+
+
+    }
+
+
+    private String fetchGroupKey(BusinessStoreWareDetailDataVO vo) {
+        return vo.getBasicStorehouseId() + "_" + vo.getWarehouseId() + "_" + vo.getGrainVarietyId() + "_" + vo.getGrainNatureId();
+    }
+
+    /**
+     * 出库验收确认详情
+     *
+     * @author hjc
+     * @date 2024/7/24 9:46
+     */
+    @Override
+    public BusinessFsOutConfirmDetailVO getDataById(String id) {
+
+        BusinessFsOutConfirmDetailVO vo = new BusinessFsOutConfirmDetailVO();
+
+        //通过id获取确认单
+        BusinessFsOutConfirm businessFsOutConfirm = businessFsOutConfirmMapper.selectById(id);
+        BeanUtils.copyProperties(businessFsOutConfirm, vo);
+
+        //获取合同
+        BusinessContract businessContract = businessContractMapper.selectById(businessFsOutConfirm.getContractId());
+        BeanUtils.copyProperties(businessContract, vo);
+        if (ObjectUtils.isNotEmpty(businessContract)){
+
+            BasicEnum basicEnum = basicEnumMapper.selectById(businessContract.getContractType());
+            vo.setContractType(basicEnum.getEnumname());
+        }
+
+        //通过确认单获取合同信息
+        List<BusinessFsOutConfirmContractItem> businessFsOutConfirmContractItemList = businessFsOutConfirmContractItemMapper.selectList(new LambdaQueryWrapper<BusinessFsOutConfirmContractItem>()
+                .eq(BusinessFsOutConfirmContractItem::getFsOutConfirmId, businessFsOutConfirm.getId()));
+        List<BusinessStoreWareDetailDataVO> listVO = new ArrayList<>();
+        if (CollectionUtil.isNotEmpty(businessFsOutConfirmContractItemList)) {
+            for (BusinessFsOutConfirmContractItem businessFsOutConfirmContractItem : businessFsOutConfirmContractItemList) {
+
+                BusinessStoreWareDetailDataVO storeWareDetailVO = new BusinessStoreWareDetailDataVO();
+                storeWareDetailVO.setId(businessFsOutConfirmContractItem.getId());
+                storeWareDetailVO.setSettleQuantity(String.valueOf(businessFsOutConfirmContractItem.getSettleQuantity()));
+                storeWareDetailVO.setSettlePrice(String.valueOf(businessFsOutConfirmContractItem.getSettlePrice()));
+                storeWareDetailVO.setSettleAmount(String.valueOf(businessFsOutConfirmContractItem.getSettleAmount()));
+
+                //设置仓房货位品种性质
+                BasicStorehouse basicStorehouse = basicStorehouseMapper.selectById(businessFsOutConfirmContractItem.getBasicStorehouseId());
+                if (ObjectUtils.isNotEmpty(basicStorehouse)) {
+                    storeWareDetailVO.setBasicStorehouseId(businessFsOutConfirmContractItem.getBasicStorehouseId());
+                    storeWareDetailVO.setBasicStorehouseName(basicStorehouse.getStorehouseName());
+                }
+
+                BasicWarehouse basicWarehouse = basicWarehouseMapper.selectById(businessFsOutConfirmContractItem.getWarehouseId());
+                if (ObjectUtils.isNotEmpty(basicWarehouse)) {
+                    storeWareDetailVO.setWarehouseId(businessFsOutConfirmContractItem.getWarehouseId());
+                    storeWareDetailVO.setWarehouseName(basicWarehouse.getWarehouseName());
+                }
+
+                BasicEnum grainVariety = basicEnumMapper.selectById(businessFsOutConfirmContractItem.getGrainVarietyId());
+                if (ObjectUtils.isNotEmpty(grainVariety)) {
+                    storeWareDetailVO.setGrainVarietyName(grainVariety.getEnumname());
+                    storeWareDetailVO.setGrainVarietyId(businessFsOutConfirmContractItem.getGrainVarietyId());
+                }
+                BasicEnum grainNature = basicEnumMapper.selectById(businessFsOutConfirmContractItem.getGrainNatureId());
+                if (ObjectUtils.isNotEmpty(grainNature)) {
+                    storeWareDetailVO.setGrainNatureId(businessFsOutConfirmContractItem.getGrainNatureId());
+                    storeWareDetailVO.setGrainNatureName(grainNature.getEnumname());
+                }
+                listVO.add(storeWareDetailVO);
+
+            }
+        }
+        vo.setStoreWareDetailDataVOList(listVO);
+
+        List<BusinessFsOutConfirmDiffPriceItem> fsOutConfirmDiffPriceItemList = businessFsOutConfirmDiffPriceItemMapper.selectList(new LambdaQueryWrapper<BusinessFsOutConfirmDiffPriceItem>()
+                .eq(BusinessFsOutConfirmDiffPriceItem::getFsOutConfirmId, businessFsOutConfirm.getId()));
+        if (CollectionUtil.isNotEmpty(fsOutConfirmDiffPriceItemList)) {
+            vo.setFsOutConfirmDiffPriceItemList(fsOutConfirmDiffPriceItemList);
+        }
+
+        return vo;
+
+    }
+
+    /**
+     * 出库验收确认删除
+     *
+     * @author hjc
+     * @date 2024/7/24 10:42
+     */
+    @Transactional
+    @Override
+    public int deleteData(Integer id) {
+        //删除三张表数据
+        businessFsOutConfirmMapper.deleteById(id);
+        businessFsOutConfirmContractItemMapper.delete(new LambdaQueryWrapper<BusinessFsOutConfirmContractItem>()
+                .eq(BusinessFsOutConfirmContractItem::getFsOutConfirmId, id));
+        return businessFsOutConfirmDiffPriceItemMapper.delete(new LambdaQueryWrapper<BusinessFsOutConfirmDiffPriceItem>()
+                .eq(BusinessFsOutConfirmDiffPriceItem::getFsOutConfirmId, id));
+    }
+
+
+    /**
+     * 出库验收确认新增
+     *
+     * @author hjc
+     * @date 2024/7/24 11:09
+     */
+    @Transactional
+    @Override
+    public int saveData(BusinessFsOutConfirmAddParam param) {
+        //保存主表
+        String outboundConfirmationNumber = businessFsOutConfirmMapper.selectOutboundConfirmationNumber();
+        String s = OrderNumberUtil.initNum("CKQRD", 3, outboundConfirmationNumber);
+        BusinessFsOutConfirm businessFsOutConfirm = new BusinessFsOutConfirm();
+        BeanUtils.copyProperties(param, businessFsOutConfirm);
+        businessFsOutConfirm.setCreatedate(new Date());
+        businessFsOutConfirm.setUpdatedate(new Date());
+        businessFsOutConfirm.setOutboundConfirmationNumber(s);
+        businessFsOutConfirmMapper.insert(businessFsOutConfirm);
+
+        //保存合同表
+        List<BusinessFsOutConfirmContractItem> fsOutConfirmContractItemList = param.getFsOutConfirmContractItemList();
+        if (CollectionUtil.isNotEmpty(fsOutConfirmContractItemList)) {
+            for (BusinessFsOutConfirmContractItem businessFsOutConfirmContractItem : fsOutConfirmContractItemList) {
+                businessFsOutConfirmContractItem.setCreatedate(new Date());
+                businessFsOutConfirmContractItem.setUpdatedate(new Date());
+                businessFsOutConfirmContractItem.setFsOutConfirmId(businessFsOutConfirm.getId());
+                businessFsOutConfirmContractItemMapper.insert(businessFsOutConfirmContractItem);
+            }
+
+        }
+        //保存差价上缴
+        List<BusinessFsOutConfirmDiffPriceItem> fsOutConfirmDiffPriceItemList = param.getFsOutConfirmDiffPriceItemList();
+        if (CollectionUtil.isNotEmpty(fsOutConfirmDiffPriceItemList)) {
+            for (BusinessFsOutConfirmDiffPriceItem businessFsOutConfirmDiffPriceItem : fsOutConfirmDiffPriceItemList) {
+                businessFsOutConfirmDiffPriceItem.setCreatedate(new Date());
+                businessFsOutConfirmDiffPriceItem.setUpdatedate(new Date());
+                businessFsOutConfirmDiffPriceItem.setFsOutConfirmId(businessFsOutConfirm.getId());
+                businessFsOutConfirmDiffPriceItemMapper.insert(businessFsOutConfirmDiffPriceItem);
+            }
+        }
+
+        return 1;
+    }
+
+    /**
+     * 出库验收确认修改
+     *
+     * @author hjc
+     * @date 2024/7/24 11:18
+     */
+    @Transactional
+    @Override
+    public int updateData(BusinessFsOutConfirmUpdateParam param) {
+
+        //修改主表
+        BusinessFsOutConfirm businessFsOutConfirm = new BusinessFsOutConfirm();
+        BeanUtils.copyProperties(param, businessFsOutConfirm);
+        businessFsOutConfirm.setUpdatedate(new Date());
+        businessFsOutConfirmMapper.updateById(businessFsOutConfirm);
+
+        //删除合同和差价上缴
+        businessFsOutConfirmContractItemMapper.delete(new LambdaQueryWrapper<BusinessFsOutConfirmContractItem>()
+                .eq(BusinessFsOutConfirmContractItem::getFsOutConfirmId, param.getId()));
+        businessFsOutConfirmDiffPriceItemMapper.delete(new LambdaQueryWrapper<BusinessFsOutConfirmDiffPriceItem>()
+                .eq(BusinessFsOutConfirmDiffPriceItem::getFsOutConfirmId, param.getId()));
+
+
+        //保存合同表
+        List<BusinessFsOutConfirmContractItem> fsOutConfirmContractItemList = param.getFsOutConfirmContractItemList();
+        if (CollectionUtil.isNotEmpty(fsOutConfirmContractItemList)) {
+            for (BusinessFsOutConfirmContractItem businessFsOutConfirmContractItem : fsOutConfirmContractItemList) {
+                businessFsOutConfirmContractItem.setUpdatedate(new Date());
+                businessFsOutConfirmContractItem.setFsOutConfirmId(param.getId());
+                businessFsOutConfirmContractItemMapper.insert(businessFsOutConfirmContractItem);
+            }
+
+        }
+        //保存差价上缴
+        List<BusinessFsOutConfirmDiffPriceItem> fsOutConfirmDiffPriceItemList = param.getFsOutConfirmDiffPriceItemList();
+        if (CollectionUtil.isNotEmpty(fsOutConfirmDiffPriceItemList)) {
+            for (BusinessFsOutConfirmDiffPriceItem businessFsOutConfirmDiffPriceItem : fsOutConfirmDiffPriceItemList) {
+                businessFsOutConfirmDiffPriceItem.setUpdatedate(new Date());
+                businessFsOutConfirmDiffPriceItem.setFsOutConfirmId(param.getId());
+                businessFsOutConfirmDiffPriceItemMapper.insert(businessFsOutConfirmDiffPriceItem);
+            }
+        }
+        return 1;
+
+    }
+
+    /**
+     * 查询 出库验收确认 信息列表
+     *
+     * @author hjc
+     * @date 2024/7/24 11:25
+     */
+    @Override
+    public Page<BusinessFsOutConfirmPageVO> getList(BusinessFsOutConfirmPageParam pageParam) {
+        Page<BusinessFsOutConfirmPageVO> page = new Page<>(pageParam.getPageNum(), pageParam.getPageSize());
+        return businessFsOutConfirmMapper.selectMyPage(page, pageParam.getContractNumber(),pageParam.getOrgId());
+    }
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/vo/BusinessFsOutConfirmDetailVO.java

@@ -0,0 +1,42 @@
+package com.chinaitop.depot.intelligent.financialSupervision.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsInConfirm;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirm;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author hjc
+ * @date 2024/7/24 09:11
+ */
+@Data
+public class BusinessFsOutConfirmDetailVO extends BusinessFsOutConfirm{
+
+    @ApiModelProperty(value = "合同编号")
+    private String contractNumber;
+
+    @ApiModelProperty(value = "合同名称")
+    private String contractTitle;
+
+    @ApiModelProperty(value = "合同类型")
+    private String contractType;
+
+    @ApiModelProperty(value = "销往单位")
+    private String purchaseUnit;
+
+
+    @ApiModelProperty(value = "合同详情")
+    private List<BusinessStoreWareDetailDataVO> storeWareDetailDataVOList;
+
+
+    @ApiModelProperty(value = "差价上缴")
+    private List<BusinessFsOutConfirmDiffPriceItem> fsOutConfirmDiffPriceItemList;
+
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/vo/BusinessFsOutConfirmPageVO.java

@@ -0,0 +1,35 @@
+package com.chinaitop.depot.intelligent.financialSupervision.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author hjc
+ * @date 2024/7/23 15:47
+ */
+@Data
+public class BusinessFsOutConfirmPageVO {
+
+
+    @ApiModelProperty(value = "主键ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "合同编号")
+    private String contractNumber;
+
+    @ApiModelProperty(value = "数量")
+    private String totalNum;
+
+    @ApiModelProperty(value = "金额")
+    private String totalPrice;
+
+    @ApiModelProperty(value = "确认数量")
+    private String confirmNum;
+
+    @ApiModelProperty(value = "创建日期")
+    private Date createdate;
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/vo/BusinessStoreWareDetailDataVO.java

@@ -0,0 +1,48 @@
+package com.chinaitop.depot.intelligent.financialSupervision.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author hjc
+ * @date 2024/7/4 14:07
+ */
+@Data
+public class BusinessStoreWareDetailDataVO {
+
+    @ApiModelProperty(value = "basic_storehouse的id；仓房id")
+    private Integer basicStorehouseId;
+
+    @ApiModelProperty(value = "仓房名称")
+    private String basicStorehouseName;
+
+    @ApiModelProperty(value = "basic_warehouse的id；货位id;")
+    private Integer warehouseId;
+
+    @ApiModelProperty(value = "货位名称")
+    private String warehouseName;
+
+    @ApiModelProperty(value = "粮油品种id；basic_enum的id；")
+    private Integer grainVarietyId;
+
+    @ApiModelProperty(value = "粮油品种名称")
+    private String grainVarietyName;
+
+    @ApiModelProperty(value = "粮油性质；basic_enum的id；")
+    private Integer grainNatureId;
+
+    @ApiModelProperty(value = "粮油性质名称")
+    private String grainNatureName;
+
+    @ApiModelProperty(value = "结算数量")
+    private String settleQuantity;
+
+    @ApiModelProperty(value = "结算价格")
+    private String settlePrice;
+
+    @ApiModelProperty(value = "结算金额")
+    private String settleAmount;
+
+    @ApiModelProperty(value = "合同详情id")
+    private Integer id;
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/vo/BusinessStoreWareDetailVO.java

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.intelligent.financialSupervision.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,6 +11,17 @@ import lombok.Data;
 @Data
 public class BusinessStoreWareDetailVO {
 
+    @ApiModelProperty(value = "basic_storehouse的id；仓房id")
+    private Integer houseId;
+
+    @ApiModelProperty(value = "仓房名称")
+    private String houseName;
+
+    @ApiModelProperty(value = "basic_warehouse的id；货位id;")
+    private Integer warehouseId;
+
+    @ApiModelProperty(value = "货位名称")
+    private String warehouseName;
 
     @ApiModelProperty(value = "粮油品种id；basic_enum的id；")
     private Integer grainKind;

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/vo/GetFsOutConfirmByContractVO.java

@@ -0,0 +1,30 @@
+package com.chinaitop.depot.intelligent.financialSupervision.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author hjc
+ * @date 2024/7/23 16:41
+ */
+@Data
+public class GetFsOutConfirmByContractVO {
+
+    @ApiModelProperty(value = "合同编号")
+    private String contractNumber;
+
+    @ApiModelProperty(value = "合同名称")
+    private String contractTitle;
+
+    @ApiModelProperty(value = "合同类型")
+    private String contractType;
+
+    @ApiModelProperty(value = "销往单位")
+    private String purchaseUnit;
+
+
+    @ApiModelProperty(value = "合同详情")
+    private List<BusinessStoreWareDetailDataVO> storeWareDetailDataVOList;
+}

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

@@ -0,0 +1,122 @@
+package com.chinaitop.depot.intelligent.priceApproval.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaitop.depot.intelligent.common.ResponseEntity;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
+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<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<BusinessFsSaleRevenueThreeConsistenceAccount>> 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));
+    }
+
+    @GetMapping("/getOutStorageDetailed/{contractNumber}")
+    @ApiOperation(value = "三账一致性-出库明细", notes = "出库明细")
+    public ResponseEntity<List<DataCPZ>> getOutStorageDetailed(@PathVariable("contractNumber") String contractNumber) {
+        return ResponseEntity.ok(saleRevenueService.getOutStorageDetailed(contractNumber));
+    }
+
+    @GetMapping("/getSettlementInfo/{contractNumber}")
+    @ApiOperation(value = "结算信息", notes = "结算信息")
+    public ResponseEntity<List<BusinessFsSaleRevenueSettle>> getSettlementInfo(@PathVariable("contractNumber") String contractNumber) {
+        return ResponseEntity.ok(saleRevenueService.getSettlementInfo(contractNumber));
+    }
+
+    @GetMapping("/getDiffPriceInfo/{contractNumber}")
+    @ApiOperation(value = "差价上缴", notes = "差价上缴")
+    public ResponseEntity<List<BusinessFsSaleRevenueDiffPrice>> getDiffPriceInfo(@PathVariable("contractNumber") String contractNumber) {
+        return ResponseEntity.ok(saleRevenueService.getDiffPriceInfo(contractNumber));
+    }
+
+    @GetMapping("/getCardInfo/{orgId}/{basicStorehouseId}/{warehouseId}")
+    @ApiOperation(value = "原核定入库价格", notes = "原核定入库价格")
+    public ResponseEntity<BusinessFsSaleRevenueApprovalPrice> getCardInfo(@PathVariable("orgId") Integer orgId,
+                                                                     @PathVariable("basicStorehouseId") Integer basicStorehouseId,
+                                                                     @PathVariable("warehouseId") Integer warehouseId) {
+        return ResponseEntity.ok(saleRevenueService.getCardInfo(orgId, basicStorehouseId, warehouseId));
+    }
+
+    @PostMapping("/save")
+    @ApiOperation(value = "销售收入上缴新增", notes = "新增")
+    public ResponseEntity save(@Validated @RequestBody BusinessFsSaleRevenue param) {
+        saleRevenueService.saveData(param);
+        return ResponseEntity.ok();
+    }
+
+    @PostMapping("/details/{id}")
+    @ApiOperation(value = "销售收入上缴详情", notes = "详情")
+    public ResponseEntity details(@PathVariable("id") Integer id) {
+        return ResponseEntity.ok(saleRevenueService.detailsData(id));
+    }
+
+    @PostMapping("/update")
+    @ApiOperation(value = "销售收入上缴修改", notes = "修改")
+    public ResponseEntity update(@Validated @RequestBody BusinessFsSaleRevenue param) {
+        saleRevenueService.updateData(param);
+        return ResponseEntity.ok();
+    }
+
+    @GetMapping("/getPageList")
+    @ApiOperation(value = "分页列表", notes = "支持分页")
+    public ResponseEntity<Page<BusinessFsSaleRevenue>> getPageList(@Validated BusinessFsSaleRevenuePage param) {
+        return ResponseEntity.ok(saleRevenueService.selectPageList(param));
+    }
+
+    @PostMapping("/delete/{id}")
+    @ApiOperation(value = "销售收入上缴删除", notes = "删除")
+    public ResponseEntity delete(@PathVariable("id") Integer id) {
+        saleRevenueService.deleteData(id);
+        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,54 @@
+package com.chinaitop.depot.intelligent.priceApproval.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
+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);
+
+    BusinessFsSaleRevenueInspectionLoss getQualityInfo(Map<String, Object> map);
+
+    List<BusinessFsSaleRevenueThreeConsistenceAccount> getConsistenceAccountInfo(@Param("contractNumber") String contractNumber);
+
+    List<BusinessFsSaleRevenueThreeConsistence> getOutStorageInfo(@Param("contractNumber") String contractNumber);
+
+    List<DataCPZ> getOutStorageDetailed(@Param("contractNumber") String contractNumber);
+
+    List<BusinessFsSaleRevenueSettle> getSettlementInfo(@Param("contractNumber") String contractNumber);
+
+    List<BusinessFsSaleRevenueDiffPrice> getDiffPriceInfo(@Param("contractNumber") String contractNumber);
+
+    BusinessFsSaleRevenueApprovalPrice getCardInfo(Map<String, Object> map);
+
+    List<BusinessFsSaleRevenueThreeConsistenceAccount> getConsistenceAccountDetailsInfo(@Param("id") Integer id);
+
+    List<BusinessFsSaleRevenueInspectionLoss> getQualityDetailsInfo(@Param("id") Integer id);
+
+    List<BusinessFsSaleRevenueThreeConsistence> getOutStorageDetailsInfo(@Param("id") Integer id);
+
+    List<BusinessFsSaleRevenueSettle> getSettlementDetailsInfo(@Param("id") Integer id);
+
+    List<BusinessFsSaleRevenueApprovalPrice> getCardDetailsInfo(@Param("id") Integer id);
+
+    List<BusinessFsSaleRevenueDiffPrice> getDiffPriceDetailsInfo(@Param("id") Integer id);
+
+    Page<BusinessFsSaleRevenue> selectPageList(Page<Object> objectPage, @Param("ew") QueryWrapper<BusinessFsSaleRevenue> wrapper);
+}

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/BusinessFsSaleRevenueThreeConsistenceAccountMapper.java

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

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,124 @@
+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：已核定；3：省级平台-上报")
+    @TableField("status")
+    private Integer status;
+
+    // 只展示不保存
+    @ApiModelProperty(value = "合同信息")
+    @TableField(exist = false)
+    private List<BusinessContractDetail> contractDetails;
+
+    @ApiModelProperty(value = "质检损益信息")
+    @TableField(exist = false)
+    private List<BusinessFsSaleRevenueInspectionLoss> inspectionLossList;
+
+    @ApiModelProperty(value = "三账一致性-会计账")
+    @TableField(exist = false)
+    private List<BusinessFsSaleRevenueThreeConsistenceAccount> threeConsistenceAccountList;
+
+    @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;
+
+    @ApiModelProperty(value = "合同编号")
+    @TableField(exist = false)
+    private String contractNumber;
+
+    @ApiModelProperty(value = "数量")
+    @TableField(exist = false)
+    private String grainQuantity;
+
+    @ApiModelProperty(value = "金额")
+    @TableField(exist = false)
+    private String moneyQuantity;
+
+    @ApiModelProperty(value = "确认数量")
+    @TableField(exist = false)
+    private String performanceQuantity;
+}

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

@@ -0,0 +1,94 @@
+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;
+
+    @ApiModelProperty(value = "仓房名称")
+    @TableField(exist = false)
+    private Integer storehouseId;
+
+    @ApiModelProperty(value = "仓房名称")
+    @TableField(exist = false)
+    private String storehouseName;
+
+    @ApiModelProperty(value = "货位名称")
+    @TableField(exist = false)
+    private String warehouseId;
+
+    @ApiModelProperty(value = "货位名称")
+    @TableField(exist = false)
+    private String warehouseName;
+
+    @ApiModelProperty(value = "入库数量（公斤）")
+    @TableField(exist = false)
+    private BigDecimal lssl;
+
+    @ApiModelProperty(value = "核定单价（元）")
+    @TableField(exist = false)
+    private BigDecimal inNinancialVerification;
+}

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/BusinessFsSaleRevenuePage.java

@@ -0,0 +1,25 @@
+package com.chinaitop.depot.intelligent.priceApproval.model;
+
+import com.chinaitop.depot.intelligent.common.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-07-25 17:58
+ */
+@Data
+public class BusinessFsSaleRevenuePage extends PageParam implements Serializable {
+    private static final long serialVersionUID = -5868563850694881293L;
+
+    @ApiModelProperty(value = "库区编码", required = true)
+    @NotNull(message = "机构编码不能为空")
+    private Integer orgId;
+    //合同编号
+    @ApiModelProperty(value = "合同编号")
+    private String contractNumber;
+}

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

@@ -0,0 +1,115 @@
+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;
+
+    // 业务数据
+    @ApiModelProperty(value = "出库验收确认-单位")
+    @TableField(exist = false)
+    private String orgName;
+
+    @ApiModelProperty(value = "贷款收回情况-日期")
+    @TableField(exist = false)
+    private Date loanReturnTime;
+}

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 Integer 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/model/BusinessFsSaleRevenueThreeConsistenceAccount.java

@@ -0,0 +1,88 @@
+package com.chinaitop.depot.intelligent.priceApproval.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 财务监管-销售收入上缴-三账一致性-会计账
+ * </p>
+ *
+ * @author root
+ * @since 2024-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("business_fs_sale_revenue_three_consistence_account")
+@ApiModel(value="BusinessFsSaleRevenueThreeConsistenceAccount对象", description="财务监管-销售收入上缴-三账一致性-会计账")
+public class BusinessFsSaleRevenueThreeConsistenceAccount 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 Integer year;
+
+    @ApiModelProperty(value = "月份")
+    @TableField("month")
+    private String month;
+
+    @ApiModelProperty(value = "会计账-数量，单位：公斤")
+    @TableField("accounting_quantity")
+    private BigDecimal accountingQuantity;
+
+    @ApiModelProperty(value = "省平台修改-会计账-数量，单位：公斤；")
+    @TableField("province_accounting_quantity")
+    private BigDecimal provinceAccountingQuantity;
+
+    @ApiModelProperty(value = "会计账-金额，单位：元")
+    @TableField("accounting_amount")
+    private BigDecimal accountingAmount;
+
+    @ApiModelProperty(value = "省平台修改-会计账-金额，单位：元")
+    @TableField("province_accounting_amount")
+    private BigDecimal provinceAccountingAmount;
+
+    @ApiModelProperty(value = "凭证号")
+    @TableField(exist = false)
+    private String voucherNumber;
+
+    @ApiModelProperty(value = "销售单价(元）")
+    @TableField(exist = false)
+    private BigDecimal unitPrice;
+
+}

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,47 @@
+package com.chinaitop.depot.intelligent.priceApproval.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
+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);
+
+    BusinessFsSaleRevenueInspectionLoss getQualityInfo(Integer orgId, Integer basicStorehouseId, Integer warehouseId);
+
+    List<BusinessFsSaleRevenueThreeConsistenceAccount> getConsistenceAccountInfo(String contractNumber);
+
+    List<BusinessFsSaleRevenueThreeConsistence> getOutStorageInfo(String contractNumber);
+
+    List<DataCPZ> getOutStorageDetailed(String contractNumber);
+
+    List<BusinessFsSaleRevenueSettle> getSettlementInfo(String contractNumber);
+
+    List<BusinessFsSaleRevenueDiffPrice> getDiffPriceInfo(String contractNumber);
+
+    BusinessFsSaleRevenueApprovalPrice getCardInfo(Integer orgId, Integer basicStorehouseId, Integer warehouseId);
+
+    void updateData(BusinessFsSaleRevenue param);
+
+    BusinessFsSaleRevenue detailsData(Integer id);
+
+    Page<BusinessFsSaleRevenue> selectPageList(BusinessFsSaleRevenuePage param);
+
+    void deleteData(Integer id);
+}

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/BusinessFsSaleRevenueThreeConsistenceAccountService.java

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

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,352 @@
+package com.chinaitop.depot.intelligent.priceApproval.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
+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.math.BigDecimal;
+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;
+    @Resource
+    private BusinessFsSaleRevenueThreeConsistenceAccountMapper threeConsistenceAccountMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveData(BusinessFsSaleRevenue param) {
+        // 保存主表
+        saleRevenueMapper.insert(param);
+        // 保存子表-质检损益信息
+        this.saveInspectionLoss(param);
+        // 保存子表-三账一致性-会计账
+        this.saveThreeConsistence(param);
+        // 保存子表-三账一致性-实际出库情况
+        this.saveOutStorage(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 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<BusinessFsSaleRevenueThreeConsistenceAccount> getConsistenceAccountInfo(String contractNumber) {
+        return saleRevenueMapper.getConsistenceAccountInfo(contractNumber);
+    }
+
+    @Override
+    public List<BusinessFsSaleRevenueThreeConsistence> getOutStorageInfo(String contractNumber) {
+        return saleRevenueMapper.getOutStorageInfo(contractNumber);
+    }
+
+    @Override
+    public List<DataCPZ> getOutStorageDetailed(String contractNumber) {
+        return saleRevenueMapper.getOutStorageDetailed(contractNumber);
+    }
+
+    @Override
+    public List<BusinessFsSaleRevenueSettle> getSettlementInfo(String contractNumber) {
+        return saleRevenueMapper.getSettlementInfo(contractNumber);
+    }
+
+    @Override
+    public List<BusinessFsSaleRevenueDiffPrice> getDiffPriceInfo(String contractNumber) {
+        return saleRevenueMapper.getDiffPriceInfo(contractNumber);
+    }
+
+    @Override
+    public BusinessFsSaleRevenueApprovalPrice getCardInfo(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.getCardInfo(map);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateData(BusinessFsSaleRevenue param) {
+        // 主表id
+        Integer id = param.getId();
+
+        // 修改主表
+        saleRevenueMapper.updateById(param);
+
+        // 删除子表-质检损益信息
+        this.inspectionLossDelete(id);
+        // 保存子表-质检损益信息
+        this.saveInspectionLoss(param);
+
+        // 删除子表-三账一致性-会计账
+        this.threeConsistenceAccountDelete(id);
+        // 保存子表-三账一致性-会计账
+        this.saveThreeConsistence(param);
+
+        // 删除子表-三账一致性-实际出库情况
+        this.threeConsistenceDelete(id);
+        // 保存子表-三账一致性-实际出库情况
+        this.saveOutStorage(param);
+
+        // 删除子表-结算信息
+        this.revenueSettleDelete(id);
+        // 保存子表-结算信息
+        this.saveSettle(param);
+
+        // 删除子表-原核定入库价格
+        this.approvalPriceDelete(id);
+        // 保存子表-原核定入库价格
+        this.saveApprovalPrice(param);
+
+        // 删除子表-差价上缴
+        this.diffPriceDelete(id);
+        // 保存子表-差价上缴
+        this.saveDiffPrice(param);
+    }
+
+    @Override
+    public BusinessFsSaleRevenue detailsData(Integer id) {
+        // 查询主表
+        BusinessFsSaleRevenue saleRevenue = saleRevenueMapper.selectById(id);
+        // 查询子表-合同信息
+        List<BusinessContractDetail> contractInfoList = this.getContractInfoList(saleRevenue.getContractId());
+        if (CollectionUtils.isNotEmpty(contractInfoList)) {
+            saleRevenue.setContractDetails(contractInfoList);
+        }
+        // 查询子表-质检损益信息
+        List<BusinessFsSaleRevenueInspectionLoss> inspectionLossList = saleRevenueMapper.getQualityDetailsInfo(id);
+        if (CollectionUtils.isNotEmpty(inspectionLossList)) {
+            saleRevenue.setInspectionLossList(inspectionLossList);
+        }
+        // 查询子表-三账一致性-会计账
+        List<BusinessFsSaleRevenueThreeConsistenceAccount> threeConsistenceList = saleRevenueMapper.getConsistenceAccountDetailsInfo(id);
+        if (CollectionUtils.isNotEmpty(threeConsistenceList)) {
+            saleRevenue.setThreeConsistenceAccountList(threeConsistenceList);
+        }
+        // 查询子表-三账一致性-实际出库情况
+        List<BusinessFsSaleRevenueThreeConsistence> outStorageDetailsInfo = saleRevenueMapper.getOutStorageDetailsInfo(id);
+        if (CollectionUtils.isNotEmpty(outStorageDetailsInfo)) {
+            saleRevenue.setThreeConsistenceList(outStorageDetailsInfo);
+        }
+        // 查询子表-结算信息
+        List<BusinessFsSaleRevenueSettle> revenueSettleList = saleRevenueMapper.getSettlementDetailsInfo(id);
+        if (CollectionUtils.isNotEmpty(revenueSettleList)) {
+            saleRevenue.setRevenueSettleList(revenueSettleList);
+        }
+        // 查询子表-原核定入库价格
+        List<BusinessFsSaleRevenueApprovalPrice> approvalPriceList = saleRevenueMapper.getCardDetailsInfo(id);
+        if (CollectionUtils.isNotEmpty(approvalPriceList)) {
+            saleRevenue.setApprovalPriceList(approvalPriceList);
+        }
+        // 查询子表-差价上缴
+        List<BusinessFsSaleRevenueDiffPrice> DiffPriceList = saleRevenueMapper.getDiffPriceDetailsInfo(id);
+        if (CollectionUtils.isNotEmpty(DiffPriceList)) {
+            saleRevenue.setDiffPriceList(DiffPriceList);
+        }
+        return saleRevenue;
+    }
+
+    @Override
+    public Page<BusinessFsSaleRevenue> selectPageList(BusinessFsSaleRevenuePage param) {
+        QueryWrapper<BusinessFsSaleRevenue> wrapper = new QueryWrapper<>();
+        wrapper.eq("sr.org_id", param.getOrgId());
+        if (StringUtils.isNotBlank(param.getContractNumber())) {
+            wrapper.eq("bc.contract_number", param.getContractNumber());
+        }
+        return saleRevenueMapper.selectPageList(new Page<>(param.getCurrent(), param.getSize()), wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteData(Integer id) {
+        // 删除主表
+        saleRevenueMapper.deleteById(id);
+
+        // 删除子表-质检损益信息
+        this.inspectionLossDelete(id);
+
+        // 删除子表-三账一致性-会计账
+        this.threeConsistenceAccountDelete(id);
+
+        // 删除子表-三账一致性-实际出库情况
+        this.threeConsistenceDelete(id);
+
+        // 删除子表-结算信息
+        this.revenueSettleDelete(id);
+
+        // 删除子表-原核定入库价格
+        this.approvalPriceDelete(id);
+
+        // 删除子表-差价上缴
+        this.diffPriceDelete(id);
+    }
+
+    // 保存子表-质检损益信息
+    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.getThreeConsistenceAccountList())) {
+            param.getThreeConsistenceAccountList().forEach(threeConsistenceAccount -> {
+                threeConsistenceAccount.setFsSaleRevenueId(param.getId());
+                threeConsistenceAccount.setProvinceAccountingQuantity(threeConsistenceAccount.getAccountingQuantity() == null ? new BigDecimal(0) : threeConsistenceAccount.getAccountingQuantity());
+                threeConsistenceAccount.setProvinceAccountingAmount(threeConsistenceAccount.getAccountingAmount() == null ? new BigDecimal(0) : threeConsistenceAccount.getAccountingAmount());
+                threeConsistenceAccountMapper.insert(threeConsistenceAccount);
+            });
+        }
+    }
+
+    // 保存子表-三账一致性-实际出库情况
+    private void saveOutStorage(BusinessFsSaleRevenue param) {
+        if (CollectionUtils.isNotEmpty(param.getThreeConsistenceList())) {
+            param.getThreeConsistenceList().forEach(outStorage -> {
+                outStorage.setFsSaleRevenueId(param.getId());
+                outStorage.setAccountingQuantity(new BigDecimal(0));
+                outStorage.setProvinceAccountingQuantity(new BigDecimal(0));
+                outStorage.setAccountingUnitPrice(new BigDecimal(0));
+                outStorage.setProvinceAccountingUnitPrice(new BigDecimal(0));
+                outStorage.setAccountingAmount(new BigDecimal(0));
+                outStorage.setProvinceAccountingAmount(new BigDecimal(0));
+                outStorage.setProvinceLoss(outStorage.getLoss());
+                outStorage.setProvinceCustodyAccountQuantity(outStorage.getCustodyAccountQuantity().toString());
+                outStorage.setProvinceStatisticalAccountQuantity(outStorage.getStatisticalAccountQuantity());
+                outStorage.setProvinceCompleteTime(outStorage.getCompleteTime());
+                threeConsistenceMapper.insert(outStorage);
+            });
+        }
+    }
+
+    // 保存子表-结算信息
+    private void saveSettle(BusinessFsSaleRevenue param) {
+        if (CollectionUtils.isNotEmpty(param.getRevenueSettleList())) {
+            param.getRevenueSettleList().forEach(settle -> {
+                settle.setFsSaleRevenueId(param.getId());
+                settle.setProvinceAcceptanceUnit(settle.getOrgName());
+                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());
+                diffPrice.setProvinceTotalQuantity(diffPrice.getTotalQuantity());
+                diffPrice.setProvinceTotalAmount(diffPrice.getTotalAmount());
+                diffPriceMapper.insert(diffPrice);
+            });
+        }
+    }
+
+    // 删除子表-质检损益信息
+    private void inspectionLossDelete(Integer id) {
+        QueryWrapper<BusinessFsSaleRevenueInspectionLoss> wrapperInspectionLoss = new QueryWrapper<>();
+        wrapperInspectionLoss.eq("fs_sale_revenue_id", id);
+        saleRevenueInspectionLossMapper.delete(wrapperInspectionLoss);
+    }
+
+    // 删除子表-三账一致性-会计账
+    private void threeConsistenceAccountDelete(Integer id) {
+        QueryWrapper<BusinessFsSaleRevenueThreeConsistenceAccount> wrapperThreeConsistenceAccount = new QueryWrapper<>();
+        wrapperThreeConsistenceAccount.eq("fs_sale_revenue_id", id);
+        threeConsistenceAccountMapper.delete(wrapperThreeConsistenceAccount);
+    }
+
+    // 删除子表-三账一致性-实际出库情况
+    private void threeConsistenceDelete(Integer id) {
+        QueryWrapper<BusinessFsSaleRevenueThreeConsistence> wrapperThreeConsistence = new QueryWrapper<>();
+        wrapperThreeConsistence.eq("fs_sale_revenue_id", id);
+        threeConsistenceMapper.delete(wrapperThreeConsistence);
+    }
+
+    // 删除子表-结算信息
+    private void revenueSettleDelete(Integer id) {
+        QueryWrapper<BusinessFsSaleRevenueSettle> wrapperRevenueSettle = new QueryWrapper<>();
+        wrapperRevenueSettle.eq("fs_sale_revenue_id", id);
+        settleMapper.delete(wrapperRevenueSettle);
+    }
+
+    // 删除子表-原核定入库价格
+    private void approvalPriceDelete(Integer id) {
+        QueryWrapper<BusinessFsSaleRevenueApprovalPrice> wrapperApprovalPrice = new QueryWrapper<>();
+        wrapperApprovalPrice.eq("fs_sale_revenue_id", id);
+        approvalPriceMapper.delete(wrapperApprovalPrice);
+    }
+
+    // 删除子表-差价上缴
+    private void diffPriceDelete(Integer id) {
+        QueryWrapper<BusinessFsSaleRevenueDiffPrice> wrapperDiffPrice = new QueryWrapper<>();
+        wrapperDiffPrice.eq("fs_sale_revenue_id", id);
+        diffPriceMapper.delete(wrapperDiffPrice);
+    }
+}

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/BusinessFsSaleRevenueThreeConsistenceAccountServiceImpl.java

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

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/java/com/chinaitop/depot/intelligent/pushs/service/impl/GrainPushsServiceImpl.java

@@ -70,8 +70,8 @@ public class GrainPushsServiceImpl implements GrainPushsService {
             BigDecimal max = points.stream().filter(TPoints -> !TempUtils.isBad(TPoints.getTemp())).map(TPoints::getTemp).reduce(BigDecimal.ZERO, BigDecimal::max);
             lqData.setTempMax(max);
             // 最低
-            BigDecimal min = points.stream().filter(TPoints -> !TempUtils.isBad(TPoints.getTemp())).map(TPoints::getTemp).reduce(BigDecimal.ZERO, BigDecimal::min);
-            lqData.setTempMin(min);
+            Optional<BigDecimal> minOptinal = points.stream().map(TPoints::getTemp).min(BigDecimal::compareTo);
+            minOptinal.ifPresent(min -> lqData.setTempMin(min));
             // 平均
             BigDecimal wholeSum = points.stream().filter(TPoints -> !TempUtils.isBad(TPoints.getTemp())).map(TPoints::getTemp).reduce(BigDecimal.ZERO, BigDecimal::add);
             float doubleValue = wholeSum.floatValue();
@@ -129,8 +129,8 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                 BigDecimal lsyerMax = v.stream().filter(TPoints -> !TPoints.getTemp().equals(new BigDecimal("250.0"))).map(TPoints::getTemp).reduce(BigDecimal.ZERO, BigDecimal::max);
                 layer.setLmax(lsyerMax);
                 // 每层最低
-                BigDecimal lsyerMin = v.stream().filter(TPoints -> !TPoints.getTemp().equals(new BigDecimal("250.0"))).map(TPoints::getTemp).reduce(BigDecimal.ZERO, BigDecimal::min);
-                layer.setLmin(lsyerMin);
+                Optional<BigDecimal> vMin = v.stream().map(TPoints::getTemp).min(BigDecimal::compareTo);
+                vMin.ifPresent(lsyerMin -> layer.setLmin(lsyerMin));
                 // 每层平均温
                 BigDecimal lsyerSums = v.stream().filter(TPoints -> !TPoints.getTemp().equals(new BigDecimal("250.0"))).map(TPoints::getTemp).reduce(BigDecimal.ZERO, BigDecimal::add);
                 float lsyerSum = lsyerSums.floatValue();

src/main/resources/mapper/financialSupervision/BusinessFsInterestMaintainMapper.xml

@@ -0,0 +1,30 @@
+<?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.financialSupervision.mapper.BusinessFsInterestMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsInterestMaintain">
+        <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="interest_bill_no" property="interestBillNo" />
+        <result column="year" property="year" />
+        <result column="month" property="month" />
+        <result column="actual_interest_received" property="actualInterestReceived" />
+        <result column="other_deduction" property="otherDeduction" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, createname, createdate, updatename, updatedate, org_id, interest_bill_no, year, month, actual_interest_received, other_deduction, remark
+    </sql>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select interest_bill_no from business_fs_interest_maintain order by createdate desc limit 1
+    </select>
+
+</mapper>

src/main/resources/mapper/financialSupervision/BusinessFsOutConfirmContractItemMapper.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.financialSupervision.mapper.BusinessFsOutConfirmContractItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmContractItem">
+        <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_out_confirm_id" property="fsOutConfirmId" />
+        <result column="grain_variety_id" property="grainVarietyId" />
+        <result column="grain_nature_id" property="grainNatureId" />
+        <result column="settle_quantity" property="settleQuantity" />
+        <result column="settle_price" property="settlePrice" />
+        <result column="settle_amount" property="settleAmount" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, createname, createdate, updatename, updatedate, fs_out_confirm_id, grain_variety_id, grain_nature_id, settle_quantity, settle_price, settle_amount
+    </sql>
+
+</mapper>

src/main/resources/mapper/financialSupervision/BusinessFsOutConfirmDiffPriceItemMapper.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.financialSupervision.mapper.BusinessFsOutConfirmDiffPriceItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem">
+        <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_out_confirm_id" property="fsOutConfirmId" />
+        <result column="project_type" property="projectType" />
+        <result column="quantity" property="quantity" />
+        <result column="amount" property="amount" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, createname, createdate, updatename, updatedate, fs_out_confirm_id, project_type, quantity, amount
+    </sql>
+
+</mapper>

src/main/resources/mapper/financialSupervision/BusinessFsOutConfirmMapper.xml

@@ -0,0 +1,74 @@
+<?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.financialSupervision.mapper.BusinessFsOutConfirmMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirm">
+        <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="contract_id" property="contractId" />
+        <result column="outbound_confirmation_time" property="outboundConfirmationTime" />
+        <result column="outbound_confirmation_number" property="outboundConfirmationNumber" />
+        <result column="total_settle_quantity" property="totalSettleQuantity" />
+        <result column="total_settle_amount" property="totalSettleAmount" />
+        <result column="loan_recovery_unit" property="loanRecoveryUnit" />
+        <result column="loan_recovery_quantity" property="loanRecoveryQuantity" />
+        <result column="loan_recovery_amount" property="loanRecoveryAmount" />
+        <result column="loan_return_time" property="loanReturnTime" />
+        <result column="loan_return_amount" property="loanReturnAmount" />
+        <result column="invoice_unit" property="invoiceUnit" />
+        <result column="invoice_quantity" property="invoiceQuantity" />
+        <result column="invoice_unit_price" property="invoiceUnitPrice" />
+        <result column="invoice_amount" property="invoiceAmount" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, createname, createdate, updatename, updatedate, org_id, contract_id, outbound_confirmation_time, outbound_confirmation_number, total_settle_quantity, total_settle_amount, loan_recovery_unit, loan_recovery_quantity, loan_recovery_amount, loan_return_time, loan_return_amount, invoice_unit, invoice_quantity, invoice_unit_price, invoice_amount
+    </sql>
+    <select id="selectSum" resultType="java.lang.Double">
+        SELECT sum(ifnull(t2.settle_quantity, 0))
+        FROM business_fs_out_confirm t1
+                 LEFT JOIN business_fs_out_confirm_contract_item t2 ON t1.id = t2.fs_out_confirm_id
+        where t1.contract_id = #{id}
+          and t2.grain_variety_id = #{grainKind}
+          and t2.grain_nature_id = #{grainAttribute}
+        GROUP BY t1.contract_id,
+                 t2.grain_variety_id,
+                 t2.grain_nature_id
+    </select>
+
+    <select id="selectMyPage"
+            resultType="com.chinaitop.depot.intelligent.financialSupervision.vo.BusinessFsOutConfirmPageVO">
+
+        SELECT
+        t1.id,
+        t1.createdate,
+        t4.contract_number,
+        ifnull( sum( t2.quantity ), 0 ) totalNum,
+        ifnull( sum( t2.amount ), 0 ) totalPrice,
+        t1.total_settle_quantity confirmNum
+        FROM
+        business_fs_out_confirm t1
+        LEFT JOIN business_fs_out_confirm_diff_price_item t2 ON t1.id = t2.fs_out_confirm_id
+        LEFT JOIN business_contract t4 ON t1.contract_id = t4.id
+        <where>
+            t1.org_id=#{orgId}
+            <if test="contractNumber!=null and contractNumber!=''">
+                and t4.contract_number like concat("%",#{contractNumber},"%")
+            </if>
+        </where>
+        group by t1.id
+        order by t1.createdate desc
+
+    </select>
+
+    <select id="selectOutboundConfirmationNumber" resultType="java.lang.String">
+        select outbound_confirmation_number from business_fs_out_confirm order by id desc limit 1
+    </select>
+
+</mapper>

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,450 @@
+<?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,
+            bs.storehouse_name houseName,
+            bw.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
+        LEFT JOIN basic_storehouse bs ON swd.house_id = bs.storehouse_id
+        LEFT JOIN basic_warehouse bw ON swd.warehouse_id = bw.warehouse_id
+        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}
+        ORDER BY qi.createdate DESC
+        ) 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}
+        ORDER BY qi.createdate DESC
+        ) 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}
+        ORDER BY lc.createdate DESC
+        ) t3 ON t1.org_id = t3.org_id
+        LIMIT 1
+    </select>
+    <select id="getConsistenceAccountInfo" parameterType="string" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueThreeConsistenceAccount">
+        SELECT
+            YEAR (fa.statistical_date) `year`,
+            MONTH (fa.statistical_date) `month`,
+            fa.voucher_number voucherNumber,
+            fa.quantity accountingQuantity,
+            fa.unit_price unitPrice,
+            fa.amount accountingAmount
+        FROM
+            business_fs_account fa
+        LEFT JOIN business_contract bc ON fa.contract_id = bc.id
+        WHERE
+            fa.type = 2
+        AND bc.contract_number = #{contractNumber}
+    </select>
+    <select id="getOutStorageInfo" parameterType="string" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueThreeConsistence">
+        SELECT
+            YEAR (ci.createdate) `year`,
+            MONTH (ci.createdate) `month`,
+            ci.basic_storehouse_id basicStorehouseId,
+            ci.warehouse_id warehouseId,
+            bs.storehouse_name storehouseName,
+            bw.warehouse_name warehouseName,
+            IFNULL(lc.actual_loss_quantity, 0) loss,
+            IFNULL(cd.klhjz, 0) custodyAccountQuantity,
+            IFNULL(sa.expenditure_quantity, 0) statisticalAccountQuantity,
+            cd.djsj completeTime
+        FROM
+            business_fs_out_confirm oc
+        LEFT JOIN business_fs_out_confirm_contract_item ci ON ci.fs_out_confirm_id = oc.id
+        LEFT JOIN business_contract bc ON bc.id = oc.contract_id
+        LEFT JOIN basic_storehouse bs ON ci.basic_storehouse_id = bs.storehouse_id
+        LEFT JOIN basic_warehouse bw ON ci.warehouse_id = bw.warehouse_id
+        LEFT JOIN (
+            SELECT
+                SUM(lcIn.actual_loss_quantity) actual_loss_quantity,
+                YEAR (lcIn.outbound_time) `year`,
+                MONTH (lcIn.outbound_time) `month`
+            FROM
+                business_gslr_loss_collect lcIn
+            GROUP BY
+                YEAR (lcIn.outbound_time),
+                MONTH (lcIn.outbound_time)
+        ) lc ON YEAR (ci.createdate) = lc. YEAR
+        AND MONTH (ci.createdate) = lc. MONTH
+        LEFT JOIN (
+            SELECT
+                cdIn.htbh,
+                cdIn2.klhjz,
+                cdIn2.sjhwh,
+                cdIn2.xldd,
+                cdIn.djsj,
+                YEAR (cdIn.djsj) `year`,
+                MONTH (cdIn.djsj) `month`
+            FROM
+                data_crkyw_ckrmdj_default cdIn
+            LEFT JOIN data_crkyw_ckcmz_default cdIn2 ON cdIn.BizNo = cdIn2.BizNo
+            GROUP BY
+                YEAR (cdIn.djsj),
+                MONTH (cdIn.djsj)
+        ) cd ON YEAR (ci.createdate) = cd. YEAR
+        AND MONTH (ci.createdate) = cd. MONTH
+        LEFT JOIN (
+            SELECT
+                SUM(saIn.expenditure_quantity) expenditure_quantity,
+                YEAR (saIn.statistical_date) `year`,
+                MONTH (saIn.statistical_date) `month`
+            FROM
+                business_fs_statistical_account saIn
+            LEFT JOIN business_contract bcIn ON saIn.contract_id = bcIn.id
+            GROUP BY
+                YEAR (saIn.statistical_date),
+                MONTH (saIn.statistical_date)
+        ) sa ON YEAR (ci.createdate) = sa. YEAR
+        AND MONTH (ci.createdate) = sa. MONTH
+        WHERE
+            bc.contract_number = #{contractNumber}
+    </select>
+    <select id="getOutStorageDetailed" parameterType="string" resultType="com.chinaitop.depot.intelligent.priceApproval.model.DataCPZ">
+        SELECT
+            cdIn.htbh,
+            cdIn2.sjckchmc storehouseName,
+            cdIn2.sjhwhmc warehouseName,
+            cdIn.cph,
+            cdIn2.mz mzzl,
+            cdIn3.pz,
+            cdIn2.klhjz bzwkl,
+            cdIn.djsj cpzsj
+        FROM
+            data_crkyw_ckrmdj_default cdIn
+        LEFT JOIN data_crkyw_ckcmz_default cdIn2 ON cdIn.BizNo = cdIn2.BizNo
+        LEFT JOIN data_crkyw_ckcpz_default cdIn3 ON cdIn.BizNo = cdIn3.BizNo
+        WHERE
+            cdIn.htbh = #{contractNumber}
+    </select>
+    <select id="getSettlementInfo" parameterType="string" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueSettle">
+        SELECT
+            oc.id fsOutConfirmId,
+            oi.org_name orgName,
+            (
+                oc.total_settle_quantity / 1000
+            ) provinceTotalSettleQuantity,
+            oc.total_settle_amount provinceTotalSettleAmount,
+            oc.loan_return_time loanReturnTime,
+            oc.loan_recovery_unit provinceLoanRecoveryUnit,
+            oc.loan_recovery_quantity provinceLoanRecoveryQuantity,
+            oc.loan_recovery_amount provinceLoanRecoveryAmount,
+            oc.invoice_unit provinceInvoiceUnit,
+            oc.invoice_quantity provinceInvoiceQuantity,
+            oc.invoice_unit_price provinceInvoiceUnitPrice,
+            oc.invoice_amount provinceInvoiceAmount,
+            oc.loan_return_time provinceLoanReturnTime,
+            oc.loan_return_amount provinceLoanReturnAmount
+        FROM
+            business_fs_out_confirm oc
+        LEFT JOIN business_contract bc ON bc.id = oc.contract_id
+        LEFT JOIN org_info oi ON oc.org_id = oi.org_id
+        WHERE
+            bc.contract_number = #{contractNumber}
+    </select>
+    <select id="getDiffPriceInfo" parameterType="string" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueDiffPrice">
+        SELECT
+            dpi.project_type projectType,
+            IFNULL(dpi.quantity,0) totalQuantity,
+	        IFNULL(dpi.amount,0) totalAmount
+        FROM
+            business_fs_out_confirm_diff_price_item dpi
+        LEFT JOIN business_fs_out_confirm oc ON dpi.fs_out_confirm_id = oc.id
+        LEFT JOIN business_contract bc ON bc.id = oc.contract_id
+        WHERE
+            bc.contract_number = #{contractNumber}
+    </select>
+    <select id="getCardInfo" parameterType="map" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueApprovalPrice">
+        SELECT
+            sc.id grainSituationCardId,
+            bs.storehouse_name storehouseName,
+            bw.warehouse_name warehouseName,
+            sc.lssl,
+            sc.in_financial_verification inNinancialVerification,
+            (
+                sc.in_financial_verification * sc.lssl
+            ) storageAmount
+        FROM
+            grain_situation_card sc
+        LEFT JOIN basic_storehouse bs ON bs.storehouse_id = sc.basic_storehouse_id
+        LEFT JOIN basic_warehouse bw ON sc.warehouse_id = bw.warehouse_id
+        WHERE
+            sc.fill_org_id = #{orgId}
+        AND sc.basic_storehouse_id = #{basicStorehouseId}
+        AND sc.warehouse_id = #{warehouseId}
+        ORDER BY
+            sc.createdate
+        LIMIT 1
+    </select>
+    <select id="getConsistenceAccountDetailsInfo" parameterType="integer" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueThreeConsistenceAccount">
+        SELECT
+            tcc.id,
+            tcc. YEAR,
+            tcc. MONTH,
+            tcc.accounting_quantity accountingQuantity,
+            tcc.accounting_amount accountingAmount
+        FROM
+            business_fs_sale_revenue_three_consistence_account tcc
+        LEFT JOIN business_fs_sale_revenue sr ON sr.id = tcc.fs_sale_revenue_id
+        WHERE
+            tcc.fs_sale_revenue_id = #{id}
+    </select>
+    <select id="getQualityDetailsInfo" parameterType="integer" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueInspectionLoss">
+        SELECT
+            il.id,
+            il.qc_quality_inspection_id_out,
+            il.qc_quality_inspection_id_in,
+            bs.storehouse_name storehouseName,
+            bw.warehouse_name warehouseName,
+            t1.zzIn,
+            t1.sfIn,
+            t2.zzOut,
+            t2.sfOut,
+            il.gslr_loss_collect_id gslrLossCollectId,
+            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_fs_sale_revenue_inspection_loss il
+        LEFT JOIN business_gslr_loss_collect lc ON lc.id = il.gslr_loss_collect_id
+        LEFT JOIN basic_storehouse bs ON lc.basic_storehouse_id = bs.storehouse_id
+        LEFT JOIN basic_warehouse bw ON lc.warehouse_id = bw.warehouse_id
+        LEFT JOIN
+        (
+        SELECT
+            qi.id,
+            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_fs_sale_revenue_inspection_loss il
+        LEFT JOIN business_qc_quality_inspection qi ON il.qc_quality_inspection_id_out = qi.id
+        LEFT JOIN business_qc_quality_inspection_item qii ON qi.id = qii.qc_quality_inspection_id
+        ) t1 ON il.qc_quality_inspection_id_in = t1.id
+        LEFT JOIN
+        (
+        SELECT
+            qi.id,
+            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_fs_sale_revenue_inspection_loss il
+        LEFT JOIN business_qc_quality_inspection qi ON il.qc_quality_inspection_id_out = qi.id
+        LEFT JOIN business_qc_quality_inspection_item qii ON qi.id = qii.qc_quality_inspection_id
+        ) t2 ON il.qc_quality_inspection_id_out = t2.id
+        WHERE
+            il.fs_sale_revenue_id = #{id}
+    </select>
+    <select id="getOutStorageDetailsInfo" parameterType="integer" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueThreeConsistence">
+        SELECT
+            tc.id,
+            tc.`year`,
+            tc.`month`,
+            tc.basic_storehouse_id,
+            tc.warehouse_id,
+            bs.storehouse_name storehouseName,
+            bw.warehouse_name warehouseName,
+            tc.loss,
+            tc.custody_account_quantity,
+            tc.statistical_account_quantity,
+            tc.complete_time
+        FROM
+            business_fs_sale_revenue_three_consistence tc
+        LEFT JOIN basic_storehouse bs ON tc.basic_storehouse_id = bs.storehouse_id
+        LEFT JOIN basic_warehouse bw ON tc.warehouse_id = bw.warehouse_id
+        WHERE
+            tc.fs_sale_revenue_id = #{id}
+    </select>
+    <select id="getSettlementDetailsInfo" parameterType="integer" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueSettle">
+        SELECT
+            rs.id,
+            rs.province_acceptance_unit,
+            rs.province_total_settle_quantity,
+            rs.province_total_settle_amount,
+            rs.province_loan_return_time loanReturnTime,
+            rs.province_loan_recovery_unit provinceLoanRecoveryUnit,
+            rs.province_loan_recovery_quantity provinceLoanRecoveryQuantity,
+            rs.province_loan_recovery_amount provinceLoanRecoveryAmount,
+            rs.province_invoice_unit provinceInvoiceUnit,
+            rs.province_invoice_quantity provinceInvoiceQuantity,
+            rs.province_invoice_unit_price provinceInvoiceUnitPrice,
+            rs.province_invoice_amount provinceInvoiceAmount,
+            rs.province_loan_return_time provinceLoanReturnTime,
+            rs.province_loan_return_amount provinceLoanReturnAmount
+        FROM
+            business_fs_sale_revenue_settle rs
+        WHERE
+            rs.fs_sale_revenue_id = #{id}
+    </select>
+    <select id="getCardDetailsInfo" parameterType="integer" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueApprovalPrice">
+        SELECT
+            ap.id,
+            sc.basic_storehouse_id storehouseId,
+            bs.storehouse_name storehouseName,
+            sc.warehouse_id warehouseId,
+            bw.warehouse_name warehouseName,
+            sc.lssl,
+            sc.in_financial_verification inNinancialVerification,
+            ap.storage_amount storageAmount,
+            ap.document_number,
+            ap.document_upload
+        FROM
+            business_fs_sale_revenue_approval_price ap
+        LEFT JOIN grain_situation_card sc ON ap.grain_situation_card_id = sc.id
+        LEFT JOIN basic_storehouse bs ON sc.basic_storehouse_id = bs.storehouse_id
+        LEFT JOIN basic_warehouse bw ON sc.warehouse_id = bw.warehouse_id
+        WHERE
+            ap.fs_sale_revenue_id = #{id}
+    </select>
+    <select id="getDiffPriceDetailsInfo" parameterType="integer" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueDiffPrice">
+        SELECT
+            dp.id,
+            dp.project_type projectType,
+            dp.total_quantity totalQuantity,
+            dp.total_amount totalAmount
+        FROM
+            business_fs_sale_revenue_diff_price dp
+        WHERE
+            dp.fs_sale_revenue_id = #{id}
+    </select>
+    <select id="selectPageList" parameterType="com.baomidou.mybatisplus.core.conditions.Wrapper" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenue">
+        SELECT
+            sr.id,
+            bc.contract_number contractNumber,
+            bc.grain_quantity grainQuantity,
+            bc.money_quantity moneyQuantity,
+            bc.performance_quantity performanceQuantity,
+            sr.createdate,
+            sr.`status`
+        FROM
+            business_fs_sale_revenue sr
+        LEFT JOIN business_contract bc ON sr.contract_id = bc.id
+        ${ew.customSqlSegment}
+    </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/BusinessFsSaleRevenueThreeConsistenceAccountMapper.xml

@@ -0,0 +1,26 @@
+<?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.BusinessFsSaleRevenueThreeConsistenceAccountMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueThreeConsistenceAccount">
+        <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="accounting_quantity" property="accountingQuantity" />
+        <result column="province_accounting_quantity" property="provinceAccountingQuantity" />
+        <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, accounting_quantity, province_accounting_quantity, accounting_amount, province_accounting_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>