Skip to content

K
klck
Commit 19c6fd0a authored by lvzhuangzhuang's avatar lvzhuangzhuang
Browse files
Options

1

parent 737d66cf
Show whitespace changes
Inline Side-by-side
Showing with 1532 additions and 25 deletions
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesCleaningRuleController.java
View file @ 19c6fd0a
...@@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController; ...@@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.ActSuppliesHistorydata; import com.ruoyi.system.domain.ActSuppliesHistorydata;
import com.ruoyi.system.domain.ActSuppliesImportTable;
import com.ruoyi.system.domain.ActSuppliesSixMinesSummaryTable; import com.ruoyi.system.domain.ActSuppliesSixMinesSummaryTable;
import com.ruoyi.system.service.IActSuppliesCleaningRuleService; import com.ruoyi.system.service.IActSuppliesCleaningRuleService;
import com.ruoyi.system.service.IActSuppliesHistorydataService; import com.ruoyi.system.service.IActSuppliesHistorydataService;
...@@ -44,7 +45,7 @@ public class ActSuppliesCleaningRuleController extends BaseController ...@@ -44,7 +45,7 @@ public class ActSuppliesCleaningRuleController extends BaseController
} }
/** /**
* 新增 * 新增生成表
*/ */
@PreAuthorize("@ss.hasPermi('system:cleaningrule:addActSuppliesSixMinesSummaryTable')") @PreAuthorize("@ss.hasPermi('system:cleaningrule:addActSuppliesSixMinesSummaryTable')")
@Log(title = " 六矿数据汇总", businessType = BusinessType.INSERT) @Log(title = " 六矿数据汇总", businessType = BusinessType.INSERT)
...@@ -56,5 +57,20 @@ public class ActSuppliesCleaningRuleController extends BaseController ...@@ -56,5 +57,20 @@ public class ActSuppliesCleaningRuleController extends BaseController
return toAjax(i); return toAjax(i);
} }
/**
* 新增导入表
*/
@PreAuthorize("@ss.hasPermi('system:cleaningrule:addActSuppliesImportTable')")
@Log(title = " 新增导入表", businessType = BusinessType.INSERT)
@PostMapping("/addActSuppliesImportTable")
public AjaxResult addActSuppliesImportTable(@RequestBody ActSuppliesImportTable actSuppliesImportTable)
{
/*@RequestBody ActSuppliesImportTable actSuppliesImportTable*/
int i = actSuppliesCleaningRuleService.addActSuppliesImportTable(actSuppliesImportTable);
int j = actSuppliesHistorydataService.updateActSuppliesHistorydataStatusById(actSuppliesImportTable.gethId());
return toAjax(i);
}
} }
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesImportTable.java 0 → 100644
View file @ 19c6fd0a
package com.ruoyi.system.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 导入表 act_supplies_import_table
*
* @author
* @date 2023-09-26
*/
public class ActSuppliesImportTable extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
private Long id;
/** 历史数据id */
private Long hId;
/** 日期 */
@Excel(name = "日期")
private String hDate;
/** 所属矿区 */
@Excel(name = "所属矿区")
private String mining;
private String a1;
private String a2;
private String a3;
private String a4;
private String a5;
private String a6;
private String a7;
private String a8;
private String a9;
private String a10;
private String a11;
private String a12;
private String a13;
private String a14;
private String a15;
private String a16;
private String a17;
private String a18;
private String a19;
private String a20;
private String a21;
private String a22;
private String a23;
private String a24;
private String a25;
private String a26;
private String a27;
private String a28;
private String a29;
private String a30;
private String a31;
private String a32;
private String a33;
private String a34;
private String a35;
private String a36;
private String a37;
private String a38;
private String a39;
private String a40;
private String a41;
private String a42;
private String a43;
private String a44;
private String a45;
private String a46;
private String a47;
private String a48;
private String a49;
private String a50;
private String a51;
private String a52;
private String a53;
private String a54;
private String a55;
private String a56;
private String a57;
private String a58;
private String a59;
private String a60;
private String a61;
private String a62;
private String a63;
public static long getSerialVersionUID() {
return serialVersionUID;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
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 getMining() {
return mining;
}
public void setMining(String mining) {
this.mining = mining;
}
public String getA1() {
return a1;
}
public void setA1(String a1) {
this.a1 = a1;
}
public String getA2() {
return a2;
}
public void setA2(String a2) {
this.a2 = a2;
}
public String getA3() {
return a3;
}
public void setA3(String a3) {
this.a3 = a3;
}
public String getA4() {
return a4;
}
public void setA4(String a4) {
this.a4 = a4;
}
public String getA5() {
return a5;
}
public void setA5(String a5) {
this.a5 = a5;
}
public String getA6() {
return a6;
}
public void setA6(String a6) {
this.a6 = a6;
}
public String getA7() {
return a7;
}
public void setA7(String a7) {
this.a7 = a7;
}
public String getA8() {
return a8;
}
public void setA8(String a8) {
this.a8 = a8;
}
public String getA9() {
return a9;
}
public void setA9(String a9) {
this.a9 = a9;
}
public String getA10() {
return a10;
}
public void setA10(String a10) {
this.a10 = a10;
}
public String getA11() {
return a11;
}
public void setA11(String a11) {
this.a11 = a11;
}
public String getA12() {
return a12;
}
public void setA12(String a12) {
this.a12 = a12;
}
public String getA13() {
return a13;
}
public void setA13(String a13) {
this.a13 = a13;
}
public String getA14() {
return a14;
}
public void setA14(String a14) {
this.a14 = a14;
}
public String getA15() {
return a15;
}
public void setA15(String a15) {
this.a15 = a15;
}
public String getA16() {
return a16;
}
public void setA16(String a16) {
this.a16 = a16;
}
public String getA17() {
return a17;
}
public void setA17(String a17) {
this.a17 = a17;
}
public String getA18() {
return a18;
}
public void setA18(String a18) {
this.a18 = a18;
}
public String getA19() {
return a19;
}
public void setA19(String a19) {
this.a19 = a19;
}
public String getA20() {
return a20;
}
public void setA20(String a20) {
this.a20 = a20;
}
public String getA21() {
return a21;
}
public void setA21(String a21) {
this.a21 = a21;
}
public String getA22() {
return a22;
}
public void setA22(String a22) {
this.a22 = a22;
}
public String getA23() {
return a23;
}
public void setA23(String a23) {
this.a23 = a23;
}
public String getA24() {
return a24;
}
public void setA24(String a24) {
this.a24 = a24;
}
public String getA25() {
return a25;
}
public void setA25(String a25) {
this.a25 = a25;
}
public String getA26() {
return a26;
}
public void setA26(String a26) {
this.a26 = a26;
}
public String getA27() {
return a27;
}
public void setA27(String a27) {
this.a27 = a27;
}
public String getA28() {
return a28;
}
public void setA28(String a28) {
this.a28 = a28;
}
public String getA29() {
return a29;
}
public void setA29(String a29) {
this.a29 = a29;
}
public String getA30() {
return a30;
}
public void setA30(String a30) {
this.a30 = a30;
}
public String getA31() {
return a31;
}
public void setA31(String a31) {
this.a31 = a31;
}
public String getA32() {
return a32;
}
public void setA32(String a32) {
this.a32 = a32;
}
public String getA33() {
return a33;
}
public void setA33(String a33) {
this.a33 = a33;
}
public String getA34() {
return a34;
}
public void setA34(String a34) {
this.a34 = a34;
}
public String getA35() {
return a35;
}
public void setA35(String a35) {
this.a35 = a35;
}
public String getA36() {
return a36;
}
public void setA36(String a36) {
this.a36 = a36;
}
public String getA37() {
return a37;
}
public void setA37(String a37) {
this.a37 = a37;
}
public String getA38() {
return a38;
}
public void setA38(String a38) {
this.a38 = a38;
}
public String getA39() {
return a39;
}
public void setA39(String a39) {
this.a39 = a39;
}
public String getA40() {
return a40;
}
public void setA40(String a40) {
this.a40 = a40;
}
public String getA41() {
return a41;
}
public void setA41(String a41) {
this.a41 = a41;
}
public String getA42() {
return a42;
}
public void setA42(String a42) {
this.a42 = a42;
}
public String getA43() {
return a43;
}
public void setA43(String a43) {
this.a43 = a43;
}
public String getA44() {
return a44;
}
public void setA44(String a44) {
this.a44 = a44;
}
public String getA45() {
return a45;
}
public void setA45(String a45) {
this.a45 = a45;
}
public String getA46() {
return a46;
}
public void setA46(String a46) {
this.a46 = a46;
}
public String getA47() {
return a47;
}
public void setA47(String a47) {
this.a47 = a47;
}
public String getA48() {
return a48;
}
public void setA48(String a48) {
this.a48 = a48;
}
public String getA49() {
return a49;
}
public void setA49(String a49) {
this.a49 = a49;
}
public String getA50() {
return a50;
}
public void setA50(String a50) {
this.a50 = a50;
}
public String getA51() {
return a51;
}
public void setA51(String a51) {
this.a51 = a51;
}
public String getA52() {
return a52;
}
public void setA52(String a52) {
this.a52 = a52;
}
public String getA53() {
return a53;
}
public void setA53(String a53) {
this.a53 = a53;
}
public String getA54() {
return a54;
}
public void setA54(String a54) {
this.a54 = a54;
}
public String getA55() {
return a55;
}
public void setA55(String a55) {
this.a55 = a55;
}
public String getA56() {
return a56;
}
public void setA56(String a56) {
this.a56 = a56;
}
public String getA57() {
return a57;
}
public void setA57(String a57) {
this.a57 = a57;
}
public String getA58() {
return a58;
}
public void setA58(String a58) {
this.a58 = a58;
}
public String getA59() {
return a59;
}
public void setA59(String a59) {
this.a59 = a59;
}
public String getA60() {
return a60;
}
public void setA60(String a60) {
this.a60 = a60;
}
public String getA61() {
return a61;
}
public void setA61(String a61) {
this.a61 = a61;
}
public String getA62() {
return a62;
}
public void setA62(String a62) {
this.a62 = a62;
}
public String getA63() {
return a63;
}
public void setA63(String a63) {
this.a63 = a63;
}
@Override
public String toString() {
return "ActSuppliesImportTable{" +
"id=" + id +
", hId=" + hId +
", hDate='" + hDate + '\'' +
", mining='" + mining + '\'' +
", a1='" + a1 + '\'' +
", a2='" + a2 + '\'' +
", a3='" + a3 + '\'' +
", a4='" + a4 + '\'' +
", a5='" + a5 + '\'' +
", a6='" + a6 + '\'' +
", a7='" + a7 + '\'' +
", a8='" + a8 + '\'' +
", a9='" + a9 + '\'' +
", a10='" + a10 + '\'' +
", a11='" + a11 + '\'' +
", a12='" + a12 + '\'' +
", a13='" + a13 + '\'' +
", a14='" + a14 + '\'' +
", a15='" + a15 + '\'' +
", a16='" + a16 + '\'' +
", a17='" + a17 + '\'' +
", a18='" + a18 + '\'' +
", a19='" + a19 + '\'' +
", a20='" + a20 + '\'' +
", a21='" + a21 + '\'' +
", a22='" + a22 + '\'' +
", a23='" + a23 + '\'' +
", a24='" + a24 + '\'' +
", a25='" + a25 + '\'' +
", a26='" + a26 + '\'' +
", a27='" + a27 + '\'' +
", a28='" + a28 + '\'' +
", a29='" + a29 + '\'' +
", a30='" + a30 + '\'' +
", a31='" + a31 + '\'' +
", a32='" + a32 + '\'' +
", a33='" + a33 + '\'' +
", a34='" + a34 + '\'' +
", a35='" + a35 + '\'' +
", a36='" + a36 + '\'' +
", a37='" + a37 + '\'' +
", a38='" + a38 + '\'' +
", a39='" + a39 + '\'' +
", a40='" + a40 + '\'' +
", a41='" + a41 + '\'' +
", a42='" + a42 + '\'' +
", a43='" + a43 + '\'' +
", a44='" + a44 + '\'' +
", a45='" + a45 + '\'' +
", a46='" + a46 + '\'' +
", a47='" + a47 + '\'' +
", a48='" + a48 + '\'' +
", a49='" + a49 + '\'' +
", a50='" + a50 + '\'' +
", a51='" + a51 + '\'' +
", a52='" + a52 + '\'' +
", a53='" + a53 + '\'' +
", a54='" + a54 + '\'' +
", a55='" + a55 + '\'' +
", a56='" + a56 + '\'' +
", a57='" + a57 + '\'' +
", a58='" + a58 + '\'' +
", a59='" + a59 + '\'' +
", a60='" + a60 + '\'' +
", a61='" + a61 + '\'' +
", a62='" + a62 + '\'' +
", a63='" + a63 + '\'' +
'}';
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesSixMinesSummaryTable.java
View file @ 19c6fd0a
...@@ -53,6 +53,10 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity ...@@ -53,6 +53,10 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
@Excel(name = "日期") @Excel(name = "日期")
private String hDate; private String hDate;
/** 所属矿区 */
@Excel(name = "所属矿区")
private String mining;
public static long getSerialVersionUID() { public static long getSerialVersionUID() {
return serialVersionUID; return serialVersionUID;
} }
...@@ -139,6 +143,14 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity ...@@ -139,6 +143,14 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
this.hDate = hDate; this.hDate = hDate;
} }
public String getMining() {
return mining;
}
public void setMining(String mining) {
this.mining = mining;
}
@Override @Override
public String toString() { public String toString() {
return "ActSuppliesSixMinesSummaryTable{" + return "ActSuppliesSixMinesSummaryTable{" +
...@@ -151,7 +163,8 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity ...@@ -151,7 +163,8 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
", nuitPrice=" + nuitPrice + ", nuitPrice=" + nuitPrice +
", money=" + money + ", money=" + money +
", createBy='" + createBy + '\'' + ", createBy='" + createBy + '\'' +
", hDate=" + hDate + ", hDate='" + hDate + '\'' +
", mining='" + mining + '\'' +
'}'; '}';
} }
} }
ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesCleaningRuleMapper.java
View file @ 19c6fd0a
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import com.ruoyi.system.domain.ActSuppliesHistorydata; import com.ruoyi.system.domain.ActSuppliesHistorydata;
import com.ruoyi.system.domain.ActSuppliesImportTable;
import com.ruoyi.system.domain.ActSuppliesSixMinesSummaryTable; import com.ruoyi.system.domain.ActSuppliesSixMinesSummaryTable;
import java.util.List; import java.util.List;
...@@ -16,4 +17,6 @@ public interface ActSuppliesCleaningRuleMapper ...@@ -16,4 +17,6 @@ public interface ActSuppliesCleaningRuleMapper
int addActSuppliesSixMinesSummaryTable(ActSuppliesSixMinesSummaryTable actSuppliesSixMinesSummaryTable); int addActSuppliesSixMinesSummaryTable(ActSuppliesSixMinesSummaryTable actSuppliesSixMinesSummaryTable);
int addActSuppliesImportTable(ActSuppliesImportTable actSuppliesImportTable);
} }
ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesCleaningRuleService.java
View file @ 19c6fd0a
package com.ruoyi.system.service; package com.ruoyi.system.service;
import com.ruoyi.system.domain.ActSuppliesHistorydata; import com.ruoyi.system.domain.ActSuppliesHistorydata;
import com.ruoyi.system.domain.ActSuppliesImportTable;
import com.ruoyi.system.domain.ActSuppliesSixMinesSummaryTable; import com.ruoyi.system.domain.ActSuppliesSixMinesSummaryTable;
import java.util.List; import java.util.List;
...@@ -15,4 +16,6 @@ public interface IActSuppliesCleaningRuleService ...@@ -15,4 +16,6 @@ public interface IActSuppliesCleaningRuleService
{ {
int addActSuppliesSixMinesSummaryTable(ActSuppliesSixMinesSummaryTable actSuppliesSixMinesSummaryTable); int addActSuppliesSixMinesSummaryTable(ActSuppliesSixMinesSummaryTable actSuppliesSixMinesSummaryTable);
int addActSuppliesImportTable(ActSuppliesImportTable actSuppliesImportTable);
} }
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesCleaningRuleServiceImpl.java
View file @ 19c6fd0a
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import com.ruoyi.system.domain.ActSuppliesImportTable;
import com.ruoyi.system.domain.ActSuppliesSixMinesSummaryTable; import com.ruoyi.system.domain.ActSuppliesSixMinesSummaryTable;
import com.ruoyi.system.mapper.ActSuppliesCleaningRuleMapper; import com.ruoyi.system.mapper.ActSuppliesCleaningRuleMapper;
...@@ -29,4 +30,9 @@ public class ActSuppliesCleaningRuleServiceImpl implements IActSuppliesCleaningR ...@@ -29,4 +30,9 @@ public class ActSuppliesCleaningRuleServiceImpl implements IActSuppliesCleaningR
public int addActSuppliesSixMinesSummaryTable(ActSuppliesSixMinesSummaryTable actSuppliesSixMinesSummaryTable) { public int addActSuppliesSixMinesSummaryTable(ActSuppliesSixMinesSummaryTable actSuppliesSixMinesSummaryTable) {
return actSuppliesCleaningRuleMapper.addActSuppliesSixMinesSummaryTable(actSuppliesSixMinesSummaryTable); return actSuppliesCleaningRuleMapper.addActSuppliesSixMinesSummaryTable(actSuppliesSixMinesSummaryTable);
} }
@Override
public int addActSuppliesImportTable(ActSuppliesImportTable actSuppliesImportTable) {
return actSuppliesCleaningRuleMapper.addActSuppliesImportTable(actSuppliesImportTable);
}
} }
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesCleaningRuleMapper.xml
View file @ 19c6fd0a
...@@ -3,19 +3,6 @@ ...@@ -3,19 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.ActSuppliesCleaningRuleMapper"> <mapper namespace="com.ruoyi.system.mapper.ActSuppliesCleaningRuleMapper">
<resultMap type="ActSuppliesSixMinesSummaryTable" id="ActSuppliesSixMinesSummaryTableResult">
<result property="Id" column="id" />
<result property="hId" column="h_id" />
<result property="projectId" column="project_id" />
<result property="projectName" column="project_name" />
<result property="departmentName" column="department_name" />
<result property="number" column="number" />
<result property="nuitPrice" column="nuit_price" />
<result property="money" column="money" />
<result property="createBy" column="create_by" />
<result property="hDate" column="date" />
</resultMap>
<insert id="addActSuppliesSixMinesSummaryTable" parameterType="ActSuppliesSixMinesSummaryTable" useGeneratedKeys="true" keyProperty="id"> <insert id="addActSuppliesSixMinesSummaryTable" parameterType="ActSuppliesSixMinesSummaryTable" useGeneratedKeys="true" keyProperty="id">
insert into act_supplies_sixminessummarytable insert into act_supplies_sixminessummarytable
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
...@@ -28,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -28,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="money != null">money,</if> <if test="money != null">money,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="hDate != null">h_date,</if> <if test="hDate != null">h_date,</if>
<if test="mining != null">ssk_id,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="hId != null">#{hId},</if> <if test="hId != null">#{hId},</if>
...@@ -39,9 +27,150 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -39,9 +27,150 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="money != null">#{money},</if> <if test="money != null">#{money},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="hDate != null">#{hDate},</if> <if test="hDate != null">#{hDate},</if>
<if test="mining != null">#{mining},</if>
</trim> </trim>
</insert> </insert>
<insert id="addActSuppliesImportTable" parameterType="ActSuppliesImportTable" useGeneratedKeys="true" keyProperty="id">
insert into act_supplies_import_table
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="hId != null">h_id,</if>
<if test="hDate != null">h_date,</if>
<if test="mining != null">ssk_id,</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="hId != null">#{hId},</if>
<if test="hDate != null">#{hDate},</if>
<if test="mining != null">#{mining},</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> </mapper>
......
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesHistorydataMapper.xml
View file @ 19c6fd0a
...@@ -19,10 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -19,10 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="status" column="status" /> <result property="status" column="status" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
<result property="date" column="date" />
<result property="mining" column="ssk_id" />
</resultMap> </resultMap>
<sql id="selectActSuppliesHistorydataVo"> <sql id="selectActSuppliesHistorydataVo">
select id, import_uuid, template_id, export_uuid, role_id, history_name, history_content, identifying_code,clean_status ,status, create_by, date, create_time from act_supplies_historydata select id, import_uuid, template_id, export_uuid, role_id, history_name, history_content, identifying_code,clean_status ,status, create_by, date, create_time, ssk_id from act_supplies_historydata
</sql> </sql>
<select id="selectActSuppliesHistorydataList" parameterType="ActSuppliesHistorydata" resultMap="ActSuppliesHistorydataResult"> <select id="selectActSuppliesHistorydataList" parameterType="ActSuppliesHistorydata" resultMap="ActSuppliesHistorydataResult">
......
ruoyi-ui/src/api/Actsupplies/cleaning_rule.js
View file @ 19c6fd0a
...@@ -9,7 +9,7 @@ export function selectActSuppliesHistorydata() { ...@@ -9,7 +9,7 @@ export function selectActSuppliesHistorydata() {
}) })
} }
// 新增物料关系管理 // 新增生成表
export function addActSuppliesSixMinesSummaryTable(data) { export function addActSuppliesSixMinesSummaryTable(data) {
return request({ return request({
url: '/system/cleaningrule/addActSuppliesSixMinesSummaryTable', url: '/system/cleaningrule/addActSuppliesSixMinesSummaryTable',
...@@ -18,7 +18,14 @@ export function addActSuppliesSixMinesSummaryTable(data) { ...@@ -18,7 +18,14 @@ export function addActSuppliesSixMinesSummaryTable(data) {
}) })
} }
// 新增导入表
export function addActSuppliesImportTable(data) {
return request({
url: '/system/cleaningrule/addActSuppliesImportTable',
method: 'post',
data: data
})
}
......
ruoyi-ui/src/views/system/supplies/index.vue
View file @ 19c6fd0a
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<script> <script>
import {selectActSuppliesHistorydata ,addActSuppliesSixMinesSummaryTable} from "@/api/Actsupplies/cleaning_rule"; import {selectActSuppliesHistorydata ,addActSuppliesSixMinesSummaryTable,addActSuppliesImportTable} from "@/api/Actsupplies/cleaning_rule";
import { getSuppliesTemplate, listSuppliesTemplate,roleList,materialConvert,roleListid,materialList} from "@/api/ruoyi-myLuckyexcel/myluckyexcel"; import { getSuppliesTemplate, listSuppliesTemplate,roleList,materialConvert,roleListid,materialList} from "@/api/ruoyi-myLuckyexcel/myluckyexcel";
import {addInsert}from "@/api/system/historydata" import {addInsert}from "@/api/system/historydata"
/*import luckysheet from 'luckysheet'*/ /*import luckysheet from 'luckysheet'*/
...@@ -128,9 +128,79 @@ export default { ...@@ -128,9 +128,79 @@ export default {
nuitPrice : "", nuitPrice : "",
money : "", money : "",
createBy : "", createBy : "",
hDate : null hDate : null,
mining : ""
}, },
fromimport: {
hId : "",
hDate : null,
mining : "",
a1 : "",
a2 : "",
a3 : "",
a4 : "",
a5 : "",
a6 : "",
a7 : "",
a8 : "",
a9 : "",
a10 : "",
a11 : "",
a12 : "",
a13 : "",
a14 : "",
a15 : "",
a16 : "",
a17 : "",
a18 : "",
a19 : "",
a20 : "",
a21 : "",
a22 : "",
a23 : "",
a24 : "",
a25 : "",
a26 : "",
a27 : "",
a28 : "",
a29 : "",
a30 : "",
a31 : "",
a32 : "",
a33 : "",
a34 : "",
a35 : "",
a36 : "",
a37 : "",
a38 : "",
a39 : "",
a40 : "",
a41 : "",
a42 : "",
a43 : "",
a44 : "",
a45 : "",
a46 : "",
a47 : "",
a48 : "",
a49 : "",
a50 : "",
a51 : "",
a52 : "",
a53 : "",
a54 : "",
a55 : "",
a56 : "",
a57 : "",
a58 : "",
a59 : "",
a60 : "",
a61 : "",
a62 : "",
a63 : "",
},
/*fromimport: {},*/
dfrom:{}, dfrom:{},
// 查询参数 // 查询参数
queryParams: { queryParams: {
...@@ -354,7 +424,7 @@ export default { ...@@ -354,7 +424,7 @@ export default {
}, },
/** 导入事件*/ /** 导入事件*/
async handleFileChange(evt) { async handleFileChange(evt) {
debugger
if(modify){ if(modify){
this.$confirm('再次导入将会清空表内数据,是否继续操作？', '注意!!!', { this.$confirm('再次导入将会清空表内数据,是否继续操作？', '注意!!!', {
confirmButtonText: '确定', confirmButtonText: '确定',
...@@ -1264,7 +1334,7 @@ export default { ...@@ -1264,7 +1334,7 @@ export default {
let dataa=window.luckysheet.transToData(jsonDataa[j].celldata); let dataa=window.luckysheet.transToData(jsonDataa[j].celldata);
for (let k = 2; k < dataa.length; k++) { for (let k = 2; k < dataa.length; k++) {
if(dataa[k][1] == null){ if(dataa[k][1] == null){
break; continue;
} }
let a0; let a0;
let a1; let a1;
...@@ -1325,16 +1395,569 @@ export default { ...@@ -1325,16 +1395,569 @@ export default {
this.froms.money =a6; this.froms.money =a6;
this.froms.createBy = data[i].createBy; this.froms.createBy = data[i].createBy;
this.froms.hDate = data[i].date; this.froms.hDate = data[i].date;
this.froms.mining = data[i].mining;
addActSuppliesSixMinesSummaryTable(this.froms).then(response => {}); addActSuppliesSixMinesSummaryTable(this.froms).then(response => {});
} }
} }
} }
}else { }else {
/*导入表*/ /*导入表*/
debugger
let jsonDatab = JSON.parse(data[i].historyContent); let jsonDatab = JSON.parse(data[i].historyContent);
for (let j = 0; j < jsonDatab.length; j++) { for (let q = 0; q < jsonDatab.length; q++) {
let datab=window.luckysheet.transToData(jsonDatab[j].celldata); //获取行数据
let datab=window.luckysheet.transToData(jsonDatab[q].celldata);
for (let w = 0; w < datab.length; w++) {
//判断当前行是否为空
if(datab[w][0] == null){
continue;
}
if(datab[w][0].v == null || datab[w][0].v ==undefined){
continue;
}
/*if(data[i].id != null){
this.fromimport.hId = data[i].id;
this.fromimport.hDate = data[i].date;
this.fromimport.mining = data[i].mining;
}*/
/*let map = new Map();
map.set("hId",data[i].id);
map.set("hDate",data[i].date);
map.set("mining",data[i].mining);
for (let l = 0; l <datab[w].length ; l++) {
let a ;
if(datab[w][l] != null){
a= datab[w][l].v;
if(a == undefined){
a="";
}
}
let d = ++l;
map.set("a"+d,a);
}*/
let b1 ;
if(datab[w][0] != null){
b1= datab[w][0].v;
if(b1 == undefined){
b1="";
}
}
let b2 ;
if(datab[w][1] != null){
b2= datab[w][1].v;
if(b2 == undefined){
b2="";
}
}
let b3 ;
if(datab[w][2] != null){
b3= datab[w][2].v;
if(b3 == undefined){
b3="";
}
}
let b4 ;
if(datab[w][3] != null){
b4= datab[w][3].v;
if(b4 == undefined){
b4="";
}
}
let b5 ;
if(datab[w][4] != null){
b5= datab[w][4].v;
if(b5 == undefined){
b5="";
}
}
let b6 ;
if(datab[w][5] != null){
b6= datab[w][5].v;
if(b6 == undefined){
b6="";
}
}
let b7 ;
if(datab[w][6] != null){
b7= datab[w][6].v;
if(b7 == undefined){
b7="";
}
}
let b8 ;
if(datab[w][7] != null){
b8= datab[w][7].v;
if(b8 == undefined){
b8="";
}
}
let b9 ;
if(datab[w][8] != null){
b9= datab[w][8].v;
if(b9 == undefined){
b9="";
}
}
let b10 ;
if(datab[w][9] != null){
b10= datab[w][9].v;
if(b10 == undefined){
b10="";
}
}
let b11 ;
if(datab[w][10] != null){
b11= datab[w][10].v;
if(b11 == undefined){
b11="";
}
}
let b12 ;
if(datab[w][11] != null){
b12= datab[w][11].v;
if(b12 == undefined){
b12="";
}
}
let b13 ;
if(datab[w][12] != null){
b13= datab[w][12].v;
if(b13 == undefined){
b13="";
}
}
let b14 ;
if(datab[w][13] != null){
b14= datab[w][13].v;
if(b14 == undefined){
b14="";
}
}
let b15 ;
if(datab[w][14] != null){
b15= datab[w][14].v;
if(b15 == undefined){
b15="";
}
}
let b16 ;
if(datab[w][15] != null){
b16= datab[w][15].v;
if(b16 == undefined){
b16="";
}
}
let b17 ;
if(datab[w][16] != null){
b17= datab[w][16].v;
if(b17 == undefined){
b17="";
}
}
let b18 ;
if(datab[w][17] != null){
b18= datab[w][17].v;
if(b18 == undefined){
b18="";
}
}
let b19 ;
if(datab[w][18] != null){
b19= datab[w][18].v;
if(b19 == undefined){
b19="";
}
}
let b20 ;
if(datab[w][19] != null){
b20= datab[w][19].v;
if(b20 == undefined){
b20="";
}
}
let b21 ;
if(datab[w][20] != null){
b21= datab[w][20].v;
if(b21 == undefined){
b21="";
}
}
let b22 ;
if(datab[w][21] != null){
b22= datab[w][21].v;
if(b22 == undefined){
b22="";
}
}
let b23 ;
if(datab[w][22] != null){
b23= datab[w][22].v;
if(b23 == undefined){
b23="";
}
}
let b24 ;
if(datab[w][23] != null){
b24= datab[w][23].v;
if(b24 == undefined){
b24="";
}
}
let b25 ;
if(datab[w][24] != null){
b25= datab[w][24].v;
if(b25 == undefined){
b25="";
}
}
let b26 ;
if(datab[w][25] != null){
b26= datab[w][25].v;
if(b26 == undefined){
b26="";
}
}
let b27 ;
if(datab[w][26] != null){
b27= datab[w][26].v;
if(b27 == undefined){
b27="";
}
}
let b28 ;
if(datab[w][27] != null){
b28= datab[w][27].v;
if(b28 == undefined){
b28="";
}
}
let b29 ;
if(datab[w][28] != null){
b29= datab[w][28].v;
if(b29 == undefined){
b29="";
}
}
let b30 ;
if(datab[w][29] != null){
b30= datab[w][29].v;
if(b30 == undefined){
b30="";
}
}
let b31 ;
if(datab[w][30] != null){
b31= datab[w][30].v;
if(b31 == undefined){
b31="";
}
}
let b32 ;
if(datab[w][31] != null){
b32= datab[w][31].v;
if(b32 == undefined){
b32="";
}
}
let b33 ;
if(datab[w][32] != null){
b33= datab[w][32].v;
if(b33 == undefined){
b33="";
}
}
let b34 ;
if(datab[w][33] != null){
b34= datab[w][33].v;
if(b34 == undefined){
b34="";
}
}
let b35 ;
if(datab[w][34] != null){
b35= datab[w][34].v;
if(b35 == undefined){
b35="";
}
}
let b36 ;
if(datab[w][35] != null){
b36= datab[w][35].v;
if(b36 == undefined){
b36="";
}
}
let b37 ;
if(datab[w][36] != null){
b37= datab[w][36].v;
if(b37 == undefined){
b37="";
}
}
let b38 ;
if(datab[w][37] != null){
b38= datab[w][37].v;
if(b38 == undefined){
b38="";
}
}
let b39 ;
if(datab[w][38] != null){
b39= datab[w][38].v;
if(b39 == undefined){
b39="";
}
}
let b40 ;
if(datab[w][39] != null){
b40= datab[w][39].v;
if(b40 == undefined){
b40="";
}
}
let b41 ;
if(datab[w][40] != null){
b41= datab[w][40].v;
if(b41 == undefined){
b41="";
}
}
let b42 ;
if(datab[w][41] != null){
b42= datab[w][41].v;
if(b42 == undefined){
b42="";
}
}
let b43 ;
if(datab[w][42] != null){
b43= datab[w][42].v;
if(b43 == undefined){
b43="";
}
}
let b44 ;
if(datab[w][43] != null){
b44= datab[w][43].v;
if(b44 == undefined){
b44="";
}
}
let b45 ;
if(datab[w][44] != null){
b45= datab[w][44].v;
if(b45 == undefined){
b45="";
}
}
let b46 ;
if(datab[w][45] != null){
b46= datab[w][45].v;
if(b46 == undefined){
b46="";
}
}
let b47 ;
if(datab[w][46] != null){
b47= datab[w][46].v;
if(b47 == undefined){
b47="";
}
}
let b48 ;
if(datab[w][47] != null){
b48= datab[w][47].v;
if(b48 == undefined){
b48="";
}
}
let b49 ;
if(datab[w][48] != null){
b49= datab[w][48].v;
if(b49 == undefined){
b49="";
}
}
let b50 ;
if(datab[w][49] != null){
b50= datab[w][49].v;
if(b50 == undefined){
b50="";
}
}
let b51 ;
if(datab[w][50] != null){
b51= datab[w][50].v;
if(b51 == undefined){
b51="";
}
}
let b52 ;
if(datab[w][51] != null){
b52= datab[w][51].v;
if(b52 == undefined){
b52="";
}
}
let b53 ;
if(datab[w][52] != null){
b53= datab[w][52].v;
if(b53 == undefined){
b53="";
}
}
let b54 ;
if(datab[w][53] != null){
b54= datab[w][53].v;
if(b54 == undefined){
b54="";
}
}
let b55 ;
if(datab[w][54] != null){
b55= datab[w][54].v;
if(b55 == undefined){
b55="";
}
}
let b56 ;
if(datab[w][55] != null){
b56= datab[w][55].v;
if(b56 == undefined){
b56="";
}
}
let b57 ;
if(datab[w][56] != null){
b57= datab[w][56].v;
if(b57 == undefined){
b57="";
}
}
let b58 ;
if(datab[w][57] != null){
b58= datab[w][57].v;
if(b58 == undefined){
b58="";
}
}
let b59 ;
if(datab[w][58] != null){
b59= datab[w][58].v;
if(b59 == undefined){
b59="";
}
}
let b60 ;
if(datab[w][59] != null){
b60= datab[w][59].v;
if(b60 == undefined){
b60="";
}
}
let b61 ;
if(datab[w][60] != null){
b61= datab[w][60].v;
if(b61 == undefined){
b61="";
}
}
let b62 ;
if(datab[w][61] != null){
b62= datab[w][61].v;
if(b62 == undefined){
b62="";
}
}
let b63 ;
if(datab[w][62] != null){
b63= datab[w][62].v;
if(b63 == undefined){
b63="";
}
}
if(data[i].id != null){
this.fromimport.hId = data[i].id;
this.fromimport.hDate = data[i].date;
this.fromimport.mining = data[i].mining;
this.fromimport.a1 = b1;
this.fromimport.a2 = b2;
this.fromimport.a3 = b3;
this.fromimport.a4 = b4;
this.fromimport.a5 = b5;
this.fromimport.a6 = b6;
this.fromimport.a7 = b7;
this.fromimport.a8 = b8;
this.fromimport.a9 = b9;
this.fromimport.a10 = b10;
this.fromimport.a11 = b11;
this.fromimport.a12 = b12;
this.fromimport.a13 = b13;
this.fromimport.a14 = b14;
this.fromimport.a15 = b15;
this.fromimport.a16 = b16;
this.fromimport.a17 = b17;
this.fromimport.a18 = b18;
this.fromimport.a19 = b19;
this.fromimport.a20 = b20;
this.fromimport.a21 = b21;
this.fromimport.a22 = b22;
this.fromimport.a23 = b23;
this.fromimport.a24 = b24;
this.fromimport.a25 = b25;
this.fromimport.a26 = b26;
this.fromimport.a27 = b27;
this.fromimport.a28 = b28;
this.fromimport.a29 = b29;
this.fromimport.a30 = b30;
this.fromimport.a31 = b31;
this.fromimport.a32 = b32;
this.fromimport.a33 = b33;
this.fromimport.a34 = b34;
this.fromimport.a35 = b35;
this.fromimport.a36 = b36;
this.fromimport.a37 = b37;
this.fromimport.a38 = b38;
this.fromimport.a39 = b39;
this.fromimport.a40 = b40;
this.fromimport.a41 = b41;
this.fromimport.a42 = b42;
this.fromimport.a43 = b43;
this.fromimport.a44 = b44;
this.fromimport.a45 = b45;
this.fromimport.a46 = b46;
this.fromimport.a47 = b47;
this.fromimport.a48 = b48;
this.fromimport.a49 = b49;
this.fromimport.a50 = b50;
this.fromimport.a51 = b51;
this.fromimport.a52 = b52;
this.fromimport.a53= b53;
this.fromimport.a54 = b54;
this.fromimport.a55 = b55;
this.fromimport.a56 = b56;
this.fromimport.a57 = b57;
this.fromimport.a58 = b58;
this.fromimport.a59 = b59;
this.fromimport.a60 = b60;
this.fromimport.a61 = b61;
this.fromimport.a62 = b62;
this.fromimport.a63 = b63;
}
addActSuppliesImportTable(this.fromimport).then(response => {});
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment