销售收入上缴-初始化

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/controller/FsSaleRevenueController.java

@@ -41,7 +41,7 @@ import javax.validation.constraints.NotEmpty;
  * 销售收入上缴控制器
  *
  * @author QSHan
- * @date  2024/07/26 16:30
+ * @date  2024/07/29 14:04
  */
 @Api(tags = "销售收入上缴控制器")
 @ApiSupport(author = "UNIS_TEAM", order = 1)
@@ -56,7 +56,7 @@ public class FsSaleRevenueController {
      * 获取销售收入上缴分页
      *
      * @author QSHan
-     * @date  2024/07/26 16:30
+     * @date  2024/07/29 14:04
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取销售收入上缴分页")
@@ -67,26 +67,10 @@ public class FsSaleRevenueController {
     }
 
     /**
-     * 添加销售收入上缴
-     *
-     * @author QSHan
-     * @date  2024/07/26 16:30
-     */
-    @ApiOperationSupport(order = 2)
-    @ApiOperation("添加销售收入上缴")
-    @CommonLog("添加销售收入上缴")
-    @SaCheckPermission("/financialSupervision/fsSaleRevenue/add")
-    @PostMapping("/financialSupervision/fsSaleRevenue/add")
-    public CommonResult<String> add(@RequestBody @Valid FsSaleRevenueAddParam fsSaleRevenueAddParam) {
-        fsSaleRevenueService.add(fsSaleRevenueAddParam);
-        return CommonResult.ok();
-    }
-
-    /**
      * 编辑销售收入上缴
      *
      * @author QSHan
-     * @date  2024/07/26 16:30
+     * @date  2024/07/29 14:04
      */
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑销售收入上缴")
@@ -102,7 +86,7 @@ public class FsSaleRevenueController {
      * 删除销售收入上缴
      *
      * @author QSHan
-     * @date  2024/07/26 16:30
+     * @date  2024/07/29 14:04
      */
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除销售收入上缴")
@@ -119,7 +103,7 @@ public class FsSaleRevenueController {
      * 获取销售收入上缴详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:30
+     * @date  2024/07/29 14:04
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取销售收入上缴详情")

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/entity/BusinessContractDetail.java

@@ -0,0 +1,37 @@
+package com.unis.financialSupervision.modular.fsSaleRevenue.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-07-04 10:39
+ */
+@Data
+public class BusinessContractDetail {
+
+    @ApiModelProperty(value = "主键ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "仓房名称(销售收入上缴)")
+    private String houseName;
+
+    @ApiModelProperty(value = "货位名称(销售收入上缴)")
+    private String warehouseName;
+
+    @ApiModelProperty(value = "粮油品种编码")
+    private String grainKind;
+
+    @ApiModelProperty(value = "粮油品种名称")
+    private String grainKindName;
+
+    @ApiModelProperty(value = "数量")
+    private String inCount;
+
+    @ApiModelProperty(value = "单价")
+    private String inPrice;
+
+    @ApiModelProperty(value = "金额")
+    private String inDetailTotalPrice;
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/entity/FsSaleRevenue.java

@@ -13,21 +13,129 @@
 package com.unis.financialSupervision.modular.fsSaleRevenue.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.unis.financialSupervision.modular.fsSaleRevenueApprovalPrice.entity.FsSaleRevenueApprovalPrice;
+import com.unis.financialSupervision.modular.fsSaleRevenueDiffPrice.entity.FsSaleRevenueDiffPrice;
+import com.unis.financialSupervision.modular.fsSaleRevenueInspectionLoss.entity.FsSaleRevenueInspectionLoss;
+import com.unis.financialSupervision.modular.fsSaleRevenueSettle.entity.FsSaleRevenueSettle;
+import com.unis.financialSupervision.modular.fsSaleRevenueThreeConsistence.entity.FsSaleRevenueThreeConsistence;
+import com.unis.financialSupervision.modular.fsSaleRevenueThreeConsistenceAccount.entity.FsSaleRevenueThreeConsistenceAccount;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 销售收入上缴实体
  *
  * @author QSHan
- * @date  2024/07/26 16:30
+ * @date  2024/07/29 14:04
  **/
 @Getter
 @Setter
 @TableName("business_fs_sale_revenue")
 public class FsSaleRevenue {
 
+    /** 主键ID */
+    @TableId
+    @ApiModelProperty(value = "主键ID", position = 1)
+    private Integer id;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期(核定时间)", position = 5)
+    private Date updatedate;
+
+    /** 上报库区；org_info的id； */
+    @ApiModelProperty(value = "上报库区；org_info的id；", position = 6)
+    private Integer orgId;
+
+    /** 上报时间 */
+    @ApiModelProperty(value = "上报时间", position = 7)
+    private Date reportTime;
+
+    /** 计划类型 */
+    @ApiModelProperty(value = "计划类型", position = 8)
+    private String planType;
+
+    /** 销往单位 */
+    @ApiModelProperty(value = "销往单位", position = 9)
+    private String salesUnit;
+
+    /** 合同编号；business_contract的ID； */
+    @ApiModelProperty(value = "合同编号；business_contract的ID；", position = 10)
+    private Integer contractId;
+
+    /** 问题跟踪反馈 */
+    @ApiModelProperty(value = "问题跟踪反馈", position = 11)
+    private String problemFeedback;
+
+    /** 状态 0：保存；1：库级系统-上报；2：已核定；3：省级平台-上报； */
+    @ApiModelProperty(value = "状态 0：保存；1：库级系统-上报；2：已核定；3：省级平台-上报；", position = 12)
+    private Integer status;
+
+    // 只展示不保存
+    @ApiModelProperty(value = "合同信息")
+    @TableField(exist = false)
+    private List<BusinessContractDetail> contractDetails;
+
+    @ApiModelProperty(value = "质检损益信息")
+    @TableField(exist = false)
+    private List<FsSaleRevenueInspectionLoss> inspectionLossList;
+
+    @ApiModelProperty(value = "三账一致性-会计账")
+    @TableField(exist = false)
+    private List<FsSaleRevenueThreeConsistenceAccount> threeConsistenceAccountList;
+
+    @ApiModelProperty(value = "三账一致性-实际出库情况")
+    @TableField(exist = false)
+    private List<FsSaleRevenueThreeConsistence> threeConsistenceList;
+
+    @ApiModelProperty(value = "结算信息")
+    @TableField(exist = false)
+    private List<FsSaleRevenueSettle> revenueSettleList;
+
+    @ApiModelProperty(value = "原核定入库价格")
+    @TableField(exist = false)
+    private List<FsSaleRevenueApprovalPrice> approvalPriceList;
+
+    @ApiModelProperty(value = "差额上缴")
+    @TableField(exist = false)
+    private List<FsSaleRevenueDiffPrice> 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;*/
+
+    @ApiModelProperty(value = "企业名称")
+    @TableField(exist = false)
+    private String dwmc;
+
+    @ApiModelProperty(value = "库区名称")
+    @TableField(exist = false)
+    private String orgName;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/enums/FsSaleRevenueEnum.java

@@ -18,7 +18,7 @@ import lombok.Getter;
  * 销售收入上缴枚举
  *
  * @author QSHan
- * @date  2024/07/26 16:30
+ * @date  2024/07/29 14:04
  **/
 @Getter
 public enum FsSaleRevenueEnum {

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/mapper/FsSaleRevenueMapper.java

@@ -12,14 +12,18 @@
  */
 package com.unis.financialSupervision.modular.fsSaleRevenue.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.unis.financialSupervision.modular.fsSaleRevenue.entity.FsSaleRevenue;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 销售收入上缴Mapper接口
  *
  * @author QSHan
- * @date  2024/07/26 16:30
+ * @date 2024/07/29 14:04
  **/
 public interface FsSaleRevenueMapper extends BaseMapper<FsSaleRevenue> {
+    Page<FsSaleRevenue> pageList(Page<Object> objectPage, @Param("ew") QueryWrapper<FsSaleRevenue> queryWrapper);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/mapper/mapping/FsSaleRevenueMapper.xml

@@ -1,5 +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.unis.financialSupervision.modular.fsSaleRevenue.mapper.FsSaleRevenueMapper">
-
+    <select id="pageList" parameterType="com.baomidou.mybatisplus.core.conditions.Wrapper" resultType="com.unis.financialSupervision.modular.fsSaleRevenue.entity.FsSaleRevenue">
+        SELECT
+            sr.id,
+            ui.dwmc,
+            oi.org_name orgName,
+            bc.contract_number contractNumber,
+            bc.grain_quantity grainQuantity,
+            bc.money_quantity moneyQuantity,
+            bc.performance_quantity performanceQuantity,
+            sr.createdate,
+            sr.`status`,
+            sr.updatedate
+        FROM
+            depot_qh.business_fs_sale_revenue sr
+        LEFT JOIN depot_qh.business_contract bc ON sr.contract_id = bc.id
+        LEFT JOIN depot_qh.org_info oi ON sr.org_id = oi.org_id
+        LEFT JOIN biz_unit_info ui ON ui.id = oi.unit_info_id
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/param/FsSaleRevenueAddParam.java

@@ -25,10 +25,54 @@ import java.util.Date;
  * 销售收入上缴添加参数
  *
  * @author QSHan
- * @date  2024/07/26 16:30
+ * @date  2024/07/29 14:04
  **/
 @Getter
 @Setter
 public class FsSaleRevenueAddParam {
 
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** 上报库区；org_info的id； */
+    @ApiModelProperty(value = "上报库区；org_info的id；", position = 6)
+    private Integer orgId;
+
+    /** 上报时间 */
+    @ApiModelProperty(value = "上报时间", position = 7)
+    private Date reportTime;
+
+    /** 计划类型 */
+    @ApiModelProperty(value = "计划类型", position = 8)
+    private String planType;
+
+    /** 销往单位 */
+    @ApiModelProperty(value = "销往单位", position = 9)
+    private String salesUnit;
+
+    /** 合同编号；business_contract的ID； */
+    @ApiModelProperty(value = "合同编号；business_contract的ID；", position = 10)
+    private Integer contractId;
+
+    /** 问题跟踪反馈 */
+    @ApiModelProperty(value = "问题跟踪反馈", position = 11)
+    private String problemFeedback;
+
+    /** 状态 0：保存；1：库级系统-上报；2：已核定；3：省级平台-上报； */
+    @ApiModelProperty(value = "状态 0：保存；1：库级系统-上报；2：已核定；3：省级平台-上报；", position = 12)
+    private Integer status;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/param/FsSaleRevenueEditParam.java

@@ -25,10 +25,59 @@ import java.util.Date;
  * 销售收入上缴编辑参数
  *
  * @author QSHan
- * @date  2024/07/26 16:30
+ * @date  2024/07/29 14:04
  **/
 @Getter
 @Setter
 public class FsSaleRevenueEditParam {
 
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true, position = 1)
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** 上报库区；org_info的id； */
+    @ApiModelProperty(value = "上报库区；org_info的id；", position = 6)
+    private Integer orgId;
+
+    /** 上报时间 */
+    @ApiModelProperty(value = "上报时间", position = 7)
+    private Date reportTime;
+
+    /** 计划类型 */
+    @ApiModelProperty(value = "计划类型", position = 8)
+    private String planType;
+
+    /** 销往单位 */
+    @ApiModelProperty(value = "销往单位", position = 9)
+    private String salesUnit;
+
+    /** 合同编号；business_contract的ID； */
+    @ApiModelProperty(value = "合同编号；business_contract的ID；", position = 10)
+    private Integer contractId;
+
+    /** 问题跟踪反馈 */
+    @ApiModelProperty(value = "问题跟踪反馈", position = 11)
+    private String problemFeedback;
+
+    /** 状态 0：保存；1：库级系统-上报；2：已核定；3：省级平台-上报； */
+    @ApiModelProperty(value = "状态 0：保存；1：库级系统-上报；2：已核定；3：省级平台-上报；", position = 12)
+    private Integer status;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/param/FsSaleRevenueIdParam.java

@@ -22,14 +22,14 @@ import javax.validation.constraints.NotBlank;
  * 销售收入上缴Id参数
  *
  * @author QSHan
- * @date  2024/07/26 16:30
+ * @date  2024/07/29 14:04
  **/
 @Getter
 @Setter
 public class FsSaleRevenueIdParam {
 
-    /** id */
-    @ApiModelProperty(value = "id", required = true)
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true)
     @NotBlank(message = "id不能为空")
-    private String id;
+    private Integer id;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/param/FsSaleRevenuePageParam.java

@@ -22,7 +22,7 @@ import java.util.Date;
  * 销售收入上缴查询参数
  *
  * @author QSHan
- * @date  2024/07/26 16:30
+ * @date  2024/07/29 14:04
  **/
 @Getter
 @Setter
@@ -45,7 +45,9 @@ public class FsSaleRevenuePageParam {
     private String sortOrder;
 
     /** 关键词 */
-    @ApiModelProperty(value = "关键词")
-    private String searchKey;
+    @ApiModelProperty(value = "企业名称")
+    private String dwmc;
 
+    @ApiModelProperty(value = "库区名称")
+    private String orgName;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/service/FsSaleRevenueService.java

@@ -26,7 +26,7 @@ import java.util.List;
  * 销售收入上缴Service接口
  *
  * @author QSHan
- * @date  2024/07/26 16:30
+ * @date  2024/07/29 14:04
  **/
 public interface FsSaleRevenueService extends IService<FsSaleRevenue> {
 
@@ -34,23 +34,15 @@ public interface FsSaleRevenueService extends IService<FsSaleRevenue> {
      * 获取销售收入上缴分页
      *
      * @author QSHan
-     * @date  2024/07/26 16:30
+     * @date  2024/07/29 14:04
      */
     Page<FsSaleRevenue> page(FsSaleRevenuePageParam fsSaleRevenuePageParam);
 
     /**
-     * 添加销售收入上缴
-     *
-     * @author QSHan
-     * @date  2024/07/26 16:30
-     */
-    void add(FsSaleRevenueAddParam fsSaleRevenueAddParam);
-
-    /**
      * 编辑销售收入上缴
      *
      * @author QSHan
-     * @date  2024/07/26 16:30
+     * @date  2024/07/29 14:04
      */
     void edit(FsSaleRevenueEditParam fsSaleRevenueEditParam);
 
@@ -58,7 +50,7 @@ public interface FsSaleRevenueService extends IService<FsSaleRevenue> {
      * 删除销售收入上缴
      *
      * @author QSHan
-     * @date  2024/07/26 16:30
+     * @date  2024/07/29 14:04
      */
     void delete(List<FsSaleRevenueIdParam> fsSaleRevenueIdParamList);
 
@@ -66,7 +58,7 @@ public interface FsSaleRevenueService extends IService<FsSaleRevenue> {
      * 获取销售收入上缴详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:30
+     * @date  2024/07/29 14:04
      */
     FsSaleRevenue detail(FsSaleRevenueIdParam fsSaleRevenueIdParam);
 
@@ -74,7 +66,7 @@ public interface FsSaleRevenueService extends IService<FsSaleRevenue> {
      * 获取销售收入上缴详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:30
+     * @date  2024/07/29 14:04
      **/
-    FsSaleRevenue queryEntity(String id);
+    FsSaleRevenue queryEntity(Integer id);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/service/impl/FsSaleRevenueServiceImpl.java

@@ -17,6 +17,7 @@ import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -32,40 +33,45 @@ import com.unis.financialSupervision.modular.fsSaleRevenue.param.FsSaleRevenueId
 import com.unis.financialSupervision.modular.fsSaleRevenue.param.FsSaleRevenuePageParam;
 import com.unis.financialSupervision.modular.fsSaleRevenue.service.FsSaleRevenueService;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
  * 销售收入上缴Service接口实现类
  *
  * @author QSHan
- * @date  2024/07/26 16:30
+ * @date  2024/07/29 14:04
  **/
 @Service
 public class FsSaleRevenueServiceImpl extends ServiceImpl<FsSaleRevenueMapper, FsSaleRevenue> implements FsSaleRevenueService {
+    @Resource
+    private FsSaleRevenueMapper revenueMapper;
 
     @Override
     public Page<FsSaleRevenue> page(FsSaleRevenuePageParam fsSaleRevenuePageParam) {
         QueryWrapper<FsSaleRevenue> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ne("sr.`status`", 0);
+        if (StringUtils.isNotBlank(fsSaleRevenuePageParam.getDwmc())) {
+            queryWrapper.like("ui.dwmc", fsSaleRevenuePageParam.getDwmc());
+        }
+        if (StringUtils.isNotBlank(fsSaleRevenuePageParam.getOrgName())) {
+            queryWrapper.like("oi.org_name", fsSaleRevenuePageParam.getOrgName());
+        }
+
         if(ObjectUtil.isAllNotEmpty(fsSaleRevenuePageParam.getSortField(), fsSaleRevenuePageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(fsSaleRevenuePageParam.getSortOrder());
             queryWrapper.orderBy(true, fsSaleRevenuePageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(fsSaleRevenuePageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByAsc(FsSaleRevenue::getId);
+            queryWrapper.lambda().orderByDesc(FsSaleRevenue::getId);
         }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void add(FsSaleRevenueAddParam fsSaleRevenueAddParam) {
-        FsSaleRevenue fsSaleRevenue = BeanUtil.toBean(fsSaleRevenueAddParam, FsSaleRevenue.class);
-        this.save(fsSaleRevenue);
+        return revenueMapper.pageList(CommonPageRequest.defaultPage(), queryWrapper);
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(FsSaleRevenueEditParam fsSaleRevenueEditParam) {
+        FsSaleRevenue fsSaleRevenue = this.queryEntity(fsSaleRevenueEditParam.getId());
         BeanUtil.copyProperties(fsSaleRevenueEditParam, fsSaleRevenue);
         this.updateById(fsSaleRevenue);
     }
@@ -74,14 +80,16 @@ public class FsSaleRevenueServiceImpl extends ServiceImpl<FsSaleRevenueMapper, F
     @Override
     public void delete(List<FsSaleRevenueIdParam> fsSaleRevenueIdParamList) {
         // 执行删除
+        this.removeByIds(CollStreamUtil.toList(fsSaleRevenueIdParamList, FsSaleRevenueIdParam::getId));
     }
 
     @Override
     public FsSaleRevenue detail(FsSaleRevenueIdParam fsSaleRevenueIdParam) {
+        return this.queryEntity(fsSaleRevenueIdParam.getId());
     }
 
     @Override
-    public FsSaleRevenue queryEntity(String id) {
+    public FsSaleRevenue queryEntity(Integer id) {
         FsSaleRevenue fsSaleRevenue = this.getById(id);
         if(ObjectUtil.isEmpty(fsSaleRevenue)) {
             throw new CommonException("销售收入上缴不存在，id值为：{}", id);

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueApprovalPrice/controller/FsSaleRevenueApprovalPriceController.java

@@ -9,7 +9,8 @@
  * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
- */
+ *//*
+
 package com.unis.financialSupervision.modular.fsSaleRevenueApprovalPrice.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -37,12 +38,14 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 
+*/
 /**
  * 销售收入上缴-原核定入库价格控制器
  *
  * @author QSHan
- * @date  2024/07/26 16:49
- */
+ * @date  2024/07/29 15:26
+ *//*
+
 @Api(tags = "销售收入上缴-原核定入库价格控制器")
 @ApiSupport(author = "UNIS_TEAM", order = 1)
 @RestController
@@ -52,12 +55,14 @@ public class FsSaleRevenueApprovalPriceController {
     @Resource
     private FsSaleRevenueApprovalPriceService fsSaleRevenueApprovalPriceService;
 
-    /**
+    */
+/**
      * 获取销售收入上缴-原核定入库价格分页
      *
      * @author QSHan
-     * @date  2024/07/26 16:49
-     */
+     * @date  2024/07/29 15:26
+     *//*
+
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取销售收入上缴-原核定入库价格分页")
     @SaCheckPermission("/financialSupervision/fsSaleRevenueApprovalPrice/page")
@@ -66,12 +71,14 @@ public class FsSaleRevenueApprovalPriceController {
         return CommonResult.data(fsSaleRevenueApprovalPriceService.page(fsSaleRevenueApprovalPricePageParam));
     }
 
-    /**
+    */
+/**
      * 添加销售收入上缴-原核定入库价格
      *
      * @author QSHan
-     * @date  2024/07/26 16:49
-     */
+     * @date  2024/07/29 15:26
+     *//*
+
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加销售收入上缴-原核定入库价格")
     @CommonLog("添加销售收入上缴-原核定入库价格")
@@ -82,12 +89,14 @@ public class FsSaleRevenueApprovalPriceController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 编辑销售收入上缴-原核定入库价格
      *
      * @author QSHan
-     * @date  2024/07/26 16:49
-     */
+     * @date  2024/07/29 15:26
+     *//*
+
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑销售收入上缴-原核定入库价格")
     @CommonLog("编辑销售收入上缴-原核定入库价格")
@@ -98,12 +107,14 @@ public class FsSaleRevenueApprovalPriceController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 删除销售收入上缴-原核定入库价格
      *
      * @author QSHan
-     * @date  2024/07/26 16:49
-     */
+     * @date  2024/07/29 15:26
+     *//*
+
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除销售收入上缴-原核定入库价格")
     @CommonLog("删除销售收入上缴-原核定入库价格")
@@ -115,12 +126,14 @@ public class FsSaleRevenueApprovalPriceController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 获取销售收入上缴-原核定入库价格详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:49
-     */
+     * @date  2024/07/29 15:26
+     *//*
+
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取销售收入上缴-原核定入库价格详情")
     @SaCheckPermission("/financialSupervision/fsSaleRevenueApprovalPrice/detail")
@@ -129,3 +142,4 @@ public class FsSaleRevenueApprovalPriceController {
         return CommonResult.data(fsSaleRevenueApprovalPriceService.detail(fsSaleRevenueApprovalPriceIdParam));
     }
 }
+*/

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueApprovalPrice/entity/FsSaleRevenueApprovalPrice.java

@@ -23,11 +23,75 @@ import java.util.Date;
  * 销售收入上缴-原核定入库价格实体
  *
  * @author QSHan
- * @date  2024/07/26 16:49
+ * @date  2024/07/29 15:26
  **/
 @Getter
 @Setter
 @TableName("business_fs_sale_revenue_approval_price")
 public class FsSaleRevenueApprovalPrice {
 
+    /** 主键ID */
+    @TableId
+    @ApiModelProperty(value = "主键ID", position = 1)
+    private Integer id;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID； */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID；", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** 原粮专卡ID；grain_situation_card的ID； */
+    @ApiModelProperty(value = "原粮专卡ID；grain_situation_card的ID；", position = 7)
+    private Integer grainSituationCardId;
+
+    /** 入库金额 */
+    @ApiModelProperty(value = "入库金额", position = 8)
+    private BigDecimal storageAmount;
+
+    /** 文件号 */
+    @ApiModelProperty(value = "文件号", position = 9)
+    private String documentNumber;
+
+    /** 文档上传 */
+    @ApiModelProperty(value = "文档上传", position = 10)
+    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;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueApprovalPrice/enums/FsSaleRevenueApprovalPriceEnum.java

@@ -18,7 +18,7 @@ import lombok.Getter;
  * 销售收入上缴-原核定入库价格枚举
  *
  * @author QSHan
- * @date  2024/07/26 16:49
+ * @date  2024/07/29 15:26
  **/
 @Getter
 public enum FsSaleRevenueApprovalPriceEnum {

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueApprovalPrice/mapper/FsSaleRevenueApprovalPriceMapper.java

@@ -19,7 +19,7 @@ import com.unis.financialSupervision.modular.fsSaleRevenueApprovalPrice.entity.F
  * 销售收入上缴-原核定入库价格Mapper接口
  *
  * @author QSHan
- * @date  2024/07/26 16:49
+ * @date  2024/07/29 15:26
  **/
 public interface FsSaleRevenueApprovalPriceMapper extends BaseMapper<FsSaleRevenueApprovalPrice> {
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueApprovalPrice/param/FsSaleRevenueApprovalPriceAddParam.java

@@ -25,10 +25,46 @@ import java.util.Date;
  * 销售收入上缴-原核定入库价格添加参数
  *
  * @author QSHan
- * @date  2024/07/26 16:49
+ * @date  2024/07/29 15:26
  **/
 @Getter
 @Setter
 public class FsSaleRevenueApprovalPriceAddParam {
 
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID； */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID；", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** 原粮专卡ID；grain_situation_card的ID； */
+    @ApiModelProperty(value = "原粮专卡ID；grain_situation_card的ID；", position = 7)
+    private Integer grainSituationCardId;
+
+    /** 入库金额 */
+    @ApiModelProperty(value = "入库金额", position = 8)
+    private BigDecimal storageAmount;
+
+    /** 文件号 */
+    @ApiModelProperty(value = "文件号", position = 9)
+    private String documentNumber;
+
+    /** 文档上传 */
+    @ApiModelProperty(value = "文档上传", position = 10)
+    private String documentUpload;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueApprovalPrice/param/FsSaleRevenueApprovalPriceEditParam.java

@@ -25,10 +25,51 @@ import java.util.Date;
  * 销售收入上缴-原核定入库价格编辑参数
  *
  * @author QSHan
- * @date  2024/07/26 16:49
+ * @date  2024/07/29 15:26
  **/
 @Getter
 @Setter
 public class FsSaleRevenueApprovalPriceEditParam {
 
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true, position = 1)
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID； */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID；", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** 原粮专卡ID；grain_situation_card的ID； */
+    @ApiModelProperty(value = "原粮专卡ID；grain_situation_card的ID；", position = 7)
+    private Integer grainSituationCardId;
+
+    /** 入库金额 */
+    @ApiModelProperty(value = "入库金额", position = 8)
+    private BigDecimal storageAmount;
+
+    /** 文件号 */
+    @ApiModelProperty(value = "文件号", position = 9)
+    private String documentNumber;
+
+    /** 文档上传 */
+    @ApiModelProperty(value = "文档上传", position = 10)
+    private String documentUpload;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueApprovalPrice/param/FsSaleRevenueApprovalPriceIdParam.java

@@ -22,14 +22,14 @@ import javax.validation.constraints.NotBlank;
  * 销售收入上缴-原核定入库价格Id参数
  *
  * @author QSHan
- * @date  2024/07/26 16:49
+ * @date  2024/07/29 15:26
  **/
 @Getter
 @Setter
 public class FsSaleRevenueApprovalPriceIdParam {
 
-    /** id */
-    @ApiModelProperty(value = "id", required = true)
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true)
     @NotBlank(message = "id不能为空")
-    private String id;
+    private Integer id;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueApprovalPrice/param/FsSaleRevenueApprovalPricePageParam.java

@@ -22,7 +22,7 @@ import java.util.Date;
  * 销售收入上缴-原核定入库价格查询参数
  *
  * @author QSHan
- * @date  2024/07/26 16:49
+ * @date  2024/07/29 15:26
  **/
 @Getter
 @Setter

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueApprovalPrice/service/FsSaleRevenueApprovalPriceService.java

@@ -26,7 +26,7 @@ import java.util.List;
  * 销售收入上缴-原核定入库价格Service接口
  *
  * @author QSHan
- * @date  2024/07/26 16:49
+ * @date  2024/07/29 15:26
  **/
 public interface FsSaleRevenueApprovalPriceService extends IService<FsSaleRevenueApprovalPrice> {
 
@@ -34,7 +34,7 @@ public interface FsSaleRevenueApprovalPriceService extends IService<FsSaleRevenu
      * 获取销售收入上缴-原核定入库价格分页
      *
      * @author QSHan
-     * @date  2024/07/26 16:49
+     * @date  2024/07/29 15:26
      */
     Page<FsSaleRevenueApprovalPrice> page(FsSaleRevenueApprovalPricePageParam fsSaleRevenueApprovalPricePageParam);
 
@@ -42,7 +42,7 @@ public interface FsSaleRevenueApprovalPriceService extends IService<FsSaleRevenu
      * 添加销售收入上缴-原核定入库价格
      *
      * @author QSHan
-     * @date  2024/07/26 16:49
+     * @date  2024/07/29 15:26
      */
     void add(FsSaleRevenueApprovalPriceAddParam fsSaleRevenueApprovalPriceAddParam);
 
@@ -50,7 +50,7 @@ public interface FsSaleRevenueApprovalPriceService extends IService<FsSaleRevenu
      * 编辑销售收入上缴-原核定入库价格
      *
      * @author QSHan
-     * @date  2024/07/26 16:49
+     * @date  2024/07/29 15:26
      */
     void edit(FsSaleRevenueApprovalPriceEditParam fsSaleRevenueApprovalPriceEditParam);
 
@@ -58,7 +58,7 @@ public interface FsSaleRevenueApprovalPriceService extends IService<FsSaleRevenu
      * 删除销售收入上缴-原核定入库价格
      *
      * @author QSHan
-     * @date  2024/07/26 16:49
+     * @date  2024/07/29 15:26
      */
     void delete(List<FsSaleRevenueApprovalPriceIdParam> fsSaleRevenueApprovalPriceIdParamList);
 
@@ -66,7 +66,7 @@ public interface FsSaleRevenueApprovalPriceService extends IService<FsSaleRevenu
      * 获取销售收入上缴-原核定入库价格详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:49
+     * @date  2024/07/29 15:26
      */
     FsSaleRevenueApprovalPrice detail(FsSaleRevenueApprovalPriceIdParam fsSaleRevenueApprovalPriceIdParam);
 
@@ -74,7 +74,7 @@ public interface FsSaleRevenueApprovalPriceService extends IService<FsSaleRevenu
      * 获取销售收入上缴-原核定入库价格详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:49
+     * @date  2024/07/29 15:26
      **/
-    FsSaleRevenueApprovalPrice queryEntity(String id);
+    FsSaleRevenueApprovalPrice queryEntity(Integer id);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueApprovalPrice/service/impl/FsSaleRevenueApprovalPriceServiceImpl.java

@@ -38,7 +38,7 @@ import java.util.List;
  * 销售收入上缴-原核定入库价格Service接口实现类
  *
  * @author QSHan
- * @date  2024/07/26 16:49
+ * @date  2024/07/29 15:26
  **/
 @Service
 public class FsSaleRevenueApprovalPriceServiceImpl extends ServiceImpl<FsSaleRevenueApprovalPriceMapper, FsSaleRevenueApprovalPrice> implements FsSaleRevenueApprovalPriceService {
@@ -66,6 +66,7 @@ public class FsSaleRevenueApprovalPriceServiceImpl extends ServiceImpl<FsSaleRev
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(FsSaleRevenueApprovalPriceEditParam fsSaleRevenueApprovalPriceEditParam) {
+        FsSaleRevenueApprovalPrice fsSaleRevenueApprovalPrice = this.queryEntity(fsSaleRevenueApprovalPriceEditParam.getId());
         BeanUtil.copyProperties(fsSaleRevenueApprovalPriceEditParam, fsSaleRevenueApprovalPrice);
         this.updateById(fsSaleRevenueApprovalPrice);
     }
@@ -74,14 +75,16 @@ public class FsSaleRevenueApprovalPriceServiceImpl extends ServiceImpl<FsSaleRev
     @Override
     public void delete(List<FsSaleRevenueApprovalPriceIdParam> fsSaleRevenueApprovalPriceIdParamList) {
         // 执行删除
+        this.removeByIds(CollStreamUtil.toList(fsSaleRevenueApprovalPriceIdParamList, FsSaleRevenueApprovalPriceIdParam::getId));
     }
 
     @Override
     public FsSaleRevenueApprovalPrice detail(FsSaleRevenueApprovalPriceIdParam fsSaleRevenueApprovalPriceIdParam) {
+        return this.queryEntity(fsSaleRevenueApprovalPriceIdParam.getId());
     }
 
     @Override
-    public FsSaleRevenueApprovalPrice queryEntity(String id) {
+    public FsSaleRevenueApprovalPrice queryEntity(Integer id) {
         FsSaleRevenueApprovalPrice fsSaleRevenueApprovalPrice = this.getById(id);
         if(ObjectUtil.isEmpty(fsSaleRevenueApprovalPrice)) {
             throw new CommonException("销售收入上缴-原核定入库价格不存在，id值为：{}", id);

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueDiffPrice/controller/FsSaleRevenueDiffPriceController.java

@@ -9,7 +9,8 @@
  * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
- */
+ *//*
+
 package com.unis.financialSupervision.modular.fsSaleRevenueDiffPrice.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -37,12 +38,14 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 
+*/
 /**
  * 销售收入上缴-差额上缴控制器
  *
  * @author QSHan
- * @date  2024/07/26 16:56
- */
+ * @date  2024/07/29 15:31
+ *//*
+
 @Api(tags = "销售收入上缴-差额上缴控制器")
 @ApiSupport(author = "UNIS_TEAM", order = 1)
 @RestController
@@ -52,12 +55,14 @@ public class FsSaleRevenueDiffPriceController {
     @Resource
     private FsSaleRevenueDiffPriceService fsSaleRevenueDiffPriceService;
 
-    /**
+    */
+/**
      * 获取销售收入上缴-差额上缴分页
      *
      * @author QSHan
-     * @date  2024/07/26 16:56
-     */
+     * @date  2024/07/29 15:31
+     *//*
+
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取销售收入上缴-差额上缴分页")
     @SaCheckPermission("/financialSupervision/fsSaleRevenueDiffPrice/page")
@@ -66,12 +71,14 @@ public class FsSaleRevenueDiffPriceController {
         return CommonResult.data(fsSaleRevenueDiffPriceService.page(fsSaleRevenueDiffPricePageParam));
     }
 
-    /**
+    */
+/**
      * 添加销售收入上缴-差额上缴
      *
      * @author QSHan
-     * @date  2024/07/26 16:56
-     */
+     * @date  2024/07/29 15:31
+     *//*
+
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加销售收入上缴-差额上缴")
     @CommonLog("添加销售收入上缴-差额上缴")
@@ -82,12 +89,14 @@ public class FsSaleRevenueDiffPriceController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 编辑销售收入上缴-差额上缴
      *
      * @author QSHan
-     * @date  2024/07/26 16:56
-     */
+     * @date  2024/07/29 15:31
+     *//*
+
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑销售收入上缴-差额上缴")
     @CommonLog("编辑销售收入上缴-差额上缴")
@@ -98,12 +107,14 @@ public class FsSaleRevenueDiffPriceController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 删除销售收入上缴-差额上缴
      *
      * @author QSHan
-     * @date  2024/07/26 16:56
-     */
+     * @date  2024/07/29 15:31
+     *//*
+
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除销售收入上缴-差额上缴")
     @CommonLog("删除销售收入上缴-差额上缴")
@@ -115,12 +126,14 @@ public class FsSaleRevenueDiffPriceController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 获取销售收入上缴-差额上缴详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:56
-     */
+     * @date  2024/07/29 15:31
+     *//*
+
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取销售收入上缴-差额上缴详情")
     @SaCheckPermission("/financialSupervision/fsSaleRevenueDiffPrice/detail")
@@ -129,3 +142,4 @@ public class FsSaleRevenueDiffPriceController {
         return CommonResult.data(fsSaleRevenueDiffPriceService.detail(fsSaleRevenueDiffPriceIdParam));
     }
 }
+*/

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueDiffPrice/entity/FsSaleRevenueDiffPrice.java

@@ -23,11 +23,55 @@ import java.util.Date;
  * 销售收入上缴-差额上缴实体
  *
  * @author QSHan
- * @date  2024/07/26 16:56
+ * @date  2024/07/29 15:31
  **/
 @Getter
 @Setter
 @TableName("business_fs_sale_revenue_diff_price")
 public class FsSaleRevenueDiffPrice {
 
+    /** 主键ID */
+    @TableId
+    @ApiModelProperty(value = "主键ID", position = 1)
+    private Integer id;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID； */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID；", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** 项目类型 1：销售；2：损耗；3：入库（用负数表示）；4：交易手续费（用负数表示）； */
+    @ApiModelProperty(value = "项目类型 1：销售；2：损耗；3：入库（用负数表示）；4：交易手续费（用负数表示）；", position = 7)
+    private Integer projectType;
+
+    /** 数量 */
+    @ApiModelProperty(value = "数量", position = 8)
+    private BigDecimal totalQuantity;
+
+    /** 省平台修改-数量 */
+    @ApiModelProperty(value = "省平台修改-数量", position = 9)
+    private BigDecimal provinceTotalQuantity;
+
+    /** 金额 */
+    @ApiModelProperty(value = "金额", position = 10)
+    private BigDecimal totalAmount;
+
+    /** 省平台修改-金额 */
+    @ApiModelProperty(value = "省平台修改-金额", position = 11)
+    private BigDecimal provinceTotalAmount;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueDiffPrice/enums/FsSaleRevenueDiffPriceEnum.java

@@ -18,7 +18,7 @@ import lombok.Getter;
  * 销售收入上缴-差额上缴枚举
  *
  * @author QSHan
- * @date  2024/07/26 16:56
+ * @date  2024/07/29 15:31
  **/
 @Getter
 public enum FsSaleRevenueDiffPriceEnum {

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueDiffPrice/mapper/FsSaleRevenueDiffPriceMapper.java

@@ -19,7 +19,7 @@ import com.unis.financialSupervision.modular.fsSaleRevenueDiffPrice.entity.FsSal
  * 销售收入上缴-差额上缴Mapper接口
  *
  * @author QSHan
- * @date  2024/07/26 16:56
+ * @date  2024/07/29 15:31
  **/
 public interface FsSaleRevenueDiffPriceMapper extends BaseMapper<FsSaleRevenueDiffPrice> {
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueDiffPrice/param/FsSaleRevenueDiffPriceAddParam.java

@@ -25,10 +25,50 @@ import java.util.Date;
  * 销售收入上缴-差额上缴添加参数
  *
  * @author QSHan
- * @date  2024/07/26 16:56
+ * @date  2024/07/29 15:31
  **/
 @Getter
 @Setter
 public class FsSaleRevenueDiffPriceAddParam {
 
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID； */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID；", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** 项目类型 1：销售；2：损耗；3：入库（用负数表示）；4：交易手续费（用负数表示）； */
+    @ApiModelProperty(value = "项目类型 1：销售；2：损耗；3：入库（用负数表示）；4：交易手续费（用负数表示）；", position = 7)
+    private Integer projectType;
+
+    /** 数量 */
+    @ApiModelProperty(value = "数量", position = 8)
+    private BigDecimal totalQuantity;
+
+    /** 省平台修改-数量 */
+    @ApiModelProperty(value = "省平台修改-数量", position = 9)
+    private BigDecimal provinceTotalQuantity;
+
+    /** 金额 */
+    @ApiModelProperty(value = "金额", position = 10)
+    private BigDecimal totalAmount;
+
+    /** 省平台修改-金额 */
+    @ApiModelProperty(value = "省平台修改-金额", position = 11)
+    private BigDecimal provinceTotalAmount;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueDiffPrice/param/FsSaleRevenueDiffPriceEditParam.java

@@ -25,10 +25,55 @@ import java.util.Date;
  * 销售收入上缴-差额上缴编辑参数
  *
  * @author QSHan
- * @date  2024/07/26 16:56
+ * @date  2024/07/29 15:31
  **/
 @Getter
 @Setter
 public class FsSaleRevenueDiffPriceEditParam {
 
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true, position = 1)
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID； */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID；", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** 项目类型 1：销售；2：损耗；3：入库（用负数表示）；4：交易手续费（用负数表示）； */
+    @ApiModelProperty(value = "项目类型 1：销售；2：损耗；3：入库（用负数表示）；4：交易手续费（用负数表示）；", position = 7)
+    private Integer projectType;
+
+    /** 数量 */
+    @ApiModelProperty(value = "数量", position = 8)
+    private BigDecimal totalQuantity;
+
+    /** 省平台修改-数量 */
+    @ApiModelProperty(value = "省平台修改-数量", position = 9)
+    private BigDecimal provinceTotalQuantity;
+
+    /** 金额 */
+    @ApiModelProperty(value = "金额", position = 10)
+    private BigDecimal totalAmount;
+
+    /** 省平台修改-金额 */
+    @ApiModelProperty(value = "省平台修改-金额", position = 11)
+    private BigDecimal provinceTotalAmount;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueDiffPrice/param/FsSaleRevenueDiffPriceIdParam.java

@@ -22,14 +22,14 @@ import javax.validation.constraints.NotBlank;
  * 销售收入上缴-差额上缴Id参数
  *
  * @author QSHan
- * @date  2024/07/26 16:56
+ * @date  2024/07/29 15:31
  **/
 @Getter
 @Setter
 public class FsSaleRevenueDiffPriceIdParam {
 
-    /** id */
-    @ApiModelProperty(value = "id", required = true)
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true)
     @NotBlank(message = "id不能为空")
-    private String id;
+    private Integer id;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueDiffPrice/param/FsSaleRevenueDiffPricePageParam.java

@@ -22,7 +22,7 @@ import java.util.Date;
  * 销售收入上缴-差额上缴查询参数
  *
  * @author QSHan
- * @date  2024/07/26 16:56
+ * @date  2024/07/29 15:31
  **/
 @Getter
 @Setter

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueDiffPrice/service/FsSaleRevenueDiffPriceService.java

@@ -26,7 +26,7 @@ import java.util.List;
  * 销售收入上缴-差额上缴Service接口
  *
  * @author QSHan
- * @date  2024/07/26 16:56
+ * @date  2024/07/29 15:31
  **/
 public interface FsSaleRevenueDiffPriceService extends IService<FsSaleRevenueDiffPrice> {
 
@@ -34,7 +34,7 @@ public interface FsSaleRevenueDiffPriceService extends IService<FsSaleRevenueDif
      * 获取销售收入上缴-差额上缴分页
      *
      * @author QSHan
-     * @date  2024/07/26 16:56
+     * @date  2024/07/29 15:31
      */
     Page<FsSaleRevenueDiffPrice> page(FsSaleRevenueDiffPricePageParam fsSaleRevenueDiffPricePageParam);
 
@@ -42,7 +42,7 @@ public interface FsSaleRevenueDiffPriceService extends IService<FsSaleRevenueDif
      * 添加销售收入上缴-差额上缴
      *
      * @author QSHan
-     * @date  2024/07/26 16:56
+     * @date  2024/07/29 15:31
      */
     void add(FsSaleRevenueDiffPriceAddParam fsSaleRevenueDiffPriceAddParam);
 
@@ -50,7 +50,7 @@ public interface FsSaleRevenueDiffPriceService extends IService<FsSaleRevenueDif
      * 编辑销售收入上缴-差额上缴
      *
      * @author QSHan
-     * @date  2024/07/26 16:56
+     * @date  2024/07/29 15:31
      */
     void edit(FsSaleRevenueDiffPriceEditParam fsSaleRevenueDiffPriceEditParam);
 
@@ -58,7 +58,7 @@ public interface FsSaleRevenueDiffPriceService extends IService<FsSaleRevenueDif
      * 删除销售收入上缴-差额上缴
      *
      * @author QSHan
-     * @date  2024/07/26 16:56
+     * @date  2024/07/29 15:31
      */
     void delete(List<FsSaleRevenueDiffPriceIdParam> fsSaleRevenueDiffPriceIdParamList);
 
@@ -66,7 +66,7 @@ public interface FsSaleRevenueDiffPriceService extends IService<FsSaleRevenueDif
      * 获取销售收入上缴-差额上缴详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:56
+     * @date  2024/07/29 15:31
      */
     FsSaleRevenueDiffPrice detail(FsSaleRevenueDiffPriceIdParam fsSaleRevenueDiffPriceIdParam);
 
@@ -74,7 +74,7 @@ public interface FsSaleRevenueDiffPriceService extends IService<FsSaleRevenueDif
      * 获取销售收入上缴-差额上缴详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:56
+     * @date  2024/07/29 15:31
      **/
-    FsSaleRevenueDiffPrice queryEntity(String id);
+    FsSaleRevenueDiffPrice queryEntity(Integer id);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueDiffPrice/service/impl/FsSaleRevenueDiffPriceServiceImpl.java

@@ -38,7 +38,7 @@ import java.util.List;
  * 销售收入上缴-差额上缴Service接口实现类
  *
  * @author QSHan
- * @date  2024/07/26 16:56
+ * @date  2024/07/29 15:31
  **/
 @Service
 public class FsSaleRevenueDiffPriceServiceImpl extends ServiceImpl<FsSaleRevenueDiffPriceMapper, FsSaleRevenueDiffPrice> implements FsSaleRevenueDiffPriceService {
@@ -66,6 +66,7 @@ public class FsSaleRevenueDiffPriceServiceImpl extends ServiceImpl<FsSaleRevenue
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(FsSaleRevenueDiffPriceEditParam fsSaleRevenueDiffPriceEditParam) {
+        FsSaleRevenueDiffPrice fsSaleRevenueDiffPrice = this.queryEntity(fsSaleRevenueDiffPriceEditParam.getId());
         BeanUtil.copyProperties(fsSaleRevenueDiffPriceEditParam, fsSaleRevenueDiffPrice);
         this.updateById(fsSaleRevenueDiffPrice);
     }
@@ -74,14 +75,16 @@ public class FsSaleRevenueDiffPriceServiceImpl extends ServiceImpl<FsSaleRevenue
     @Override
     public void delete(List<FsSaleRevenueDiffPriceIdParam> fsSaleRevenueDiffPriceIdParamList) {
         // 执行删除
+        this.removeByIds(CollStreamUtil.toList(fsSaleRevenueDiffPriceIdParamList, FsSaleRevenueDiffPriceIdParam::getId));
     }
 
     @Override
     public FsSaleRevenueDiffPrice detail(FsSaleRevenueDiffPriceIdParam fsSaleRevenueDiffPriceIdParam) {
+        return this.queryEntity(fsSaleRevenueDiffPriceIdParam.getId());
     }
 
     @Override
-    public FsSaleRevenueDiffPrice queryEntity(String id) {
+    public FsSaleRevenueDiffPrice queryEntity(Integer id) {
         FsSaleRevenueDiffPrice fsSaleRevenueDiffPrice = this.getById(id);
         if(ObjectUtil.isEmpty(fsSaleRevenueDiffPrice)) {
             throw new CommonException("销售收入上缴-差额上缴不存在，id值为：{}", id);

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueInspectionLoss/controller/FsSaleRevenueInspectionLossController.java

@@ -9,7 +9,8 @@
  * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
- */
+ *//*
+
 package com.unis.financialSupervision.modular.fsSaleRevenueInspectionLoss.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -37,12 +38,14 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 
+*/
 /**
  * 销售收入上缴-质检损益信息控制器
  *
  * @author QSHan
- * @date  2024/07/26 16:35
- */
+ * @date  2024/07/29 15:15
+ *//*
+
 @Api(tags = "销售收入上缴-质检损益信息控制器")
 @ApiSupport(author = "UNIS_TEAM", order = 1)
 @RestController
@@ -52,12 +55,14 @@ public class FsSaleRevenueInspectionLossController {
     @Resource
     private FsSaleRevenueInspectionLossService fsSaleRevenueInspectionLossService;
 
-    /**
+    */
+/**
      * 获取销售收入上缴-质检损益信息分页
      *
      * @author QSHan
-     * @date  2024/07/26 16:35
-     */
+     * @date  2024/07/29 15:15
+     *//*
+
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取销售收入上缴-质检损益信息分页")
     @SaCheckPermission("/financialSupervision/fsSaleRevenueInspectionLoss/page")
@@ -66,12 +71,14 @@ public class FsSaleRevenueInspectionLossController {
         return CommonResult.data(fsSaleRevenueInspectionLossService.page(fsSaleRevenueInspectionLossPageParam));
     }
 
-    /**
+    */
+/**
      * 添加销售收入上缴-质检损益信息
      *
      * @author QSHan
-     * @date  2024/07/26 16:35
-     */
+     * @date  2024/07/29 15:15
+     *//*
+
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加销售收入上缴-质检损益信息")
     @CommonLog("添加销售收入上缴-质检损益信息")
@@ -82,12 +89,14 @@ public class FsSaleRevenueInspectionLossController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 编辑销售收入上缴-质检损益信息
      *
      * @author QSHan
-     * @date  2024/07/26 16:35
-     */
+     * @date  2024/07/29 15:15
+     *//*
+
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑销售收入上缴-质检损益信息")
     @CommonLog("编辑销售收入上缴-质检损益信息")
@@ -98,12 +107,14 @@ public class FsSaleRevenueInspectionLossController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 删除销售收入上缴-质检损益信息
      *
      * @author QSHan
-     * @date  2024/07/26 16:35
-     */
+     * @date  2024/07/29 15:15
+     *//*
+
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除销售收入上缴-质检损益信息")
     @CommonLog("删除销售收入上缴-质检损益信息")
@@ -115,12 +126,14 @@ public class FsSaleRevenueInspectionLossController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 获取销售收入上缴-质检损益信息详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:35
-     */
+     * @date  2024/07/29 15:15
+     *//*
+
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取销售收入上缴-质检损益信息详情")
     @SaCheckPermission("/financialSupervision/fsSaleRevenueInspectionLoss/detail")
@@ -129,3 +142,4 @@ public class FsSaleRevenueInspectionLossController {
         return CommonResult.data(fsSaleRevenueInspectionLossService.detail(fsSaleRevenueInspectionLossIdParam));
     }
 }
+*/

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueInspectionLoss/entity/FsSaleRevenueInspectionLoss.java

@@ -23,11 +23,108 @@ import java.util.Date;
  * 销售收入上缴-质检损益信息实体
  *
  * @author QSHan
- * @date  2024/07/26 16:35
+ * @date  2024/07/29 15:15
  **/
 @Getter
 @Setter
 @TableName("business_fs_sale_revenue_inspection_loss")
 public class FsSaleRevenueInspectionLoss {
 
+    /** 主键ID */
+    @TableId
+    @ApiModelProperty(value = "主键ID", position = 1)
+    private Integer id;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID； */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID；", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** 出库质检报告；business_qc_quality_inspection的id； */
+    @ApiModelProperty(value = "出库质检报告；business_qc_quality_inspection的id；", position = 7)
+    private Integer qcQualityInspectionIdOut;
+
+    /** 入库质检报告；business_qc_quality_inspection的id； */
+    @ApiModelProperty(value = "入库质检报告；business_qc_quality_inspection的id；", position = 8)
+    private Integer qcQualityInspectionIdIn;
+
+    /** 损溢损失信息；business_gslr_loss_collect的id； */
+    @ApiModelProperty(value = "损溢损失信息；business_gslr_loss_collect的id；", position = 9)
+    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;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueInspectionLoss/enums/FsSaleRevenueInspectionLossEnum.java

@@ -18,7 +18,7 @@ import lombok.Getter;
  * 销售收入上缴-质检损益信息枚举
  *
  * @author QSHan
- * @date  2024/07/26 16:35
+ * @date  2024/07/29 15:15
  **/
 @Getter
 public enum FsSaleRevenueInspectionLossEnum {

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueInspectionLoss/mapper/FsSaleRevenueInspectionLossMapper.java

@@ -19,7 +19,7 @@ import com.unis.financialSupervision.modular.fsSaleRevenueInspectionLoss.entity.
  * 销售收入上缴-质检损益信息Mapper接口
  *
  * @author QSHan
- * @date  2024/07/26 16:35
+ * @date  2024/07/29 15:15
  **/
 public interface FsSaleRevenueInspectionLossMapper extends BaseMapper<FsSaleRevenueInspectionLoss> {
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueInspectionLoss/param/FsSaleRevenueInspectionLossAddParam.java

@@ -25,10 +25,42 @@ import java.util.Date;
  * 销售收入上缴-质检损益信息添加参数
  *
  * @author QSHan
- * @date  2024/07/26 16:35
+ * @date  2024/07/29 15:15
  **/
 @Getter
 @Setter
 public class FsSaleRevenueInspectionLossAddParam {
 
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID； */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID；", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** 出库质检报告；business_qc_quality_inspection的id； */
+    @ApiModelProperty(value = "出库质检报告；business_qc_quality_inspection的id；", position = 7)
+    private Integer qcQualityInspectionIdOut;
+
+    /** 入库质检报告；business_qc_quality_inspection的id； */
+    @ApiModelProperty(value = "入库质检报告；business_qc_quality_inspection的id；", position = 8)
+    private Integer qcQualityInspectionIdIn;
+
+    /** 损溢损失信息；business_gslr_loss_collect的id； */
+    @ApiModelProperty(value = "损溢损失信息；business_gslr_loss_collect的id；", position = 9)
+    private Integer gslrLossCollectId;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueInspectionLoss/param/FsSaleRevenueInspectionLossEditParam.java

@@ -25,10 +25,47 @@ import java.util.Date;
  * 销售收入上缴-质检损益信息编辑参数
  *
  * @author QSHan
- * @date  2024/07/26 16:35
+ * @date  2024/07/29 15:15
  **/
 @Getter
 @Setter
 public class FsSaleRevenueInspectionLossEditParam {
 
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true, position = 1)
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID； */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID；", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** 出库质检报告；business_qc_quality_inspection的id； */
+    @ApiModelProperty(value = "出库质检报告；business_qc_quality_inspection的id；", position = 7)
+    private Integer qcQualityInspectionIdOut;
+
+    /** 入库质检报告；business_qc_quality_inspection的id； */
+    @ApiModelProperty(value = "入库质检报告；business_qc_quality_inspection的id；", position = 8)
+    private Integer qcQualityInspectionIdIn;
+
+    /** 损溢损失信息；business_gslr_loss_collect的id； */
+    @ApiModelProperty(value = "损溢损失信息；business_gslr_loss_collect的id；", position = 9)
+    private Integer gslrLossCollectId;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueInspectionLoss/param/FsSaleRevenueInspectionLossIdParam.java

@@ -22,14 +22,14 @@ import javax.validation.constraints.NotBlank;
  * 销售收入上缴-质检损益信息Id参数
  *
  * @author QSHan
- * @date  2024/07/26 16:35
+ * @date  2024/07/29 15:15
  **/
 @Getter
 @Setter
 public class FsSaleRevenueInspectionLossIdParam {
 
-    /** id */
-    @ApiModelProperty(value = "id", required = true)
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true)
     @NotBlank(message = "id不能为空")
-    private String id;
+    private Integer id;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueInspectionLoss/param/FsSaleRevenueInspectionLossPageParam.java

@@ -22,7 +22,7 @@ import java.util.Date;
  * 销售收入上缴-质检损益信息查询参数
  *
  * @author QSHan
- * @date  2024/07/26 16:35
+ * @date  2024/07/29 15:15
  **/
 @Getter
 @Setter

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueInspectionLoss/service/FsSaleRevenueInspectionLossService.java

@@ -26,7 +26,7 @@ import java.util.List;
  * 销售收入上缴-质检损益信息Service接口
  *
  * @author QSHan
- * @date  2024/07/26 16:35
+ * @date  2024/07/29 15:15
  **/
 public interface FsSaleRevenueInspectionLossService extends IService<FsSaleRevenueInspectionLoss> {
 
@@ -34,7 +34,7 @@ public interface FsSaleRevenueInspectionLossService extends IService<FsSaleReven
      * 获取销售收入上缴-质检损益信息分页
      *
      * @author QSHan
-     * @date  2024/07/26 16:35
+     * @date  2024/07/29 15:15
      */
     Page<FsSaleRevenueInspectionLoss> page(FsSaleRevenueInspectionLossPageParam fsSaleRevenueInspectionLossPageParam);
 
@@ -42,7 +42,7 @@ public interface FsSaleRevenueInspectionLossService extends IService<FsSaleReven
      * 添加销售收入上缴-质检损益信息
      *
      * @author QSHan
-     * @date  2024/07/26 16:35
+     * @date  2024/07/29 15:15
      */
     void add(FsSaleRevenueInspectionLossAddParam fsSaleRevenueInspectionLossAddParam);
 
@@ -50,7 +50,7 @@ public interface FsSaleRevenueInspectionLossService extends IService<FsSaleReven
      * 编辑销售收入上缴-质检损益信息
      *
      * @author QSHan
-     * @date  2024/07/26 16:35
+     * @date  2024/07/29 15:15
      */
     void edit(FsSaleRevenueInspectionLossEditParam fsSaleRevenueInspectionLossEditParam);
 
@@ -58,7 +58,7 @@ public interface FsSaleRevenueInspectionLossService extends IService<FsSaleReven
      * 删除销售收入上缴-质检损益信息
      *
      * @author QSHan
-     * @date  2024/07/26 16:35
+     * @date  2024/07/29 15:15
      */
     void delete(List<FsSaleRevenueInspectionLossIdParam> fsSaleRevenueInspectionLossIdParamList);
 
@@ -66,7 +66,7 @@ public interface FsSaleRevenueInspectionLossService extends IService<FsSaleReven
      * 获取销售收入上缴-质检损益信息详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:35
+     * @date  2024/07/29 15:15
      */
     FsSaleRevenueInspectionLoss detail(FsSaleRevenueInspectionLossIdParam fsSaleRevenueInspectionLossIdParam);
 
@@ -74,7 +74,7 @@ public interface FsSaleRevenueInspectionLossService extends IService<FsSaleReven
      * 获取销售收入上缴-质检损益信息详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:35
+     * @date  2024/07/29 15:15
      **/
-    FsSaleRevenueInspectionLoss queryEntity(String id);
+    FsSaleRevenueInspectionLoss queryEntity(Integer id);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueInspectionLoss/service/impl/FsSaleRevenueInspectionLossServiceImpl.java

@@ -38,7 +38,7 @@ import java.util.List;
  * 销售收入上缴-质检损益信息Service接口实现类
  *
  * @author QSHan
- * @date  2024/07/26 16:35
+ * @date  2024/07/29 15:15
  **/
 @Service
 public class FsSaleRevenueInspectionLossServiceImpl extends ServiceImpl<FsSaleRevenueInspectionLossMapper, FsSaleRevenueInspectionLoss> implements FsSaleRevenueInspectionLossService {
@@ -66,6 +66,7 @@ public class FsSaleRevenueInspectionLossServiceImpl extends ServiceImpl<FsSaleRe
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(FsSaleRevenueInspectionLossEditParam fsSaleRevenueInspectionLossEditParam) {
+        FsSaleRevenueInspectionLoss fsSaleRevenueInspectionLoss = this.queryEntity(fsSaleRevenueInspectionLossEditParam.getId());
         BeanUtil.copyProperties(fsSaleRevenueInspectionLossEditParam, fsSaleRevenueInspectionLoss);
         this.updateById(fsSaleRevenueInspectionLoss);
     }
@@ -74,14 +75,16 @@ public class FsSaleRevenueInspectionLossServiceImpl extends ServiceImpl<FsSaleRe
     @Override
     public void delete(List<FsSaleRevenueInspectionLossIdParam> fsSaleRevenueInspectionLossIdParamList) {
         // 执行删除
+        this.removeByIds(CollStreamUtil.toList(fsSaleRevenueInspectionLossIdParamList, FsSaleRevenueInspectionLossIdParam::getId));
     }
 
     @Override
     public FsSaleRevenueInspectionLoss detail(FsSaleRevenueInspectionLossIdParam fsSaleRevenueInspectionLossIdParam) {
+        return this.queryEntity(fsSaleRevenueInspectionLossIdParam.getId());
     }
 
     @Override
-    public FsSaleRevenueInspectionLoss queryEntity(String id) {
+    public FsSaleRevenueInspectionLoss queryEntity(Integer id) {
         FsSaleRevenueInspectionLoss fsSaleRevenueInspectionLoss = this.getById(id);
         if(ObjectUtil.isEmpty(fsSaleRevenueInspectionLoss)) {
             throw new CommonException("销售收入上缴-质检损益信息不存在，id值为：{}", id);

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueSettle/controller/FsSaleRevenueSettleController.java

@@ -9,7 +9,8 @@
  * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
- */
+ *//*
+
 package com.unis.financialSupervision.modular.fsSaleRevenueSettle.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -37,12 +38,14 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 
+*/
 /**
  * 销售收入上缴-结算信息控制器
  *
  * @author QSHan
- * @date  2024/07/26 16:51
- */
+ * @date  2024/07/29 15:29
+ *//*
+
 @Api(tags = "销售收入上缴-结算信息控制器")
 @ApiSupport(author = "UNIS_TEAM", order = 1)
 @RestController
@@ -52,12 +55,14 @@ public class FsSaleRevenueSettleController {
     @Resource
     private FsSaleRevenueSettleService fsSaleRevenueSettleService;
 
-    /**
+    */
+/**
      * 获取销售收入上缴-结算信息分页
      *
      * @author QSHan
-     * @date  2024/07/26 16:51
-     */
+     * @date  2024/07/29 15:29
+     *//*
+
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取销售收入上缴-结算信息分页")
     @SaCheckPermission("/financialSupervision/fsSaleRevenueSettle/page")
@@ -66,12 +71,14 @@ public class FsSaleRevenueSettleController {
         return CommonResult.data(fsSaleRevenueSettleService.page(fsSaleRevenueSettlePageParam));
     }
 
-    /**
+    */
+/**
      * 添加销售收入上缴-结算信息
      *
      * @author QSHan
-     * @date  2024/07/26 16:51
-     */
+     * @date  2024/07/29 15:29
+     *//*
+
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加销售收入上缴-结算信息")
     @CommonLog("添加销售收入上缴-结算信息")
@@ -82,12 +89,14 @@ public class FsSaleRevenueSettleController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 编辑销售收入上缴-结算信息
      *
      * @author QSHan
-     * @date  2024/07/26 16:51
-     */
+     * @date  2024/07/29 15:29
+     *//*
+
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑销售收入上缴-结算信息")
     @CommonLog("编辑销售收入上缴-结算信息")
@@ -98,12 +107,14 @@ public class FsSaleRevenueSettleController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 删除销售收入上缴-结算信息
      *
      * @author QSHan
-     * @date  2024/07/26 16:51
-     */
+     * @date  2024/07/29 15:29
+     *//*
+
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除销售收入上缴-结算信息")
     @CommonLog("删除销售收入上缴-结算信息")
@@ -115,12 +126,14 @@ public class FsSaleRevenueSettleController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 获取销售收入上缴-结算信息详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:51
-     */
+     * @date  2024/07/29 15:29
+     *//*
+
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取销售收入上缴-结算信息详情")
     @SaCheckPermission("/financialSupervision/fsSaleRevenueSettle/detail")
@@ -129,3 +142,4 @@ public class FsSaleRevenueSettleController {
         return CommonResult.data(fsSaleRevenueSettleService.detail(fsSaleRevenueSettleIdParam));
     }
 }
+*/

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueSettle/entity/FsSaleRevenueSettle.java

@@ -23,11 +23,96 @@ import java.util.Date;
  * 销售收入上缴-结算信息实体
  *
  * @author QSHan
- * @date  2024/07/26 16:51
+ * @date  2024/07/29 15:29
  **/
 @Getter
 @Setter
 @TableName("business_fs_sale_revenue_settle")
 public class FsSaleRevenueSettle {
 
+    /** 主键ID */
+    @TableId
+    @ApiModelProperty(value = "主键ID", position = 1)
+    private Integer id;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID； */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID；", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** business_fs_out_confirm的ID； */
+    @ApiModelProperty(value = "business_fs_out_confirm的ID；", position = 7)
+    private Integer fsOutConfirmId;
+
+    /** 省平台修改-出库验收确认-销往单位 */
+    @ApiModelProperty(value = "省平台修改-出库验收确认-销往单位", position = 8)
+    private String provinceAcceptanceUnit;
+
+    /** 省平台修改-出库确认单-数量（吨） */
+    @ApiModelProperty(value = "省平台修改-出库确认单-数量（吨）", position = 9)
+    private BigDecimal provinceTotalSettleQuantity;
+
+    /** 省平台修改-出库确认单-金额，单位：元 */
+    @ApiModelProperty(value = "省平台修改-出库确认单-金额，单位：元", position = 10)
+    private BigDecimal provinceTotalSettleAmount;
+
+    /** 省平台修改-贷款收回情况-单位 */
+    @ApiModelProperty(value = "省平台修改-贷款收回情况-单位", position = 11)
+    private String provinceLoanRecoveryUnit;
+
+    /** 省平台修改-贷款收回情况-数量 */
+    @ApiModelProperty(value = "省平台修改-贷款收回情况-数量", position = 12)
+    private BigDecimal provinceLoanRecoveryQuantity;
+
+    /** 省平台修改-贷款收回情况-金额 */
+    @ApiModelProperty(value = "省平台修改-贷款收回情况-金额", position = 13)
+    private BigDecimal provinceLoanRecoveryAmount;
+
+    /** 省平台修改-销售发票情况-单位 */
+    @ApiModelProperty(value = "省平台修改-销售发票情况-单位", position = 14)
+    private String provinceInvoiceUnit;
+
+    /** 省平台修改-销售发票情况-发票数量 */
+    @ApiModelProperty(value = "省平台修改-销售发票情况-发票数量", position = 15)
+    private Integer provinceInvoiceQuantity;
+
+    /** 省平台修改-销售发票情况-发票单价 */
+    @ApiModelProperty(value = "省平台修改-销售发票情况-发票单价", position = 16)
+    private BigDecimal provinceInvoiceUnitPrice;
+
+    /** 省平台修改-销售发票情况-发票金额 */
+    @ApiModelProperty(value = "省平台修改-销售发票情况-发票金额", position = 17)
+    private BigDecimal provinceInvoiceAmount;
+
+    /** 省平台修改-贷款归还-日期 */
+    @ApiModelProperty(value = "省平台修改-贷款归还-日期", position = 18)
+    private Date provinceLoanReturnTime;
+
+    /** 省平台修改-贷款归还-金额 */
+    @ApiModelProperty(value = "省平台修改-贷款归还-金额", position = 19)
+    private BigDecimal provinceLoanReturnAmount;
+
+    // 业务数据
+    @ApiModelProperty(value = "出库验收确认-单位")
+    @TableField(exist = false)
+    private String orgName;
+
+    @ApiModelProperty(value = "贷款收回情况-日期")
+    @TableField(exist = false)
+    private Date loanReturnTime;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueSettle/enums/FsSaleRevenueSettleEnum.java

@@ -18,7 +18,7 @@ import lombok.Getter;
  * 销售收入上缴-结算信息枚举
  *
  * @author QSHan
- * @date  2024/07/26 16:51
+ * @date  2024/07/29 15:29
  **/
 @Getter
 public enum FsSaleRevenueSettleEnum {

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueSettle/mapper/FsSaleRevenueSettleMapper.java

@@ -19,7 +19,7 @@ import com.unis.financialSupervision.modular.fsSaleRevenueSettle.entity.FsSaleRe
  * 销售收入上缴-结算信息Mapper接口
  *
  * @author QSHan
- * @date  2024/07/26 16:51
+ * @date  2024/07/29 15:29
  **/
 public interface FsSaleRevenueSettleMapper extends BaseMapper<FsSaleRevenueSettle> {
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueSettle/param/FsSaleRevenueSettleAddParam.java

@@ -25,10 +25,82 @@ import java.util.Date;
  * 销售收入上缴-结算信息添加参数
  *
  * @author QSHan
- * @date  2024/07/26 16:51
+ * @date  2024/07/29 15:29
  **/
 @Getter
 @Setter
 public class FsSaleRevenueSettleAddParam {
 
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID； */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID；", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** business_fs_out_confirm的ID； */
+    @ApiModelProperty(value = "business_fs_out_confirm的ID；", position = 7)
+    private Integer fsOutConfirmId;
+
+    /** 省平台修改-出库验收确认-销往单位 */
+    @ApiModelProperty(value = "省平台修改-出库验收确认-销往单位", position = 8)
+    private String provinceAcceptanceUnit;
+
+    /** 省平台修改-出库确认单-数量（吨） */
+    @ApiModelProperty(value = "省平台修改-出库确认单-数量（吨）", position = 9)
+    private BigDecimal provinceTotalSettleQuantity;
+
+    /** 省平台修改-出库确认单-金额，单位：元 */
+    @ApiModelProperty(value = "省平台修改-出库确认单-金额，单位：元", position = 10)
+    private BigDecimal provinceTotalSettleAmount;
+
+    /** 省平台修改-贷款收回情况-单位 */
+    @ApiModelProperty(value = "省平台修改-贷款收回情况-单位", position = 11)
+    private String provinceLoanRecoveryUnit;
+
+    /** 省平台修改-贷款收回情况-数量 */
+    @ApiModelProperty(value = "省平台修改-贷款收回情况-数量", position = 12)
+    private BigDecimal provinceLoanRecoveryQuantity;
+
+    /** 省平台修改-贷款收回情况-金额 */
+    @ApiModelProperty(value = "省平台修改-贷款收回情况-金额", position = 13)
+    private BigDecimal provinceLoanRecoveryAmount;
+
+    /** 省平台修改-销售发票情况-单位 */
+    @ApiModelProperty(value = "省平台修改-销售发票情况-单位", position = 14)
+    private String provinceInvoiceUnit;
+
+    /** 省平台修改-销售发票情况-发票数量 */
+    @ApiModelProperty(value = "省平台修改-销售发票情况-发票数量", position = 15)
+    private Integer provinceInvoiceQuantity;
+
+    /** 省平台修改-销售发票情况-发票单价 */
+    @ApiModelProperty(value = "省平台修改-销售发票情况-发票单价", position = 16)
+    private BigDecimal provinceInvoiceUnitPrice;
+
+    /** 省平台修改-销售发票情况-发票金额 */
+    @ApiModelProperty(value = "省平台修改-销售发票情况-发票金额", position = 17)
+    private BigDecimal provinceInvoiceAmount;
+
+    /** 省平台修改-贷款归还-日期 */
+    @ApiModelProperty(value = "省平台修改-贷款归还-日期", position = 18)
+    private Date provinceLoanReturnTime;
+
+    /** 省平台修改-贷款归还-金额 */
+    @ApiModelProperty(value = "省平台修改-贷款归还-金额", position = 19)
+    private BigDecimal provinceLoanReturnAmount;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueSettle/param/FsSaleRevenueSettleEditParam.java

@@ -25,10 +25,87 @@ import java.util.Date;
  * 销售收入上缴-结算信息编辑参数
  *
  * @author QSHan
- * @date  2024/07/26 16:51
+ * @date  2024/07/29 15:29
  **/
 @Getter
 @Setter
 public class FsSaleRevenueSettleEditParam {
 
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true, position = 1)
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID； */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID；", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** business_fs_out_confirm的ID； */
+    @ApiModelProperty(value = "business_fs_out_confirm的ID；", position = 7)
+    private Integer fsOutConfirmId;
+
+    /** 省平台修改-出库验收确认-销往单位 */
+    @ApiModelProperty(value = "省平台修改-出库验收确认-销往单位", position = 8)
+    private String provinceAcceptanceUnit;
+
+    /** 省平台修改-出库确认单-数量（吨） */
+    @ApiModelProperty(value = "省平台修改-出库确认单-数量（吨）", position = 9)
+    private BigDecimal provinceTotalSettleQuantity;
+
+    /** 省平台修改-出库确认单-金额，单位：元 */
+    @ApiModelProperty(value = "省平台修改-出库确认单-金额，单位：元", position = 10)
+    private BigDecimal provinceTotalSettleAmount;
+
+    /** 省平台修改-贷款收回情况-单位 */
+    @ApiModelProperty(value = "省平台修改-贷款收回情况-单位", position = 11)
+    private String provinceLoanRecoveryUnit;
+
+    /** 省平台修改-贷款收回情况-数量 */
+    @ApiModelProperty(value = "省平台修改-贷款收回情况-数量", position = 12)
+    private BigDecimal provinceLoanRecoveryQuantity;
+
+    /** 省平台修改-贷款收回情况-金额 */
+    @ApiModelProperty(value = "省平台修改-贷款收回情况-金额", position = 13)
+    private BigDecimal provinceLoanRecoveryAmount;
+
+    /** 省平台修改-销售发票情况-单位 */
+    @ApiModelProperty(value = "省平台修改-销售发票情况-单位", position = 14)
+    private String provinceInvoiceUnit;
+
+    /** 省平台修改-销售发票情况-发票数量 */
+    @ApiModelProperty(value = "省平台修改-销售发票情况-发票数量", position = 15)
+    private Integer provinceInvoiceQuantity;
+
+    /** 省平台修改-销售发票情况-发票单价 */
+    @ApiModelProperty(value = "省平台修改-销售发票情况-发票单价", position = 16)
+    private BigDecimal provinceInvoiceUnitPrice;
+
+    /** 省平台修改-销售发票情况-发票金额 */
+    @ApiModelProperty(value = "省平台修改-销售发票情况-发票金额", position = 17)
+    private BigDecimal provinceInvoiceAmount;
+
+    /** 省平台修改-贷款归还-日期 */
+    @ApiModelProperty(value = "省平台修改-贷款归还-日期", position = 18)
+    private Date provinceLoanReturnTime;
+
+    /** 省平台修改-贷款归还-金额 */
+    @ApiModelProperty(value = "省平台修改-贷款归还-金额", position = 19)
+    private BigDecimal provinceLoanReturnAmount;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueSettle/param/FsSaleRevenueSettleIdParam.java

@@ -22,14 +22,14 @@ import javax.validation.constraints.NotBlank;
  * 销售收入上缴-结算信息Id参数
  *
  * @author QSHan
- * @date  2024/07/26 16:51
+ * @date  2024/07/29 15:29
  **/
 @Getter
 @Setter
 public class FsSaleRevenueSettleIdParam {
 
-    /** id */
-    @ApiModelProperty(value = "id", required = true)
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true)
     @NotBlank(message = "id不能为空")
-    private String id;
+    private Integer id;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueSettle/param/FsSaleRevenueSettlePageParam.java

@@ -22,7 +22,7 @@ import java.util.Date;
  * 销售收入上缴-结算信息查询参数
  *
  * @author QSHan
- * @date  2024/07/26 16:51
+ * @date  2024/07/29 15:29
  **/
 @Getter
 @Setter

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueSettle/service/FsSaleRevenueSettleService.java

@@ -26,7 +26,7 @@ import java.util.List;
  * 销售收入上缴-结算信息Service接口
  *
  * @author QSHan
- * @date  2024/07/26 16:51
+ * @date  2024/07/29 15:29
  **/
 public interface FsSaleRevenueSettleService extends IService<FsSaleRevenueSettle> {
 
@@ -34,7 +34,7 @@ public interface FsSaleRevenueSettleService extends IService<FsSaleRevenueSettle
      * 获取销售收入上缴-结算信息分页
      *
      * @author QSHan
-     * @date  2024/07/26 16:51
+     * @date  2024/07/29 15:29
      */
     Page<FsSaleRevenueSettle> page(FsSaleRevenueSettlePageParam fsSaleRevenueSettlePageParam);
 
@@ -42,7 +42,7 @@ public interface FsSaleRevenueSettleService extends IService<FsSaleRevenueSettle
      * 添加销售收入上缴-结算信息
      *
      * @author QSHan
-     * @date  2024/07/26 16:51
+     * @date  2024/07/29 15:29
      */
     void add(FsSaleRevenueSettleAddParam fsSaleRevenueSettleAddParam);
 
@@ -50,7 +50,7 @@ public interface FsSaleRevenueSettleService extends IService<FsSaleRevenueSettle
      * 编辑销售收入上缴-结算信息
      *
      * @author QSHan
-     * @date  2024/07/26 16:51
+     * @date  2024/07/29 15:29
      */
     void edit(FsSaleRevenueSettleEditParam fsSaleRevenueSettleEditParam);
 
@@ -58,7 +58,7 @@ public interface FsSaleRevenueSettleService extends IService<FsSaleRevenueSettle
      * 删除销售收入上缴-结算信息
      *
      * @author QSHan
-     * @date  2024/07/26 16:51
+     * @date  2024/07/29 15:29
      */
     void delete(List<FsSaleRevenueSettleIdParam> fsSaleRevenueSettleIdParamList);
 
@@ -66,7 +66,7 @@ public interface FsSaleRevenueSettleService extends IService<FsSaleRevenueSettle
      * 获取销售收入上缴-结算信息详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:51
+     * @date  2024/07/29 15:29
      */
     FsSaleRevenueSettle detail(FsSaleRevenueSettleIdParam fsSaleRevenueSettleIdParam);
 
@@ -74,7 +74,7 @@ public interface FsSaleRevenueSettleService extends IService<FsSaleRevenueSettle
      * 获取销售收入上缴-结算信息详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:51
+     * @date  2024/07/29 15:29
      **/
-    FsSaleRevenueSettle queryEntity(String id);
+    FsSaleRevenueSettle queryEntity(Integer id);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueSettle/service/impl/FsSaleRevenueSettleServiceImpl.java

@@ -38,7 +38,7 @@ import java.util.List;
  * 销售收入上缴-结算信息Service接口实现类
  *
  * @author QSHan
- * @date  2024/07/26 16:51
+ * @date  2024/07/29 15:29
  **/
 @Service
 public class FsSaleRevenueSettleServiceImpl extends ServiceImpl<FsSaleRevenueSettleMapper, FsSaleRevenueSettle> implements FsSaleRevenueSettleService {
@@ -66,6 +66,7 @@ public class FsSaleRevenueSettleServiceImpl extends ServiceImpl<FsSaleRevenueSet
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(FsSaleRevenueSettleEditParam fsSaleRevenueSettleEditParam) {
+        FsSaleRevenueSettle fsSaleRevenueSettle = this.queryEntity(fsSaleRevenueSettleEditParam.getId());
         BeanUtil.copyProperties(fsSaleRevenueSettleEditParam, fsSaleRevenueSettle);
         this.updateById(fsSaleRevenueSettle);
     }
@@ -74,14 +75,16 @@ public class FsSaleRevenueSettleServiceImpl extends ServiceImpl<FsSaleRevenueSet
     @Override
     public void delete(List<FsSaleRevenueSettleIdParam> fsSaleRevenueSettleIdParamList) {
         // 执行删除
+        this.removeByIds(CollStreamUtil.toList(fsSaleRevenueSettleIdParamList, FsSaleRevenueSettleIdParam::getId));
     }
 
     @Override
     public FsSaleRevenueSettle detail(FsSaleRevenueSettleIdParam fsSaleRevenueSettleIdParam) {
+        return this.queryEntity(fsSaleRevenueSettleIdParam.getId());
     }
 
     @Override
-    public FsSaleRevenueSettle queryEntity(String id) {
+    public FsSaleRevenueSettle queryEntity(Integer id) {
         FsSaleRevenueSettle fsSaleRevenueSettle = this.getById(id);
         if(ObjectUtil.isEmpty(fsSaleRevenueSettle)) {
             throw new CommonException("销售收入上缴-结算信息不存在，id值为：{}", id);

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistence/controller/FsSaleRevenueThreeConsistenceController.java

@@ -9,7 +9,8 @@
  * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
- */
+ *//*
+
 package com.unis.financialSupervision.modular.fsSaleRevenueThreeConsistence.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -37,12 +38,14 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 
+*/
 /**
  * 销售收入上缴-实际出库情况控制器
  *
  * @author QSHan
- * @date  2024/07/26 16:38
- */
+ * @date  2024/07/29 15:20
+ *//*
+
 @Api(tags = "销售收入上缴-实际出库情况控制器")
 @ApiSupport(author = "UNIS_TEAM", order = 1)
 @RestController
@@ -52,12 +55,14 @@ public class FsSaleRevenueThreeConsistenceController {
     @Resource
     private FsSaleRevenueThreeConsistenceService fsSaleRevenueThreeConsistenceService;
 
-    /**
+    */
+/**
      * 获取销售收入上缴-实际出库情况分页
      *
      * @author QSHan
-     * @date  2024/07/26 16:38
-     */
+     * @date  2024/07/29 15:20
+     *//*
+
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取销售收入上缴-实际出库情况分页")
     @SaCheckPermission("/financialSupervision/fsSaleRevenueThreeConsistence/page")
@@ -66,12 +71,14 @@ public class FsSaleRevenueThreeConsistenceController {
         return CommonResult.data(fsSaleRevenueThreeConsistenceService.page(fsSaleRevenueThreeConsistencePageParam));
     }
 
-    /**
+    */
+/**
      * 添加销售收入上缴-实际出库情况
      *
      * @author QSHan
-     * @date  2024/07/26 16:38
-     */
+     * @date  2024/07/29 15:20
+     *//*
+
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加销售收入上缴-实际出库情况")
     @CommonLog("添加销售收入上缴-实际出库情况")
@@ -82,12 +89,14 @@ public class FsSaleRevenueThreeConsistenceController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 编辑销售收入上缴-实际出库情况
      *
      * @author QSHan
-     * @date  2024/07/26 16:38
-     */
+     * @date  2024/07/29 15:20
+     *//*
+
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑销售收入上缴-实际出库情况")
     @CommonLog("编辑销售收入上缴-实际出库情况")
@@ -98,12 +107,14 @@ public class FsSaleRevenueThreeConsistenceController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 删除销售收入上缴-实际出库情况
      *
      * @author QSHan
-     * @date  2024/07/26 16:38
-     */
+     * @date  2024/07/29 15:20
+     *//*
+
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除销售收入上缴-实际出库情况")
     @CommonLog("删除销售收入上缴-实际出库情况")
@@ -115,12 +126,14 @@ public class FsSaleRevenueThreeConsistenceController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 获取销售收入上缴-实际出库情况详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:38
-     */
+     * @date  2024/07/29 15:20
+     *//*
+
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取销售收入上缴-实际出库情况详情")
     @SaCheckPermission("/financialSupervision/fsSaleRevenueThreeConsistence/detail")
@@ -129,3 +142,4 @@ public class FsSaleRevenueThreeConsistenceController {
         return CommonResult.data(fsSaleRevenueThreeConsistenceService.detail(fsSaleRevenueThreeConsistenceIdParam));
     }
 }
+*/

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistence/entity/FsSaleRevenueThreeConsistence.java

@@ -23,11 +23,115 @@ import java.util.Date;
  * 销售收入上缴-实际出库情况实体
  *
  * @author QSHan
- * @date  2024/07/26 16:38
+ * @date  2024/07/29 15:20
  **/
 @Getter
 @Setter
 @TableName("business_fs_sale_revenue_three_consistence")
 public class FsSaleRevenueThreeConsistence {
 
+    /** 主键ID */
+    @TableId
+    @ApiModelProperty(value = "主键ID", position = 1)
+    private Integer id;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** 年 */
+    @ApiModelProperty(value = "年", position = 7)
+    private Integer year;
+
+    /** 月份 */
+    @ApiModelProperty(value = "月份", position = 8)
+    private String month;
+
+    /** 出库情况-仓号；basic_storehouse的id；仓房id */
+    @ApiModelProperty(value = "出库情况-仓号；basic_storehouse的id；仓房id", position = 9)
+    private Integer basicStorehouseId;
+
+    /** basic_warehouse的id；货位id; */
+    @ApiModelProperty(value = "basic_warehouse的id；货位id;", position = 10)
+    private Integer warehouseId;
+
+    /** 出库情况-其中：损耗 */
+    @ApiModelProperty(value = "出库情况-其中：损耗", position = 11)
+    private BigDecimal loss;
+
+    /** 省平台修改-出库情况-其中：损耗 */
+    @ApiModelProperty(value = "省平台修改-出库情况-其中：损耗", position = 12)
+    private BigDecimal provinceLoss;
+
+    /** 出库情况-保管账数量 */
+    @ApiModelProperty(value = "出库情况-保管账数量", position = 13)
+    private BigDecimal custodyAccountQuantity;
+
+    /** 省平台修改-出库情况-保管账数量 */
+    @ApiModelProperty(value = "省平台修改-出库情况-保管账数量", position = 14)
+    private String provinceCustodyAccountQuantity;
+
+    /** 出库情况-统计账数量，单位：公斤； */
+    @ApiModelProperty(value = "出库情况-统计账数量，单位：公斤；", position = 15)
+    private BigDecimal statisticalAccountQuantity;
+
+    /** 省平台修改-出库情况-统计账数量，单位：公斤； */
+    @ApiModelProperty(value = "省平台修改-出库情况-统计账数量，单位：公斤；", position = 16)
+    private BigDecimal provinceStatisticalAccountQuantity;
+
+    /** 完成时间 */
+    @ApiModelProperty(value = "完成时间", position = 17)
+    private Date completeTime;
+
+    /** 省平台修改-完成时间 */
+    @ApiModelProperty(value = "省平台修改-完成时间", position = 18)
+    private Date provinceCompleteTime;
+
+    /** 会计账-数量，单位：公斤 */
+    @ApiModelProperty(value = "会计账-数量，单位：公斤", position = 19)
+    private BigDecimal accountingQuantity;
+
+    /** 省平台修改-会计账-数量，单位：公斤； */
+    @ApiModelProperty(value = "省平台修改-会计账-数量，单位：公斤；", position = 20)
+    private BigDecimal provinceAccountingQuantity;
+
+    /** 会计账-单价，单位：元/公斤 */
+    @ApiModelProperty(value = "会计账-单价，单位：元/公斤", position = 21)
+    private BigDecimal accountingUnitPrice;
+
+    /** 省平台修改-会计账-单价，单位：元/公斤 */
+    @ApiModelProperty(value = "省平台修改-会计账-单价，单位：元/公斤", position = 22)
+    private BigDecimal provinceAccountingUnitPrice;
+
+    /** 会计账-金额，单位：元 */
+    @ApiModelProperty(value = "会计账-金额，单位：元", position = 23)
+    private BigDecimal accountingAmount;
+
+    /** 省平台修改-会计账-金额，单位：元 */
+    @ApiModelProperty(value = "省平台修改-会计账-金额，单位：元", position = 24)
+    private BigDecimal provinceAccountingAmount;
+
+    @ApiModelProperty(value = "仓房名称")
+    @TableField(exist = false)
+    private String storehouseName;
+
+    @ApiModelProperty(value = "货位名称")
+    @TableField(exist = false)
+    private String warehouseName;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistence/enums/FsSaleRevenueThreeConsistenceEnum.java

@@ -18,7 +18,7 @@ import lombok.Getter;
  * 销售收入上缴-实际出库情况枚举
  *
  * @author QSHan
- * @date  2024/07/26 16:38
+ * @date  2024/07/29 15:20
  **/
 @Getter
 public enum FsSaleRevenueThreeConsistenceEnum {

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistence/mapper/FsSaleRevenueThreeConsistenceMapper.java

@@ -19,7 +19,7 @@ import com.unis.financialSupervision.modular.fsSaleRevenueThreeConsistence.entit
  * 销售收入上缴-实际出库情况Mapper接口
  *
  * @author QSHan
- * @date  2024/07/26 16:38
+ * @date  2024/07/29 15:20
  **/
 public interface FsSaleRevenueThreeConsistenceMapper extends BaseMapper<FsSaleRevenueThreeConsistence> {
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistence/param/FsSaleRevenueThreeConsistenceAddParam.java

@@ -25,10 +25,102 @@ import java.util.Date;
  * 销售收入上缴-实际出库情况添加参数
  *
  * @author QSHan
- * @date  2024/07/26 16:38
+ * @date  2024/07/29 15:20
  **/
 @Getter
 @Setter
 public class FsSaleRevenueThreeConsistenceAddParam {
 
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** 年 */
+    @ApiModelProperty(value = "年", position = 7)
+    private Date year;
+
+    /** 月份 */
+    @ApiModelProperty(value = "月份", position = 8)
+    private String month;
+
+    /** 出库情况-仓号；basic_storehouse的id；仓房id */
+    @ApiModelProperty(value = "出库情况-仓号；basic_storehouse的id；仓房id", position = 9)
+    private Integer basicStorehouseId;
+
+    /** basic_warehouse的id；货位id; */
+    @ApiModelProperty(value = "basic_warehouse的id；货位id;", position = 10)
+    private Integer warehouseId;
+
+    /** 出库情况-其中：损耗 */
+    @ApiModelProperty(value = "出库情况-其中：损耗", position = 11)
+    private BigDecimal loss;
+
+    /** 省平台修改-出库情况-其中：损耗 */
+    @ApiModelProperty(value = "省平台修改-出库情况-其中：损耗", position = 12)
+    private BigDecimal provinceLoss;
+
+    /** 出库情况-保管账数量 */
+    @ApiModelProperty(value = "出库情况-保管账数量", position = 13)
+    private BigDecimal custodyAccountQuantity;
+
+    /** 省平台修改-出库情况-保管账数量 */
+    @ApiModelProperty(value = "省平台修改-出库情况-保管账数量", position = 14)
+    private String provinceCustodyAccountQuantity;
+
+    /** 出库情况-统计账数量，单位：公斤； */
+    @ApiModelProperty(value = "出库情况-统计账数量，单位：公斤；", position = 15)
+    private BigDecimal statisticalAccountQuantity;
+
+    /** 省平台修改-出库情况-统计账数量，单位：公斤； */
+    @ApiModelProperty(value = "省平台修改-出库情况-统计账数量，单位：公斤；", position = 16)
+    private BigDecimal provinceStatisticalAccountQuantity;
+
+    /** 完成时间 */
+    @ApiModelProperty(value = "完成时间", position = 17)
+    private Date completeTime;
+
+    /** 省平台修改-完成时间 */
+    @ApiModelProperty(value = "省平台修改-完成时间", position = 18)
+    private Date provinceCompleteTime;
+
+    /** 会计账-数量，单位：公斤 */
+    @ApiModelProperty(value = "会计账-数量，单位：公斤", position = 19)
+    private BigDecimal accountingQuantity;
+
+    /** 省平台修改-会计账-数量，单位：公斤； */
+    @ApiModelProperty(value = "省平台修改-会计账-数量，单位：公斤；", position = 20)
+    private BigDecimal provinceAccountingQuantity;
+
+    /** 会计账-单价，单位：元/公斤 */
+    @ApiModelProperty(value = "会计账-单价，单位：元/公斤", position = 21)
+    private BigDecimal accountingUnitPrice;
+
+    /** 省平台修改-会计账-单价，单位：元/公斤 */
+    @ApiModelProperty(value = "省平台修改-会计账-单价，单位：元/公斤", position = 22)
+    private BigDecimal provinceAccountingUnitPrice;
+
+    /** 会计账-金额，单位：元 */
+    @ApiModelProperty(value = "会计账-金额，单位：元", position = 23)
+    private BigDecimal accountingAmount;
+
+    /** 省平台修改-会计账-金额，单位：元 */
+    @ApiModelProperty(value = "省平台修改-会计账-金额，单位：元", position = 24)
+    private BigDecimal provinceAccountingAmount;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistence/param/FsSaleRevenueThreeConsistenceEditParam.java

@@ -25,10 +25,107 @@ import java.util.Date;
  * 销售收入上缴-实际出库情况编辑参数
  *
  * @author QSHan
- * @date  2024/07/26 16:38
+ * @date  2024/07/29 15:20
  **/
 @Getter
 @Setter
 public class FsSaleRevenueThreeConsistenceEditParam {
 
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true, position = 1)
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** 年 */
+    @ApiModelProperty(value = "年", position = 7)
+    private Date year;
+
+    /** 月份 */
+    @ApiModelProperty(value = "月份", position = 8)
+    private String month;
+
+    /** 出库情况-仓号；basic_storehouse的id；仓房id */
+    @ApiModelProperty(value = "出库情况-仓号；basic_storehouse的id；仓房id", position = 9)
+    private Integer basicStorehouseId;
+
+    /** basic_warehouse的id；货位id; */
+    @ApiModelProperty(value = "basic_warehouse的id；货位id;", position = 10)
+    private Integer warehouseId;
+
+    /** 出库情况-其中：损耗 */
+    @ApiModelProperty(value = "出库情况-其中：损耗", position = 11)
+    private BigDecimal loss;
+
+    /** 省平台修改-出库情况-其中：损耗 */
+    @ApiModelProperty(value = "省平台修改-出库情况-其中：损耗", position = 12)
+    private BigDecimal provinceLoss;
+
+    /** 出库情况-保管账数量 */
+    @ApiModelProperty(value = "出库情况-保管账数量", position = 13)
+    private BigDecimal custodyAccountQuantity;
+
+    /** 省平台修改-出库情况-保管账数量 */
+    @ApiModelProperty(value = "省平台修改-出库情况-保管账数量", position = 14)
+    private String provinceCustodyAccountQuantity;
+
+    /** 出库情况-统计账数量，单位：公斤； */
+    @ApiModelProperty(value = "出库情况-统计账数量，单位：公斤；", position = 15)
+    private BigDecimal statisticalAccountQuantity;
+
+    /** 省平台修改-出库情况-统计账数量，单位：公斤； */
+    @ApiModelProperty(value = "省平台修改-出库情况-统计账数量，单位：公斤；", position = 16)
+    private BigDecimal provinceStatisticalAccountQuantity;
+
+    /** 完成时间 */
+    @ApiModelProperty(value = "完成时间", position = 17)
+    private Date completeTime;
+
+    /** 省平台修改-完成时间 */
+    @ApiModelProperty(value = "省平台修改-完成时间", position = 18)
+    private Date provinceCompleteTime;
+
+    /** 会计账-数量，单位：公斤 */
+    @ApiModelProperty(value = "会计账-数量，单位：公斤", position = 19)
+    private BigDecimal accountingQuantity;
+
+    /** 省平台修改-会计账-数量，单位：公斤； */
+    @ApiModelProperty(value = "省平台修改-会计账-数量，单位：公斤；", position = 20)
+    private BigDecimal provinceAccountingQuantity;
+
+    /** 会计账-单价，单位：元/公斤 */
+    @ApiModelProperty(value = "会计账-单价，单位：元/公斤", position = 21)
+    private BigDecimal accountingUnitPrice;
+
+    /** 省平台修改-会计账-单价，单位：元/公斤 */
+    @ApiModelProperty(value = "省平台修改-会计账-单价，单位：元/公斤", position = 22)
+    private BigDecimal provinceAccountingUnitPrice;
+
+    /** 会计账-金额，单位：元 */
+    @ApiModelProperty(value = "会计账-金额，单位：元", position = 23)
+    private BigDecimal accountingAmount;
+
+    /** 省平台修改-会计账-金额，单位：元 */
+    @ApiModelProperty(value = "省平台修改-会计账-金额，单位：元", position = 24)
+    private BigDecimal provinceAccountingAmount;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistence/param/FsSaleRevenueThreeConsistenceIdParam.java

@@ -22,14 +22,14 @@ import javax.validation.constraints.NotBlank;
  * 销售收入上缴-实际出库情况Id参数
  *
  * @author QSHan
- * @date  2024/07/26 16:38
+ * @date  2024/07/29 15:20
  **/
 @Getter
 @Setter
 public class FsSaleRevenueThreeConsistenceIdParam {
 
-    /** id */
-    @ApiModelProperty(value = "id", required = true)
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true)
     @NotBlank(message = "id不能为空")
-    private String id;
+    private Integer id;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistence/param/FsSaleRevenueThreeConsistencePageParam.java

@@ -22,7 +22,7 @@ import java.util.Date;
  * 销售收入上缴-实际出库情况查询参数
  *
  * @author QSHan
- * @date  2024/07/26 16:38
+ * @date  2024/07/29 15:20
  **/
 @Getter
 @Setter

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistence/service/FsSaleRevenueThreeConsistenceService.java

@@ -26,7 +26,7 @@ import java.util.List;
  * 销售收入上缴-实际出库情况Service接口
  *
  * @author QSHan
- * @date  2024/07/26 16:38
+ * @date  2024/07/29 15:20
  **/
 public interface FsSaleRevenueThreeConsistenceService extends IService<FsSaleRevenueThreeConsistence> {
 
@@ -34,7 +34,7 @@ public interface FsSaleRevenueThreeConsistenceService extends IService<FsSaleRev
      * 获取销售收入上缴-实际出库情况分页
      *
      * @author QSHan
-     * @date  2024/07/26 16:38
+     * @date  2024/07/29 15:20
      */
     Page<FsSaleRevenueThreeConsistence> page(FsSaleRevenueThreeConsistencePageParam fsSaleRevenueThreeConsistencePageParam);
 
@@ -42,7 +42,7 @@ public interface FsSaleRevenueThreeConsistenceService extends IService<FsSaleRev
      * 添加销售收入上缴-实际出库情况
      *
      * @author QSHan
-     * @date  2024/07/26 16:38
+     * @date  2024/07/29 15:20
      */
     void add(FsSaleRevenueThreeConsistenceAddParam fsSaleRevenueThreeConsistenceAddParam);
 
@@ -50,7 +50,7 @@ public interface FsSaleRevenueThreeConsistenceService extends IService<FsSaleRev
      * 编辑销售收入上缴-实际出库情况
      *
      * @author QSHan
-     * @date  2024/07/26 16:38
+     * @date  2024/07/29 15:20
      */
     void edit(FsSaleRevenueThreeConsistenceEditParam fsSaleRevenueThreeConsistenceEditParam);
 
@@ -58,7 +58,7 @@ public interface FsSaleRevenueThreeConsistenceService extends IService<FsSaleRev
      * 删除销售收入上缴-实际出库情况
      *
      * @author QSHan
-     * @date  2024/07/26 16:38
+     * @date  2024/07/29 15:20
      */
     void delete(List<FsSaleRevenueThreeConsistenceIdParam> fsSaleRevenueThreeConsistenceIdParamList);
 
@@ -66,7 +66,7 @@ public interface FsSaleRevenueThreeConsistenceService extends IService<FsSaleRev
      * 获取销售收入上缴-实际出库情况详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:38
+     * @date  2024/07/29 15:20
      */
     FsSaleRevenueThreeConsistence detail(FsSaleRevenueThreeConsistenceIdParam fsSaleRevenueThreeConsistenceIdParam);
 
@@ -74,7 +74,7 @@ public interface FsSaleRevenueThreeConsistenceService extends IService<FsSaleRev
      * 获取销售收入上缴-实际出库情况详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:38
+     * @date  2024/07/29 15:20
      **/
-    FsSaleRevenueThreeConsistence queryEntity(String id);
+    FsSaleRevenueThreeConsistence queryEntity(Integer id);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistence/service/impl/FsSaleRevenueThreeConsistenceServiceImpl.java

@@ -38,7 +38,7 @@ import java.util.List;
  * 销售收入上缴-实际出库情况Service接口实现类
  *
  * @author QSHan
- * @date  2024/07/26 16:38
+ * @date  2024/07/29 15:20
  **/
 @Service
 public class FsSaleRevenueThreeConsistenceServiceImpl extends ServiceImpl<FsSaleRevenueThreeConsistenceMapper, FsSaleRevenueThreeConsistence> implements FsSaleRevenueThreeConsistenceService {
@@ -66,6 +66,7 @@ public class FsSaleRevenueThreeConsistenceServiceImpl extends ServiceImpl<FsSale
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(FsSaleRevenueThreeConsistenceEditParam fsSaleRevenueThreeConsistenceEditParam) {
+        FsSaleRevenueThreeConsistence fsSaleRevenueThreeConsistence = this.queryEntity(fsSaleRevenueThreeConsistenceEditParam.getId());
         BeanUtil.copyProperties(fsSaleRevenueThreeConsistenceEditParam, fsSaleRevenueThreeConsistence);
         this.updateById(fsSaleRevenueThreeConsistence);
     }
@@ -74,14 +75,16 @@ public class FsSaleRevenueThreeConsistenceServiceImpl extends ServiceImpl<FsSale
     @Override
     public void delete(List<FsSaleRevenueThreeConsistenceIdParam> fsSaleRevenueThreeConsistenceIdParamList) {
         // 执行删除
+        this.removeByIds(CollStreamUtil.toList(fsSaleRevenueThreeConsistenceIdParamList, FsSaleRevenueThreeConsistenceIdParam::getId));
     }
 
     @Override
     public FsSaleRevenueThreeConsistence detail(FsSaleRevenueThreeConsistenceIdParam fsSaleRevenueThreeConsistenceIdParam) {
+        return this.queryEntity(fsSaleRevenueThreeConsistenceIdParam.getId());
     }
 
     @Override
-    public FsSaleRevenueThreeConsistence queryEntity(String id) {
+    public FsSaleRevenueThreeConsistence queryEntity(Integer id) {
         FsSaleRevenueThreeConsistence fsSaleRevenueThreeConsistence = this.getById(id);
         if(ObjectUtil.isEmpty(fsSaleRevenueThreeConsistence)) {
             throw new CommonException("销售收入上缴-实际出库情况不存在，id值为：{}", id);

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistenceAccount/controller/FsSaleRevenueThreeConsistenceAccountController.java

@@ -9,7 +9,8 @@
  * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
- */
+ *//*
+
 package com.unis.financialSupervision.modular.fsSaleRevenueThreeConsistenceAccount.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -37,12 +38,14 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 
+*/
 /**
  * 销售收入上缴-会计账控制器
  *
  * @author QSHan
- * @date  2024/07/26 16:47
- */
+ * @date  2024/07/29 15:23
+ *//*
+
 @Api(tags = "销售收入上缴-会计账控制器")
 @ApiSupport(author = "UNIS_TEAM", order = 1)
 @RestController
@@ -52,12 +55,14 @@ public class FsSaleRevenueThreeConsistenceAccountController {
     @Resource
     private FsSaleRevenueThreeConsistenceAccountService fsSaleRevenueThreeConsistenceAccountService;
 
-    /**
+    */
+/**
      * 获取销售收入上缴-会计账分页
      *
      * @author QSHan
-     * @date  2024/07/26 16:47
-     */
+     * @date  2024/07/29 15:23
+     *//*
+
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取销售收入上缴-会计账分页")
     @SaCheckPermission("/financialSupervision/fsSaleRevenueThreeConsistenceAccount/page")
@@ -66,12 +71,14 @@ public class FsSaleRevenueThreeConsistenceAccountController {
         return CommonResult.data(fsSaleRevenueThreeConsistenceAccountService.page(fsSaleRevenueThreeConsistenceAccountPageParam));
     }
 
-    /**
+    */
+/**
      * 添加销售收入上缴-会计账
      *
      * @author QSHan
-     * @date  2024/07/26 16:47
-     */
+     * @date  2024/07/29 15:23
+     *//*
+
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加销售收入上缴-会计账")
     @CommonLog("添加销售收入上缴-会计账")
@@ -82,12 +89,14 @@ public class FsSaleRevenueThreeConsistenceAccountController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 编辑销售收入上缴-会计账
      *
      * @author QSHan
-     * @date  2024/07/26 16:47
-     */
+     * @date  2024/07/29 15:23
+     *//*
+
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑销售收入上缴-会计账")
     @CommonLog("编辑销售收入上缴-会计账")
@@ -98,12 +107,14 @@ public class FsSaleRevenueThreeConsistenceAccountController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 删除销售收入上缴-会计账
      *
      * @author QSHan
-     * @date  2024/07/26 16:47
-     */
+     * @date  2024/07/29 15:23
+     *//*
+
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除销售收入上缴-会计账")
     @CommonLog("删除销售收入上缴-会计账")
@@ -115,12 +126,14 @@ public class FsSaleRevenueThreeConsistenceAccountController {
         return CommonResult.ok();
     }
 
-    /**
+    */
+/**
      * 获取销售收入上缴-会计账详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:47
-     */
+     * @date  2024/07/29 15:23
+     *//*
+
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取销售收入上缴-会计账详情")
     @SaCheckPermission("/financialSupervision/fsSaleRevenueThreeConsistenceAccount/detail")
@@ -129,3 +142,4 @@ public class FsSaleRevenueThreeConsistenceAccountController {
         return CommonResult.data(fsSaleRevenueThreeConsistenceAccountService.detail(fsSaleRevenueThreeConsistenceAccountIdParam));
     }
 }
+*/

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistenceAccount/entity/FsSaleRevenueThreeConsistenceAccount.java

@@ -23,11 +23,67 @@ import java.util.Date;
  * 销售收入上缴-会计账实体
  *
  * @author QSHan
- * @date  2024/07/26 16:47
+ * @date  2024/07/29 15:23
  **/
 @Getter
 @Setter
 @TableName("business_fs_sale_revenue_three_consistence_account")
 public class FsSaleRevenueThreeConsistenceAccount {
 
+    /** 主键ID */
+    @TableId
+    @ApiModelProperty(value = "主键ID", position = 1)
+    private Integer id;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** 年 */
+    @ApiModelProperty(value = "年", position = 7)
+    private Date year;
+
+    /** 月份 */
+    @ApiModelProperty(value = "月份", position = 8)
+    private String month;
+
+    /** 会计账-数量，单位：公斤 */
+    @ApiModelProperty(value = "会计账-数量，单位：公斤", position = 9)
+    private BigDecimal accountingQuantity;
+
+    /** 省平台修改-会计账-数量，单位：公斤； */
+    @ApiModelProperty(value = "省平台修改-会计账-数量，单位：公斤；", position = 10)
+    private BigDecimal provinceAccountingQuantity;
+
+    /** 会计账-金额，单位：元 */
+    @ApiModelProperty(value = "会计账-金额，单位：元", position = 11)
+    private BigDecimal accountingAmount;
+
+    /** 省平台修改-会计账-金额，单位：元 */
+    @ApiModelProperty(value = "省平台修改-会计账-金额，单位：元", position = 12)
+    private BigDecimal provinceAccountingAmount;
+
+    @ApiModelProperty(value = "凭证号")
+    @TableField(exist = false)
+    private String voucherNumber;
+
+    @ApiModelProperty(value = "销售单价(元）")
+    @TableField(exist = false)
+    private BigDecimal unitPrice;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistenceAccount/enums/FsSaleRevenueThreeConsistenceAccountEnum.java

@@ -18,7 +18,7 @@ import lombok.Getter;
  * 销售收入上缴-会计账枚举
  *
  * @author QSHan
- * @date  2024/07/26 16:47
+ * @date  2024/07/29 15:23
  **/
 @Getter
 public enum FsSaleRevenueThreeConsistenceAccountEnum {

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistenceAccount/mapper/FsSaleRevenueThreeConsistenceAccountMapper.java

@@ -19,7 +19,7 @@ import com.unis.financialSupervision.modular.fsSaleRevenueThreeConsistenceAccoun
  * 销售收入上缴-会计账Mapper接口
  *
  * @author QSHan
- * @date  2024/07/26 16:47
+ * @date  2024/07/29 15:23
  **/
 public interface FsSaleRevenueThreeConsistenceAccountMapper extends BaseMapper<FsSaleRevenueThreeConsistenceAccount> {
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistenceAccount/param/FsSaleRevenueThreeConsistenceAccountAddParam.java

@@ -25,10 +25,54 @@ import java.util.Date;
  * 销售收入上缴-会计账添加参数
  *
  * @author QSHan
- * @date  2024/07/26 16:47
+ * @date  2024/07/29 15:23
  **/
 @Getter
 @Setter
 public class FsSaleRevenueThreeConsistenceAccountAddParam {
 
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** 年 */
+    @ApiModelProperty(value = "年", position = 7)
+    private Date year;
+
+    /** 月份 */
+    @ApiModelProperty(value = "月份", position = 8)
+    private String month;
+
+    /** 会计账-数量，单位：公斤 */
+    @ApiModelProperty(value = "会计账-数量，单位：公斤", position = 9)
+    private BigDecimal accountingQuantity;
+
+    /** 省平台修改-会计账-数量，单位：公斤； */
+    @ApiModelProperty(value = "省平台修改-会计账-数量，单位：公斤；", position = 10)
+    private BigDecimal provinceAccountingQuantity;
+
+    /** 会计账-金额，单位：元 */
+    @ApiModelProperty(value = "会计账-金额，单位：元", position = 11)
+    private BigDecimal accountingAmount;
+
+    /** 省平台修改-会计账-金额，单位：元 */
+    @ApiModelProperty(value = "省平台修改-会计账-金额，单位：元", position = 12)
+    private BigDecimal provinceAccountingAmount;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistenceAccount/param/FsSaleRevenueThreeConsistenceAccountEditParam.java

@@ -25,10 +25,59 @@ import java.util.Date;
  * 销售收入上缴-会计账编辑参数
  *
  * @author QSHan
- * @date  2024/07/26 16:47
+ * @date  2024/07/29 15:23
  **/
 @Getter
 @Setter
 public class FsSaleRevenueThreeConsistenceAccountEditParam {
 
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true, position = 1)
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** business_fs_sale_revenue的ID */
+    @ApiModelProperty(value = "business_fs_sale_revenue的ID", position = 6)
+    private Integer fsSaleRevenueId;
+
+    /** 年 */
+    @ApiModelProperty(value = "年", position = 7)
+    private Date year;
+
+    /** 月份 */
+    @ApiModelProperty(value = "月份", position = 8)
+    private String month;
+
+    /** 会计账-数量，单位：公斤 */
+    @ApiModelProperty(value = "会计账-数量，单位：公斤", position = 9)
+    private BigDecimal accountingQuantity;
+
+    /** 省平台修改-会计账-数量，单位：公斤； */
+    @ApiModelProperty(value = "省平台修改-会计账-数量，单位：公斤；", position = 10)
+    private BigDecimal provinceAccountingQuantity;
+
+    /** 会计账-金额，单位：元 */
+    @ApiModelProperty(value = "会计账-金额，单位：元", position = 11)
+    private BigDecimal accountingAmount;
+
+    /** 省平台修改-会计账-金额，单位：元 */
+    @ApiModelProperty(value = "省平台修改-会计账-金额，单位：元", position = 12)
+    private BigDecimal provinceAccountingAmount;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistenceAccount/param/FsSaleRevenueThreeConsistenceAccountIdParam.java

@@ -22,14 +22,14 @@ import javax.validation.constraints.NotBlank;
  * 销售收入上缴-会计账Id参数
  *
  * @author QSHan
- * @date  2024/07/26 16:47
+ * @date  2024/07/29 15:23
  **/
 @Getter
 @Setter
 public class FsSaleRevenueThreeConsistenceAccountIdParam {
 
-    /** id */
-    @ApiModelProperty(value = "id", required = true)
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true)
     @NotBlank(message = "id不能为空")
-    private String id;
+    private Integer id;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistenceAccount/param/FsSaleRevenueThreeConsistenceAccountPageParam.java

@@ -22,7 +22,7 @@ import java.util.Date;
  * 销售收入上缴-会计账查询参数
  *
  * @author QSHan
- * @date  2024/07/26 16:47
+ * @date  2024/07/29 15:23
  **/
 @Getter
 @Setter

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistenceAccount/service/FsSaleRevenueThreeConsistenceAccountService.java

@@ -26,7 +26,7 @@ import java.util.List;
  * 销售收入上缴-会计账Service接口
  *
  * @author QSHan
- * @date  2024/07/26 16:47
+ * @date  2024/07/29 15:23
  **/
 public interface FsSaleRevenueThreeConsistenceAccountService extends IService<FsSaleRevenueThreeConsistenceAccount> {
 
@@ -34,7 +34,7 @@ public interface FsSaleRevenueThreeConsistenceAccountService extends IService<Fs
      * 获取销售收入上缴-会计账分页
      *
      * @author QSHan
-     * @date  2024/07/26 16:47
+     * @date  2024/07/29 15:23
      */
     Page<FsSaleRevenueThreeConsistenceAccount> page(FsSaleRevenueThreeConsistenceAccountPageParam fsSaleRevenueThreeConsistenceAccountPageParam);
 
@@ -42,7 +42,7 @@ public interface FsSaleRevenueThreeConsistenceAccountService extends IService<Fs
      * 添加销售收入上缴-会计账
      *
      * @author QSHan
-     * @date  2024/07/26 16:47
+     * @date  2024/07/29 15:23
      */
     void add(FsSaleRevenueThreeConsistenceAccountAddParam fsSaleRevenueThreeConsistenceAccountAddParam);
 
@@ -50,7 +50,7 @@ public interface FsSaleRevenueThreeConsistenceAccountService extends IService<Fs
      * 编辑销售收入上缴-会计账
      *
      * @author QSHan
-     * @date  2024/07/26 16:47
+     * @date  2024/07/29 15:23
      */
     void edit(FsSaleRevenueThreeConsistenceAccountEditParam fsSaleRevenueThreeConsistenceAccountEditParam);
 
@@ -58,7 +58,7 @@ public interface FsSaleRevenueThreeConsistenceAccountService extends IService<Fs
      * 删除销售收入上缴-会计账
      *
      * @author QSHan
-     * @date  2024/07/26 16:47
+     * @date  2024/07/29 15:23
      */
     void delete(List<FsSaleRevenueThreeConsistenceAccountIdParam> fsSaleRevenueThreeConsistenceAccountIdParamList);
 
@@ -66,7 +66,7 @@ public interface FsSaleRevenueThreeConsistenceAccountService extends IService<Fs
      * 获取销售收入上缴-会计账详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:47
+     * @date  2024/07/29 15:23
      */
     FsSaleRevenueThreeConsistenceAccount detail(FsSaleRevenueThreeConsistenceAccountIdParam fsSaleRevenueThreeConsistenceAccountIdParam);
 
@@ -74,7 +74,7 @@ public interface FsSaleRevenueThreeConsistenceAccountService extends IService<Fs
      * 获取销售收入上缴-会计账详情
      *
      * @author QSHan
-     * @date  2024/07/26 16:47
+     * @date  2024/07/29 15:23
      **/
-    FsSaleRevenueThreeConsistenceAccount queryEntity(String id);
+    FsSaleRevenueThreeConsistenceAccount queryEntity(Integer id);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistenceAccount/service/impl/FsSaleRevenueThreeConsistenceAccountServiceImpl.java

@@ -38,7 +38,7 @@ import java.util.List;
  * 销售收入上缴-会计账Service接口实现类
  *
  * @author QSHan
- * @date  2024/07/26 16:47
+ * @date  2024/07/29 15:23
  **/
 @Service
 public class FsSaleRevenueThreeConsistenceAccountServiceImpl extends ServiceImpl<FsSaleRevenueThreeConsistenceAccountMapper, FsSaleRevenueThreeConsistenceAccount> implements FsSaleRevenueThreeConsistenceAccountService {
@@ -66,6 +66,7 @@ public class FsSaleRevenueThreeConsistenceAccountServiceImpl extends ServiceImpl
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(FsSaleRevenueThreeConsistenceAccountEditParam fsSaleRevenueThreeConsistenceAccountEditParam) {
+        FsSaleRevenueThreeConsistenceAccount fsSaleRevenueThreeConsistenceAccount = this.queryEntity(fsSaleRevenueThreeConsistenceAccountEditParam.getId());
         BeanUtil.copyProperties(fsSaleRevenueThreeConsistenceAccountEditParam, fsSaleRevenueThreeConsistenceAccount);
         this.updateById(fsSaleRevenueThreeConsistenceAccount);
     }
@@ -74,14 +75,16 @@ public class FsSaleRevenueThreeConsistenceAccountServiceImpl extends ServiceImpl
     @Override
     public void delete(List<FsSaleRevenueThreeConsistenceAccountIdParam> fsSaleRevenueThreeConsistenceAccountIdParamList) {
         // 执行删除
+        this.removeByIds(CollStreamUtil.toList(fsSaleRevenueThreeConsistenceAccountIdParamList, FsSaleRevenueThreeConsistenceAccountIdParam::getId));
     }
 
     @Override
     public FsSaleRevenueThreeConsistenceAccount detail(FsSaleRevenueThreeConsistenceAccountIdParam fsSaleRevenueThreeConsistenceAccountIdParam) {
+        return this.queryEntity(fsSaleRevenueThreeConsistenceAccountIdParam.getId());
     }
 
     @Override
-    public FsSaleRevenueThreeConsistenceAccount queryEntity(String id) {
+    public FsSaleRevenueThreeConsistenceAccount queryEntity(Integer id) {
         FsSaleRevenueThreeConsistenceAccount fsSaleRevenueThreeConsistenceAccount = this.getById(id);
         if(ObjectUtil.isEmpty(fsSaleRevenueThreeConsistenceAccount)) {
             throw new CommonException("销售收入上缴-会计账不存在，id值为：{}", id);