物资明细清洗修改

ruoyi-admin/pom.xml

@@ -43,6 +43,12 @@
             <version>1.5.21</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.8</version>
+        </dependency>
+
         <!-- swagger2-UI-->
         <dependency>
             <groupId>io.springfox</groupId>

ruoyi-supplies/pom.xml

@@ -14,5 +14,9 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesCleaningRuleController.java

@@ -38,5 +38,18 @@ public class ActSuppliesCleaningRuleController extends BaseController
 
     }
 
+    /**
+     * 获取所有历史数据
+     */
+    @PreAuthorize("@ss.hasPermi('system:cleaningrule:queryAll')")
+    @GetMapping("/queryAllAcc/{tylkStatus}")
+    public AjaxResult selectActSuppliesHistorydataAcc(@PathVariable("tylkStatus") Integer tylkStatus)
+    {
+
+        List<ActSuppliesHistorydata> s = actSuppliesHistorydataService.selectActSuppliesHistorydataAcc(tylkStatus);
+        return AjaxResult.success(s);
+
+    }
+
 }
 

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesHistorydataController.java

@@ -104,7 +104,7 @@ public class ActSuppliesHistorydataController extends BaseController
     }
 
     /**
-     * 添加 历史数据
+     * 添加 通用or六矿历史数据
      */
     @PreAuthorize("@ss.hasPermi('system:historydata:addInsert')")
     @PostMapping("/addInsert")
@@ -114,6 +114,18 @@ public class ActSuppliesHistorydataController extends BaseController
         return toAjax(1);
     }
 
+
+    /**
+     * 添加 通用凭证单历史数据
+     */
+    @PreAuthorize("@ss.hasPermi('system:historydata:addInsertAccount')")
+    @PostMapping("/addInsertAccount")
+    public AjaxResult addInsertAccount(@RequestBody List<ActSuppliesHistorydata> actSuppliesHistorydata)
+    {
+        actSuppliesHistorydataService.addInsertActSuppliesHistorydataAcc(actSuppliesHistorydata);
+        return toAjax(1);
+    }
+
     /**
      * 数据清洗 六矿生成表数据
      */
@@ -139,7 +151,7 @@ public class ActSuppliesHistorydataController extends BaseController
     }
 
     /**
-     * 数据清洗 六矿生成表数据
+     * 数据清洗 凭证单六矿生成表数据
      */
     @PreAuthorize("@ss.hasPermi('system:historydata:addInsertAccount1')")
     @PostMapping("/addInsertAccount1")
@@ -150,7 +162,7 @@ public class ActSuppliesHistorydataController extends BaseController
     }
 
     /**
-     * 数据清洗 六矿导入表数据
+     * 数据清洗 凭证单六矿导入表数据
      */
     @PreAuthorize("@ss.hasPermi('system:historydata:addInsertAccount2')")
     @PostMapping("/addInsertAccount2")

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActDispensing.java

@@ -6,13 +6,22 @@ public class ActDispensing {
     private String c;
     //行
     private String r;
+    //金额
+    private String money;
     //材料分类
     private String material;
     //项目分类
     private String name;
+    //与凭证单对应关系
+    private int[] indexRow;
+
     //项目细分
     private String department;
 
+    private String accountdate;
+
+    private String accountuuid;
+
     //会计编码
     private String accountingCode;
 
@@ -134,4 +143,36 @@ public class ActDispensing {
     public void setMining(String mining) {
         this.mining = mining;
     }
+
+    public String getMoney() {
+        return money;
+    }
+
+    public void setMoney(String money) {
+        this.money = money;
+    }
+
+    public String getAccountdate() {
+        return accountdate;
+    }
+
+    public void setAccountdate(String accountdate) {
+        this.accountdate = accountdate;
+    }
+
+    public String getAccountuuid() {
+        return accountuuid;
+    }
+
+    public void setAccountuuid(String accountuuid) {
+        this.accountuuid = accountuuid;
+    }
+
+    public int[] getIndexRow() {
+        return indexRow;
+    }
+
+    public void setIndexRow(int[] indexRow) {
+        this.indexRow = indexRow;
+    }
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActOperation1.java

@@ -30,6 +30,10 @@ public class ActOperation1 extends BaseEntity {
     /** 清洗规则 */
     private String historyRole;
 
+    private String convenRole;
+
+    private String exportUuid;
+
     public String getHistoryRole() {
         return historyRole;
     }
@@ -98,4 +102,20 @@ public class ActOperation1 extends BaseEntity {
     public void setRoleId(Integer roleId) {
         this.roleId = roleId;
     }
+
+    public String getExportUuid() {
+        return exportUuid;
+    }
+
+    public void setExportUuid(String exportUuid) {
+        this.exportUuid = exportUuid;
+    }
+
+    public String getConvenRole() {
+        return convenRole;
+    }
+
+    public void setConvenRole(String convenRole) {
+        this.convenRole = convenRole;
+    }
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesHistorydata.java

@@ -36,6 +36,9 @@ public class ActSuppliesHistorydata extends BaseEntity
     @Excel(name = "导入")
     private String importUuid;
 
+    /** 通用凭证单编码*/
+    private String accountuuid;
+
     /** 规则 */
     @Excel(name = "规则")
     private Long roleId;
@@ -56,6 +59,9 @@ public class ActSuppliesHistorydata extends BaseEntity
     @Excel(name = "清洗规则")
     private String historyRole;
 
+    private String convenRole;
+
+
     /** 导入导出标识 */
     @Excel(name = "导入导出标识")
     private Long identifyingCode;
@@ -218,6 +224,22 @@ public class ActSuppliesHistorydata extends BaseEntity
         this.historyRole = historyRole;
     }
 
+    public String getAccountuuid() {
+        return accountuuid;
+    }
+
+    public void setAccountuuid(String accountuuid) {
+        this.accountuuid = accountuuid;
+    }
+
+    public String getConvenRole() {
+        return convenRole;
+    }
+
+    public void setConvenRole(String convenRole) {
+        this.convenRole = convenRole;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesImportCleaningAcc.java

+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 导入表的清晰表 act_supplies_import_cleaning
+ * 
+ * @author
+ * @date 2023-12-15
+ */
+public class ActSuppliesImportCleaningAcc extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 导入表的清洗ID */
+    @Excel(name = "导入表的清洗ID")
+    private String id;
+
+
+    /**所属规则*/
+    @Excel(name = "所属矿id",readConverterExp = "1、东欢坨矿 2、范矿 3、林西矿 4、吕矿 5、钱家营矿 6、唐山矿 7、宏丰 8、云飞 9、平安")
+    private String sskId;
+
+    /** 日期(年月)*/
+    private String hdate;
+
+    /** 历史表ID*/
+    private Long hId;
+
+    private String kmCode;
+
+    private String yyUuid;
+
+    /** 所在行*/
+    private String HeaderRow;
+    /** 物料名称*/
+    private String nameColumn;
+    /** 物料编码*/
+    private String codeColumn;
+    /** 部门*/
+    private String departmentColumn;
+    /** 数量*/
+    private String numberColumn;
+    /** 单价*/
+    private String moneyColumn;
+    /** 金额*/
+    private String moneyColumns;
+    /** 导入表内日期*/
+    private String dateColumn;
+
+    public String getKmCode() {
+        return kmCode;
+    }
+
+    public void setKmCode(String kmCode) {
+        this.kmCode = kmCode;
+    }
+
+    public String getYyUuid() {
+        return yyUuid;
+    }
+
+    public void setYyUuid(String yyUuid) {
+        this.yyUuid = yyUuid;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getHeaderRow() {
+        return HeaderRow;
+    }
+
+    public void setHeaderRow(String headerRow) {
+        HeaderRow = headerRow;
+    }
+
+    public String getSskId() {
+        return sskId;
+    }
+
+    public void setSskId(String sskId) {
+        this.sskId = sskId;
+    }
+
+    public Long gethId() {
+        return hId;
+    }
+
+    public void sethId(Long hId) {
+        this.hId = hId;
+    }
+
+    public String getHdate() {
+        return hdate;
+    }
+
+    public void setHdate(String hdate) {
+        this.hdate = hdate;
+    }
+
+    public String getMoneyColumns() {
+        return moneyColumns;
+    }
+
+    public void setMoneyColumns(String moneyColumns) {
+        this.moneyColumns = moneyColumns;
+    }
+
+    public String getNameColumn() {
+        return nameColumn;
+    }
+
+    public void setNameColumn(String nameColumn) {
+        this.nameColumn = nameColumn;
+    }
+
+    public String getCodeColumn() {
+        return codeColumn;
+    }
+
+    public void setCodeColumn(String codeColumn) {
+        this.codeColumn = codeColumn;
+    }
+
+    public String getDepartmentColumn() {
+        return departmentColumn;
+    }
+
+    public void setDepartmentColumn(String departmentColumn) {
+        this.departmentColumn = departmentColumn;
+    }
+
+    public String getNumberColumn() {
+        return numberColumn;
+    }
+
+    public void setNumberColumn(String numberColumn) {
+        this.numberColumn = numberColumn;
+    }
+
+    public String getMoneyColumn() {
+        return moneyColumn;
+    }
+
+    public void setMoneyColumn(String moneyColumn) {
+        this.moneyColumn = moneyColumn;
+    }
+
+    public String getDateColumn() {
+        return dateColumn;
+    }
+
+    public void setDateColumn(String dateColumn) {
+        this.dateColumn = dateColumn;
+    }
+
+
+    @Override
+    public String toString() {
+        return "ActSuppliesImportCleaning{" +
+                "id='" + id + '\'' +
+                ", sskId='" + sskId + '\'' +
+                ", hId='" + hId + '\'' +
+                ", nameColumn='" + nameColumn + '\'' +
+                ", codeColumn='" + codeColumn + '\'' +
+                ", departmentColumn='" + departmentColumn + '\'' +
+                ", numberColumn='" + numberColumn + '\'' +
+                ", moneyColumn='" + moneyColumn + '\'' +
+                ", dateColumn='" + dateColumn + '\'' +
+                '}';
+    }
+}

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesImportTable.java

@@ -26,6 +26,10 @@ public class ActSuppliesImportTable extends BaseEntity
     @Excel(name = "所属矿区")
     private String mining;
 
+    private String kmCode;
+
+    private String exportUuid;
+
     private String a1;
     private String a2;
     private String a3;
@@ -126,6 +130,14 @@ public class ActSuppliesImportTable extends BaseEntity
         this.mining = mining;
     }
 
+    public String getExportUuid() {
+        return exportUuid;
+    }
+
+    public void setExportUuid(String exportUuid) {
+        this.exportUuid = exportUuid;
+    }
+
     public String getA1() {
         return a1;
     }
@@ -630,6 +642,14 @@ public class ActSuppliesImportTable extends BaseEntity
         this.a63 = a63;
     }
 
+    public String getKmCode() {
+        return kmCode;
+    }
+
+    public void setKmCode(String kmCode) {
+        this.kmCode = kmCode;
+    }
+
     @Override
     public String toString() {
         return "ActSuppliesImportTable{" +

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesAccountMapper.java

@@ -26,4 +26,6 @@ public interface ActSuppliesAccountMapper
 
     public List<ActDispensing> selectActSuppliesAccpuntByCode();
 
+
+    void installSixMinTable(ActDispensing actDispensings);
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesCleaningRuleMapper.java

 package com.ruoyi.system.mapper;
 
-import com.ruoyi.system.domain.ActSuppliesHistorydata;
-import com.ruoyi.system.domain.ActSuppliesImportCleaning;
-import com.ruoyi.system.domain.ActSuppliesImportTable;
-import com.ruoyi.system.domain.ActSuppliesSixMinesSummaryTable;
+import com.ruoyi.system.domain.*;
 
 import java.util.List;
 
@@ -32,4 +29,7 @@ public interface ActSuppliesCleaningRuleMapper
 
     void addInsertConvert2(ActSuppliesImportTable actSuppliesImportTable);
 
+    void addInsertConvertAcc(ActSuppliesImportTable actSuppliesImportTable);
+
+    void addActSuppliesImportCleaningAcc(ActSuppliesImportCleaningAcc actSuppliesImportCleaningAcc);
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesHistorydataMapper.java

@@ -87,4 +87,12 @@ public interface ActSuppliesHistorydataMapper
      * @return 结果
      */
     void insertActSuppliesHistorycontent(ActSuppliesHistorydata actSuppliesHistorydata);
+
+    void insertActSuppliesHistorydataAcc(ActSuppliesHistorydata actSuppliesHistorydata1);
+
+    void insertActSuppliesHistorycontentAcc(ActSuppliesHistorydata actSuppliesHistorydata1);
+
+    void updateActSuppliesHistorydataStatusByIdAcc(Long gethId);
+
+    List<ActSuppliesHistorydata> selectActSuppliesHistorydataAcc(Integer tylkStatus);
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesHistorydataService.java

@@ -86,4 +86,8 @@ public interface IActSuppliesHistorydataService
     void addInsertImportAccpunt(List<ActOperation1> actOperation2s);
 
     void addInsertImportssAccounts(List<ActOperation1> actOperation2s);
+
+    void addInsertActSuppliesHistorydataAcc(List<ActSuppliesHistorydata> actSuppliesHistorydata);
+
+    List<ActSuppliesHistorydata> selectActSuppliesHistorydataAcc(Integer tylkStatus);
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesAccountServiceImpl.java

@@ -43,9 +43,9 @@ public class ActSuppliesAccountServiceImpl implements IActSuppliesAccountService
             actDispensing.get(i).setAccountingNameC(actDispensing.get(i).getAccountingNameC()+','+actDispensing.get(i).getAccountingIdC());
             actDispensings.add(actDispensing.get(i));
         }
+
         return actDispensings;
     }
 
 
-
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesRoleDetailServiceImpl.java

@@ -105,18 +105,26 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS
         //re:导入表的行，ce:导入表的列，se:导入表的sheet;rt:模板表的行，ct:模板表的列，st:模板表的sheet;ys:运算符
 //        String content1 = "[{\"se\":\"0\",\"re\":\""+actSuppliesRoleDetail.getDetailYH()+"\",\"ce\":\""+actSuppliesRoleDetail.getDetailYL()+"\",\"st\":\"0\",\"rt\":\""+actSuppliesRoleDetail.getDetailMH()+"\",\"ct\":\""+actSuppliesRoleDetail.getDetailML()+"\",\"ys\":\""+actSuppliesRoleDetail.getConvertStatus()+"\"}]" ;
         List<String> filteredList = new ArrayList<>();
+        String content2;
 
+        if(actSuppliesRoleDetail.getConvertStatus()==6){
+            content2="["+actSuppliesRoleDetail.getCleanIng()+"]";
+        }else {
+            for (int i =0 ;i<actSuppliesRoleDetail.getDetailMH().length; i++){
 
-        for (int i =0 ;i<actSuppliesRoleDetail.getDetailMH().length; i++){
+                filteredList.add("{\"se\":\"0\",\"re\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailYH()[i]))-1)+"\",\"ce\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailYL()[i]))-1)+"\",\"st\":\"0\",\"rt\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailMH()[i]))-1)+"\",\"ct\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailML()[i]))-1)+"\",\"ys\":\""+actSuppliesRoleDetail.getConvertStatus()+"\"}") ;
 
-            filteredList.add("{\"se\":\"0\",\"re\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailYH()[i]))-1)+"\",\"ce\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailYL()[i]))-1)+"\",\"st\":\"0\",\"rt\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailMH()[i]))-1)+"\",\"ct\":\""+(Integer.parseInt((actSuppliesRoleDetail.getDetailML()[i]))-1)+"\",\"ys\":\""+actSuppliesRoleDetail.getConvertStatus()+"\"}") ;
+            }
+
+            String content = String.join(",",filteredList);
+
+            content2 = "["+content+"]";
 
         }
 
 
-        String content = String.join(",",filteredList);
 
-        String content2 = "["+content+"]";
+
 
         actSuppliesRoleDetail.setDetailContent(content2);
         SysUser user = SecurityUtils.getLoginUser().getUser();

ruoyi-supplies/src/main/resources/mapper/system/ActClassificationMapper.xml

@@ -32,8 +32,8 @@
     </select>
 
     <select id="selectActClassificationById" parameterType="Long" resultMap="ActClassificationResult">
-        <include refid="selectActClassificationVo"/>
-        where id = #{id}
+        select a.id, a.name,a.type,a.ssk_id, a.pid, a.status, a.create_by,  a.update_by, b.name fname from act_classification  a  left join act_classification b on a.pid = b.id
+        where a.id = #{id}
     </select>
 
     <select id="savePid" parameterType="Long" resultMap="ActClassificationResult">

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesAccountMapper.xml

@@ -25,6 +25,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from act_supplies_compare where blm = 1
     </select>
 
+    <insert id="installSixMinTable" parameterType="ActDispensing" useGeneratedKeys="true" keyProperty="id">
+        insert into act_supplies_sixminessummarytable
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="hId != null">h_id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="projectName != null">project_name,</if>
+            <if test="departmentName != null">department_name,</if>
+            <if test="unit != null">unit,</if>
+            <if test="number != null">number,</if>
+            <if test="nuitPrice != null">nuit_price,</if>
+            <if test="money != null">money,</if>
+            <if test="costChannels != null">cost_channels,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="hDate != null">h_date,</if>
+            <if test="mining != null">ssk_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="accountdate != null">#{accountdate},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="projectName != null">#{projectName},</if>
+            <if test="departmentName != null">#{departmentName},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="number != null">#{number},</if>
+            <if test="nuitPrice != null">#{nuitPrice},</if>
+            <if test="money != null">#{money},</if>
+            <if test="accountuuid != null">#{accountuuid},</if>
+            <if test="mining != null">#{mining},</if>
+        </trim>
+    </insert>
+
 
 
 

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesCleaningRuleMapper.xml

@@ -228,6 +228,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
     </insert>
 
+    <insert id="addActSuppliesImportCleaningAcc" parameterType="ActSuppliesImportCleaningAcc" useGeneratedKeys="true" keyProperty="id">
+        insert into act_supplies_import_cleaning_copy1
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="hId != null">hid,</if>
+            <if test="sskId != null">ssk_id,</if>
+            <if test="hdate != null">hdate,</if>
+            <if test="kmCode != null">km_code,</if>
+            <if test="yyUuid != null">yy_uuid,</if>
+            <if test="nameColumn != null">name_column,</if>
+            <if test="codeColumn != null">code_column,</if>
+            <if test="departmentColumn != null">department_column,</if>
+            <if test="numberColumn != null">number_column,</if>
+            <if test="moneyColumns != null">money_columns,</if>
+            <if test="moneyColumn != null">money_column,</if>
+            <if test="dateColumn != null">date_column,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="hId != null">#{hId},</if>
+            <if test="sskId != null">#{sskId},</if>
+            <if test="hdate != null">#{hdate},</if>
+            <if test="kmCode != null">#{kmCode},</if>
+            <if test="yyUuid != null">#{yyUuid},</if>
+            <if test="nameColumn != null">#{nameColumn},</if>
+            <if test="codeColumn != null">#{codeColumn},</if>
+            <if test="departmentColumn != null">#{departmentColumn},</if>
+            <if test="numberColumn != null">#{numberColumn},</if>
+            <if test="moneyColumns != null">#{moneyColumns},</if>
+            <if test="moneyColumn != null">#{moneyColumn},</if>
+            <if test="dateColumn != null">#{dateColumn},</if>
+        </trim>
+    </insert>
+
     <insert id="addActSuppliesImportCleaning" parameterType="ActSuppliesImportCleaning" useGeneratedKeys="true" keyProperty="id">
         insert into act_supplies_import_cleaning
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -559,6 +593,154 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteActSuppliesImportTable" parameterType="Long">
         delete from act_supplies_import_table where h_id = #{id}
     </delete>
+
+
+    <insert id="addInsertConvertAcc" parameterType="ActSuppliesImportTable" useGeneratedKeys="true" keyProperty="id">
+        insert into act_supplies_import_table_copy1
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="hId != null">h_id,</if>
+            <if test="hDate != null">h_date,</if>
+            <if test="mining != null">ssk_id,</if>
+            <if test="exportUuid != null">yy_uuid,</if>
+            <if test="kmCode != null">km_code,</if>
+            <if test="a1 != null">a1,</if>
+            <if test="a2 != null">a2,</if>
+            <if test="a3 != null">a3,</if>
+            <if test="a4 != null">a4,</if>
+            <if test="a5 != null">a5,</if>
+            <if test="a6 != null">a6,</if>
+            <if test="a7 != null">a7,</if>
+            <if test="a8 != null">a8,</if>
+            <if test="a9 != null">a9,</if>
+            <if test="a10 != null">a10,</if>
+            <if test="a11 != null">a11,</if>
+            <if test="a12 != null">a12,</if>
+            <if test="a13 != null">a13,</if>
+            <if test="a14 != null">a14,</if>
+            <if test="a15 != null">a15,</if>
+            <if test="a16 != null">a16,</if>
+            <if test="a17 != null">a17,</if>
+            <if test="a18 != null">a18,</if>
+            <if test="a19 != null">a19,</if>
+            <if test="a20 != null">a20,</if>
+            <if test="a21 != null">a21,</if>
+            <if test="a22 != null">a22,</if>
+            <if test="a23 != null">a23,</if>
+            <if test="a24 != null">a24,</if>
+            <if test="a25 != null">a25,</if>
+            <if test="a26 != null">a26,</if>
+            <if test="a27 != null">a27,</if>
+            <if test="a28 != null">a28,</if>
+            <if test="a29 != null">a29,</if>
+            <if test="a30 != null">a30,</if>
+            <if test="a31 != null">a31,</if>
+            <if test="a32 != null">a32,</if>
+            <if test="a33 != null">a33,</if>
+            <if test="a34 != null">a34,</if>
+            <if test="a35 != null">a35,</if>
+            <if test="a36 != null">a36,</if>
+            <if test="a37 != null">a37,</if>
+            <if test="a38 != null">a38,</if>
+            <if test="a39 != null">a39,</if>
+            <if test="a40 != null">a40,</if>
+            <if test="a41 != null">a41,</if>
+            <if test="a42 != null">a42,</if>
+            <if test="a43 != null">a43,</if>
+            <if test="a44 != null">a44,</if>
+            <if test="a45 != null">a45,</if>
+            <if test="a46 != null">a46,</if>
+            <if test="a47 != null">a47,</if>
+            <if test="a48 != null">a48,</if>
+            <if test="a49 != null">a49,</if>
+            <if test="a50 != null">a50,</if>
+            <if test="a51 != null">a51,</if>
+            <if test="a52 != null">a52,</if>
+            <if test="a53 != null">a53,</if>
+            <if test="a54 != null">a54,</if>
+            <if test="a55 != null">a55,</if>
+            <if test="a56 != null">a56,</if>
+            <if test="a57 != null">a57,</if>
+            <if test="a58 != null">a58,</if>
+            <if test="a59 != null">a59,</if>
+            <if test="a60 != null">a60,</if>
+            <if test="a61 != null">a61,</if>
+            <if test="a62 != null">a62,</if>
+            <if test="a63 != null">a63,</if>
+
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="hId != null">#{hId},</if>
+            <if test="hDate != null">#{hDate},</if>
+            <if test="mining != null">#{mining},</if>
+            <if test="exportUuid != null">#{exportUuid},</if>
+            <if test="kmCode != null">#{kmCode},</if>
+            <if test="a1 != null">#{a1},</if>
+            <if test="a2 != null">#{a2},</if>
+            <if test="a3 != null">#{a3},</if>
+            <if test="a4 != null">#{a4},</if>
+            <if test="a5 != null">#{a5},</if>
+            <if test="a6 != null">#{a6},</if>
+            <if test="a7 != null">#{a7},</if>
+            <if test="a8 != null">#{a8},</if>
+            <if test="a9 != null">#{a9},</if>
+            <if test="a10 != null">#{a10},</if>
+            <if test="a11 != null">#{a11},</if>
+            <if test="a12 != null">#{a12},</if>
+            <if test="a13 != null">#{a13},</if>
+            <if test="a14 != null">#{a14},</if>
+            <if test="a15 != null">#{a15},</if>
+            <if test="a16 != null">#{a16},</if>
+            <if test="a17 != null">#{a17},</if>
+            <if test="a18 != null">#{a18},</if>
+            <if test="a19 != null">#{a19},</if>
+            <if test="a20 != null">#{a20},</if>
+            <if test="a21 != null">#{a21},</if>
+            <if test="a22 != null">#{a22},</if>
+            <if test="a23 != null">#{a23},</if>
+            <if test="a24 != null">#{a24},</if>
+            <if test="a25 != null">#{a25},</if>
+            <if test="a26 != null">#{a26},</if>
+            <if test="a27 != null">#{a27},</if>
+            <if test="a28 != null">#{a28},</if>
+            <if test="a29 != null">#{a29},</if>
+            <if test="a30 != null">#{a30},</if>
+            <if test="a31 != null">#{a31},</if>
+            <if test="a32 != null">#{a32},</if>
+            <if test="a33 != null">#{a33},</if>
+            <if test="a34 != null">#{a34},</if>
+            <if test="a35 != null">#{a35},</if>
+            <if test="a36 != null">#{a36},</if>
+            <if test="a37 != null">#{a37},</if>
+            <if test="a38 != null">#{a38},</if>
+            <if test="a39 != null">#{a39},</if>
+            <if test="a40 != null">#{a40},</if>
+            <if test="a41 != null">#{a41},</if>
+            <if test="a42 != null">#{a42},</if>
+            <if test="a43 != null">#{a43},</if>
+            <if test="a44 != null">#{a44},</if>
+            <if test="a45 != null">#{a45},</if>
+            <if test="a46 != null">#{a46},</if>
+            <if test="a47 != null">#{a47},</if>
+            <if test="a48 != null">#{a48},</if>
+            <if test="a49 != null">#{a49},</if>
+            <if test="a50 != null">#{a50},</if>
+            <if test="a51 != null">#{a51},</if>
+            <if test="a52 != null">#{a52},</if>
+            <if test="a53 != null">#{a53},</if>
+            <if test="a54 != null">#{a54},</if>
+            <if test="a55 != null">#{a55},</if>
+            <if test="a56 != null">#{a56},</if>
+            <if test="a57 != null">#{a57},</if>
+            <if test="a58 != null">#{a58},</if>
+            <if test="a59 != null">#{a59},</if>
+            <if test="a60 != null">#{a60},</if>
+            <if test="a61 != null">#{a61},</if>
+            <if test="a62 != null">#{a62},</if>
+            <if test="a63 != null">#{a63},</if>
+        </trim>
+    </insert>
 </mapper>
 
 

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesHistorydataMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="roleId"    column="role_id"    />
         <result property="historyName"    column="history_name"    />
         <result property="historyRole"    column="history_role"    />
+        <result property="convenRole"    column="conven_role"    />
         <result property="historyContent"    column="history_content"    />
         <result property="identifyingCode"    column="identifying_code"    />
         <result property="cleanStatus"    column="clean_status"    />
@@ -90,6 +91,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
     </insert>
 
+    <insert id="insertActSuppliesHistorydataAcc" parameterType="ActSuppliesHistorydata" useGeneratedKeys="true" keyProperty="id">
+        insert into act_supplies_historydata_copy1
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="importUuid != null">import_uuid,</if>
+            <if test="templateId != null">template_id,</if>
+            <if test="exportUuid != null">export_uuid,</if>
+            <if test="roleId != null">role_id,</if>
+            <if test="historyName != null">history_name,</if>
+            <if test="historyRole != null">history_role,</if>
+            <if test="convenRole != null">conven_role,</if>
+            <if test="identifyingCode != null">identifying_code,</if>
+            clean_status,
+            <if test="tylkStatus != null">tylk_status,</if>
+            <if test="status != null">status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="date != null">date,</if>
+            <if test="mining != null">ssk_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="importUuid != null">#{importUuid},</if>
+            <if test="templateId != null">#{templateId},</if>
+            <if test="exportUuid != null">#{exportUuid},</if>
+            <if test="roleId != null">#{roleId},</if>
+            <if test="historyName != null">#{historyName},</if>
+            <if test="historyRole != null">#{historyRole},</if>
+            <if test="convenRole != null">#{convenRole},</if>
+            <if test="identifyingCode != null">#{identifyingCode},</if>
+            0,
+            <if test="tylkStatus != null">#{tylkStatus},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="date != null">#{date},</if>
+            <if test="mining != null">#{mining},</if>
+        </trim>
+    </insert>
+
     <insert id="insertActSuppliesHistorycontent" parameterType="ActSuppliesHistorydata" useGeneratedKeys="true" keyProperty="id">
         insert into act_supplies_historycontent
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -102,6 +141,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
     </insert>
 
+    <insert id="insertActSuppliesHistorycontentAcc" parameterType="ActSuppliesHistorydata" useGeneratedKeys="true" keyProperty="id">
+        insert into act_supplies_historycontent_copy1
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="importUuid != null">hid,</if>
+            <if test="historyContent != null">history_content,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="importUuid != null">#{importUuid},</if>
+            <if test="historyContent != null">#{historyContent},</if>
+        </trim>
+    </insert>
+
     <update id="updateActSuppliesHistorydata" parameterType="ActSuppliesHistorydata">
         update act_supplies_historydata
         <trim prefix="SET" suffixOverrides=",">
@@ -183,6 +234,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where t1.clean_status = 0 and t1.tylk_status =#{tylkStatus}
     </select>
 
+    <select id="selectActSuppliesHistorydataAcc" parameterType="java.lang.Integer"  resultMap="ActSuppliesHistorydataResult">
+        SELECT t1.id,t1.import_uuid, t1.template_id, t1.export_uuid, t1.role_id, t1.history_name, t1.history_role,t1.conven_role,t2.history_content, t1.identifying_code, t1.status, t1.create_by, t1.create_time,t1.date,t1.ssk_id
+        FROM act_supplies_historydata_copy1 t1
+        LEFT JOIN act_supplies_historycontent_copy1 t2 ON t1.import_uuid = t2.hid
+        where t1.clean_status = 0 and t1.tylk_status =#{tylkStatus}
+    </select>
+
     <update id="updateActSuppliesHistorydataStatusById" parameterType="java.lang.Long">
         update act_supplies_historydata
         set clean_status = 1
@@ -190,6 +248,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gethId != null">and id = #{gethId}</if>
         </where>
     </update>
+
+    <update id="updateActSuppliesHistorydataStatusByIdAcc" parameterType="java.lang.Long">
+        update act_supplies_historydata_copy1
+        set clean_status = 1
+        <where>
+            <if test="gethId != null">and id = #{gethId}</if>
+        </where>
+    </update>
 </mapper>
 
 

ruoyi-ui/src/api/Actsupplies/cleaning_rule.js

@@ -9,6 +9,14 @@ export function selectActSuppliesHistorydata(tylkStatus) {
   })
 }
 
+// 查询通用凭证单表数据
+export function selectActSuppliesHistorydataAcc(tylkStatus) {
+    return request({
+        url: '/system/cleaningrule/queryAllAcc/'+tylkStatus,
+        method: 'get'
+
+    })
+}
 
 
 

ruoyi-ui/src/api/ruoyi-myLuckyexcel/myluckyexcel.js

 import request from '@/utils/request'
 import LuckyExcel from "luckyexcel";
-
+//查询6矿物聊
+export function materialListPZ() {
+    return request({
+        url: '/ActSuppliesDetails/ActSuppliesDetails/materialListPZ' ,
+        method: 'get'
+    })
+}
 
 //小物料转大物料
 export function materialConvert(data) {
-  return request({
-    url: '/ActSuppliesConvert/ActSuppliesConvert/converSupplies',
-    method: 'post',
-    data: data
-  })
+    return request({
+        url: '/ActSuppliesConvert/ActSuppliesConvert/converSupplies',
+        method: 'post',
+        data: data
+    })
 }
 // 查询Excel模板列表
 export function listSuppliesTemplate(query) {
-  return request({
-    url: '/SuppliesTemplate/SuppliesTemplate/list',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: '/SuppliesTemplate/SuppliesTemplate/list',
+        method: 'get',
+        params: query
+    })
 }
 
 // 查询导入规则列表
