提交出库验收确认

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/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,6 @@ 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.param.*;
 import com.chinaitop.depot.intelligent.financialSupervision.service.BusinessFsInConfirmService;
 import com.chinaitop.depot.intelligent.financialSupervision.vo.BusinessFsInConfirmDetailVO;

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

@@ -3,7 +3,6 @@ package com.chinaitop.depot.intelligent.financialSupervision.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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;

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

@@ -12,7 +12,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;
@@ -102,7 +101,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 +130,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,396 @@
+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<BusinessStoreWareDetailVO> storeWareDetailVOList = new ArrayList<>();
+
+        if (CollectionUtil.isNotEmpty(storeWareDetailList)) {
+            for (BusinessStoreWareDetail businessStoreWareDetail : storeWareDetailList) {
+                BusinessStoreWareDetailVO storeWareDetailVO = new BusinessStoreWareDetailVO();
+
+                //获取仓房
+                BasicEnum houseInfo = basicEnumMapper.selectById(businessStoreWareDetail.getHouseId());
+                if (ObjectUtils.isNotEmpty(houseInfo)) {
+                    storeWareDetailVO.setHouseId(businessStoreWareDetail.getHouseId());
+                    storeWareDetailVO.setHouseName(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.setGrainKind(businessStoreWareDetail.getGrainKind());
+                    storeWareDetailVO.setGrainKindName(grainKind.getEnumname());
+                }
+                //获取性质
+                BasicEnum grainAttribute = basicEnumMapper.selectById(businessStoreWareDetail.getGrainAttribute());
+                if (ObjectUtils.isNotEmpty(grainAttribute)) {
+                    storeWareDetailVO.setGrainAttribute(businessStoreWareDetail.getGrainAttribute());
+                    storeWareDetailVO.setGrainAttributeName(grainAttribute.getEnumname());
+                }
+
+                //销售合同使用轮出价格，数量和总价
+                storeWareDetailVO.setInPrice(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.setInCount("0.0");
+                    storeWareDetailVOList.add(storeWareDetailVO);
+                } else {
+                    storeWareDetailVO.setInCount(Double.toString(num));
+                    storeWareDetailVOList.add(storeWareDetailVO);
+                }
+            }
+        }
+
+
+        List<BusinessStoreWareDetailVO> list = new ArrayList<>();
+
+        //通过仓房，货位，品种，性质进行汇总
+        Map<String, List<BusinessStoreWareDetailVO>> collect =
+                storeWareDetailVOList.stream().collect(Collectors.groupingBy(this::fetchGroupKey));
+
+
+        Set<Map.Entry<String, List<BusinessStoreWareDetailVO>>> entries = collect.entrySet();
+
+        for (Map.Entry<String, List<BusinessStoreWareDetailVO>> entry : entries) {
+            int sum = 0;
+            List<BusinessStoreWareDetailVO> value = entry.getValue();
+            List<String> collect1 = value.stream().map(BusinessStoreWareDetailVO::getInCount).collect(Collectors.toList());
+            for (String s : collect1) {
+                sum += Double.parseDouble(s);
+            }
+            BusinessStoreWareDetailVO storeWareDetailVO = value.get(0);
+            storeWareDetailVO.setInCount(String.valueOf(sum));
+            list.add(storeWareDetailVO);
+        }
+
+
+        vo.setStoreWareDetailVOList(list);
+
+        return vo;
+
+
+    }
+
+
+    private String fetchGroupKey(BusinessStoreWareDetailVO vo) {
+        return vo.getHouseId() + "_" + vo.getWarehouseId() + "_" + vo.getGrainKind() + "_" + vo.getGrainAttribute();
+    }
+
+    /**
+     * 出库验收确认详情
+     *
+     * @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<BusinessStoreWareDetailVO> listVO = new ArrayList<>();
+        if (CollectionUtil.isNotEmpty(businessFsOutConfirmContractItemList)) {
+            for (BusinessFsOutConfirmContractItem businessFsOutConfirmContractItem : businessFsOutConfirmContractItemList) {
+
+                BusinessStoreWareDetailVO storeWareDetailVO = new BusinessStoreWareDetailVO();
+                storeWareDetailVO.setInCount(String.valueOf(businessFsOutConfirmContractItem.getSettleQuantity()));
+                storeWareDetailVO.setInPrice(String.valueOf(businessFsOutConfirmContractItem.getSettlePrice()));
+                storeWareDetailVO.setInDetailTotalPrice(String.valueOf(businessFsOutConfirmContractItem.getSettleAmount()));
+
+                //设置仓房货位品种性质
+                BasicStorehouse basicStorehouse = basicStorehouseMapper.selectById(businessFsOutConfirmContractItem.getBasicStorehouseId());
+                if (ObjectUtils.isNotEmpty(basicStorehouse)) {
+                    storeWareDetailVO.setHouseId(businessFsOutConfirmContractItem.getBasicStorehouseId());
+                    storeWareDetailVO.setHouseName(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.setGrainKindName(grainVariety.getEnumname());
+                    storeWareDetailVO.setGrainKind(businessFsOutConfirmContractItem.getGrainVarietyId());
+                }
+                BasicEnum grainNature = basicEnumMapper.selectById(businessFsOutConfirmContractItem.getGrainNatureId());
+                if (ObjectUtils.isNotEmpty(grainNature)) {
+                    storeWareDetailVO.setGrainAttribute(businessFsOutConfirmContractItem.getGrainNatureId());
+                    storeWareDetailVO.setGrainAttributeName(grainNature.getEnumname());
+                }
+                listVO.add(storeWareDetailVO);
+
+            }
+        }
+        vo.setStoreWareDetailVOList(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<BusinessStoreWareDetailVO> storeWareDetailVOList;
+
+
+    @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/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<BusinessStoreWareDetailVO> storeWareDetailVOList;
+}

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 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>
+
+        order by t1.createdate desc
+
+    </select>
+
+    <select id="selectOutboundConfirmationNumber" resultType="java.lang.String">
+        select outbound_confirmation_number from business_fs_out_confirm order by createdate limit 1
+    </select>
+
+</mapper>