@@ -34,21 +40,36 @@ export function getSuppliesrole(id) {
         method: 'get'
     })
 }
+//按照矿的id去查部门分类
 
+export function department(sskId){
+    return request({
+        url: `/ActClassification/ActClassification/SunDy/${sskId}`,
+        method: 'get'
+    })
+}
+//获取到会计科目编码
+export function accountingcode(newData){
+    return request({
+        url: `/ActSuppliesAccount/ActSuppliesAccount/options`,
+        method: 'post',
+        data: newData
+    })
+}
 //展示excel模板
 export function listSuppliesTemplateId(id) {
-  return request({
-    url: '/SuppliesTemplate/SuppliesTemplate/listId/' + id,
-    method: 'get'
-  })
+    return request({
+        url: '/SuppliesTemplate/SuppliesTemplate/listId/' + id,
+        method: 'get'
+    })
 }
 
 // 查询Excel模板详细
 export function getSuppliesTemplate(id) {
-  return request({
-    url: '/SuppliesTemplate/SuppliesTemplate/' + id,
-    method: 'get'
-  })
+    return request({
+        url: '/SuppliesTemplate/SuppliesTemplate/' + id,
+        method: 'get'
+    })
 }
 
 // 修改导入规则
@@ -62,23 +83,23 @@ export function updateSuppliesrole(id) {
 
 // 新增Excel模板
 export function addSuppliesTemplate(data) {
-  return request({
-    url: '/SuppliesTemplate/SuppliesTemplate',
-    headers:{
-      repeatSubmit:false
-    },
-    method: 'post',
-    data: data
-  })
+    return request({
+        url: '/SuppliesTemplate/SuppliesTemplate',
+        headers:{
+            repeatSubmit:false
+        },
+        method: 'post',
+        data: data
+    })
 }
 
 // 修改Excel模板
 export function updateSuppliesTemplate(data) {
-  return request({
-    url: '/SuppliesTemplate/SuppliesTemplate',
-    method: 'put',
-    data: data
-  })
+    return request({
+        url: '/SuppliesTemplate/SuppliesTemplate',
+        method: 'put',
+        data: data
+    })
 }
 
 export function releaseTemplateStatus(id){
@@ -104,123 +125,123 @@ export function CopyTemplate(id){
 
 // 删除Excel模板
 export function delSuppliesTemplate(id) {
-  return request({
-    url: '/SuppliesTemplate/SuppliesTemplate/' + id,
-    method: 'delete'
-  })
+    return request({
+        url: '/SuppliesTemplate/SuppliesTemplate/' + id,
+        method: 'delete'
+    })
 }
 
 // 展示Excel模板
 export function delSuppliesSave(id) {
-  return request({
-    url: '/SuppliesTemplate/SuppliesTemplate/save/' + id,
-    method: 'get'
-  })
+    return request({
+        url: '/SuppliesTemplate/SuppliesTemplate/save/' + id,
+        method: 'get'
+    })
 }
 
 //启用
 export function toggleEnable(id) {
-  return request({
-    url: '/SuppliesTemplate/SuppliesTemplate/enable/' +id,
-    method: 'get',
+    return request({
+        url: '/SuppliesTemplate/SuppliesTemplate/enable/' +id,
+        method: 'get',
 
-  })
+    })
 }
 //禁用
 export function toggleDisable(id) {
-  return request({
-    url: '/SuppliesTemplate/SuppliesTemplate/disable/' + id,
-    method: 'get',
-  })
+    return request({
+        url: '/SuppliesTemplate/SuppliesTemplate/disable/' + id,
+        method: 'get',
+    })
 }
 
 
 export function findName(name) {
-  return request({
-    url: '/SuppliesTemplate/SuppliesTemplate/ifName/' + name,
-    method: 'get'
-  })
+    return request({
+        url: '/SuppliesTemplate/SuppliesTemplate/ifName/' + name,
+        method: 'get'
+    })
 }
 
 
 // 模板转换页面查询规则对应用友物料名称
 export function getSuppliesName(name) {
-  return request({
-    url: '/ActSuppliesConvert/ActSuppliesConvert/saveSuppliesname/' + name,
-    method: 'get'
-  })
+    return request({
+        url: '/ActSuppliesConvert/ActSuppliesConvert/saveSuppliesname/' + name,
+        method: 'get'
+    })
 }
 
 
 // 模板转换页面查询Excel模板列表
 export function templateList(query) {
-  return request({
-    url: '/ActSuppliesConvert/ActSuppliesConvert/list',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: '/ActSuppliesConvert/ActSuppliesConvert/list',
+        method: 'get',
+        params: query
+    })
 }
 // 模板转换页面查询Excel模板内容列表
 export function templateListid(id) {
-  return request({
-    url: '/ActSuppliesConvert/ActSuppliesConvert/listid/' + id,
-    method: 'get'
-  })
+    return request({
+        url: '/ActSuppliesConvert/ActSuppliesConvert/listid/' + id,
+        method: 'get'
+    })
 }
 // 模板转换页面查询规则列表
 export function roleList(id) {
-  return request({
-    url: '/ActSuppliesConvert/ActSuppliesConvert/rolelist/' + id,
-    method: 'get'
-  })
+    return request({
+        url: '/ActSuppliesConvert/ActSuppliesConvert/rolelist/' + id,
+        method: 'get'
+    })
 }
 // 模板转换页面查询规则详情列表
 export function roleListid(id) {
-  return request({
-    url: '/ActSuppliesConvert/ActSuppliesConvert/rolelistid/' + id,
-    method: 'get'
-  })
+    return request({
+        url: '/ActSuppliesConvert/ActSuppliesConvert/rolelistid/' + id,
+        method: 'get'
+    })
 }
 
 
 // 查询规则列表
 export function listRule(query) {
-  return request({
-    url: '/system/ruleManagement/list',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: '/system/ruleManagement/list',
+        method: 'get',
+        params: query
+    })
 }
 // 查询规则详情详细
 export function getRule(id) {
-  return request({
-    url: '/system/ruleManagement/' + id,
-    method: 'get'
-  })
+    return request({
+        url: '/system/ruleManagement/' + id,
+        method: 'get'
+    })
 }
 // 新增规则详情
 export function addRuleManagement(data) {
-  return request({
-    url: '/system/ruleManagement/add',
-    method: 'post',
-    data: data
-  })
+    return request({
+        url: '/system/ruleManagement/add',
+        method: 'post',
+        data: data
+    })
 }
 
 // 修改规则详情
 export function updateRuleManagement(data) {
-  return request({
-    url: '/system/ruleManagement/edit',
-    method: 'put',
-    data: data
-  })
+    return request({
+        url: '/system/ruleManagement/edit',
+        method: 'put',
+        data: data
+    })
 }
 // 删除规则详情
 export function delRuleManagement(id) {
-  return request({
-    url: '/system/ruleManagement/' + id,
-    method: 'delete'
-  })
+    return request({
+        url: '/system/ruleManagement/' + id,
+        method: 'delete'
+    })
 }
 
 //查询六矿物料
@@ -231,13 +252,7 @@ export function materialList() {
     })
 }
 
-//查询六矿物料
-export function materialListPZ() {
-    return request({
-        url: '/ActSuppliesDetails/ActSuppliesDetails/materialListPZ' ,
-        method: 'get'
-    })
-}
+
 
 
 // // 查询模板列表

ruoyi-ui/src/api/system/historydata.js

@@ -108,7 +108,6 @@ export function addInsertAccount1(data) {
     })
 }
 //清洗通用凭证单
-
 export function addInsertAccount2(data) {
     return request({
         url: '/system/historydata/addInsertAccount2',
@@ -116,3 +115,6 @@ export function addInsertAccount2(data) {
         data: data
     })
 }
+
+
+

ruoyi-ui/src/utils/request.js

@@ -10,7 +10,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 100000
+  timeout: 1000000000
 })
 // request拦截器
 service.interceptors.request.use(config => {