Skip to content

K
klck
Commit 907f2388 authored by xiangjiaojunxp's avatar xiangjiaojunxp
Browse files
Options

物料转换优化修改

parent a0b9f28d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 980 additions and 965 deletions
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesDetailsController.java
View file @ 907f2388
......@@ -189,5 +189,4 @@ public class ActSuppliesDetailsController extends BaseController
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActOperation1.java
View file @ 907f2388
......@@ -24,6 +24,21 @@ public class ActOperation1 extends BaseEntity {
@Excel(name = "所属矿区")
private String mining;
/** 规则id */
private Integer roleId;
/** 清洗规则 */
private String historyRole;
public String getHistoryRole() {
return historyRole;
}
public void setHistoryRole(String historyContent) {
this.historyRole = historyContent;
}
/** excel内容 */
private ActOperation2[][] actOperation2;
public ActOperation2[][] getActOperation2() {
......@@ -75,4 +90,12 @@ public class ActOperation1 extends BaseEntity {
public void setMining(String mining) {
this.mining = mining;
}
public Integer getRoleId() {
return roleId;
}
public void setRoleId(Integer roleId) {
this.roleId = roleId;
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesHistorydata.java
View file @ 907f2388
......@@ -51,6 +51,10 @@ public class ActSuppliesHistorydata extends BaseEntity
@Excel(name = "内容")
private String historyContent;
/** 清洗规则 */
@Excel(name = "清洗规则")
private String historyRole;
/** 导入导出标识 */
@Excel(name = "导入导出标识")
private Long identifyingCode;
......@@ -205,6 +209,14 @@ public class ActSuppliesHistorydata extends BaseEntity
this.mining = mining;
}
public String getHistoryRole() {
return historyRole;
}
public void setHistoryRole(String historyRole) {
this.historyRole = historyRole;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesImportCleaning.java 0 → 100644
View file @ 907f2388
package com.ruoyi.system.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
/**
* 导入表的清晰表 act_supplies_import_cleaning
*
* @author
* @date 2023-12-15
*/
public class ActSuppliesImportCleaning extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 导入表的清洗ID */
@Excel(name = "导入表的清洗ID")
private String id;
/** 规则ID */
private long roleId;
public long getRoleId() {
return roleId;
}
public void setRoleId(long roleId) {
this.roleId = roleId;
}
/**所属规则*/
@Excel(name = "所属矿id",readConverterExp = "1、东欢坨矿 2、范矿 3、林西矿 4、吕矿 5、钱家营矿 6、唐山矿 7、宏丰 8、云飞 9、平安")
private String sskId;
/** 日期(年月)*/
private String date;
/** 历史表ID*/
private Long hId;
/** 所在行*/
private String HeaderRow;
/** 物料名称*/
private String nameColumn;
/** 物料编码*/
private String codeColumn;
/** 部门*/
private String departmentColumn;
/** 数量*/
private String numberColumn;
/** 金额*/
private String moneyColumn;
/** 导入表内日期*/
private String dateColumn;
/** 创建人*/
private String createBy;
/** 创建时间*/
private Date createTime;
/** 修改人*/
private String updateBy;
/** 修改时间*/
private Date updateTime;
public static long getSerialVersionUID() {
return serialVersionUID;
}
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 getDate() {
return date;
}
public void setDate(String date) {
this.date = date;
}
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 getCreateBy() {
return createBy;
}
@Override
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
@Override
public Date getCreateTime() {
return createTime;
}
@Override
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Override
public String getUpdateBy() {
return updateBy;
}
@Override
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
@Override
public Date getUpdateTime() {
return updateTime;
}
@Override
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
@Override
public String toString() {
return "ActSuppliesImportCleaning{" +
"id='" + id + '\'' +
", roleId=" + roleId +
", sskId='" + sskId + '\'' +
", date='" + date + '\'' +
", hId='" + hId + '\'' +
", nameColumn='" + nameColumn + '\'' +
", codeColumn='" + codeColumn + '\'' +
", departmentColumn='" + departmentColumn + '\'' +
", numberColumn='" + numberColumn + '\'' +
", moneyColumn='" + moneyColumn + '\'' +
", dateColumn='" + dateColumn + '\'' +
", createBy='" + createBy + '\'' +
", createTime=" + createTime +
", updateBy='" + updateBy + '\'' +
", updateTime=" + updateTime +
'}';
}
}
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesRoleDetail.java
View file @ 907f2388
......@@ -31,6 +31,10 @@ public class ActSuppliesRoleDetail extends BaseEntity
private String[] detailYH;
private String[] detailYL;
private String detailYS;
/** 清洗规则*/
private String cleanIng;
/**所属规则*/
@Excel(name = "所属规则")
private String roleName;
......@@ -49,6 +53,14 @@ public class ActSuppliesRoleDetail extends BaseEntity
@Excel(name = "状态",readConverterExp = "0=启用,1=禁用")
private Integer status;
public String getCleanIng() {
return cleanIng;
}
public void setCleanIng(String cleanIng) {
this.cleanIng = cleanIng;
}
public String getRoleName() {
return roleName;
}
......
ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesCleaningRuleMapper.java
View file @ 907f2388
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;
......@@ -15,16 +16,20 @@ import java.util.List;
public interface ActSuppliesCleaningRuleMapper
{
int addActSuppliesSixMinesSummaryTable(ActSuppliesSixMinesSummaryTable actSuppliesSixMinesSummaryTable);
int addActSuppliesImportTable(ActSuppliesImportTable actSuppliesImportTable);
int addActSuppliesImportCleaning(ActSuppliesImportCleaning actSuppliesImportTable);
int deleteActSuppliesSixMinesSummaryTable(Long hId);
int deleteActSuppliesImportTable(Long hId);
int deleteActSuppliesImportCleaning(Long hId);
void addInsertConvert1(ActSuppliesImportTable actSuppliesImportTable);
void addInsertConvert2(ActSuppliesImportTable actSuppliesImportTable);
}
ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesHistorydataMapper.java
View file @ 907f2388
......@@ -61,7 +61,7 @@ public interface ActSuppliesHistorydataMapper
Long[] selectActSuppliesRole(Long templateId);
List<ActSuppliesHistorydata> selectActSuppliesHistorydatauuid(String exportUuid);
List<ActSuppliesHistorydata> selectActSuppliesHistorydatauuid(ActSuppliesHistorydata actSuppliesHistorydata);
void insertActSuppliesHistorydatas(ActSuppliesHistorydata actSuppliesHistorydata1);
......@@ -75,4 +75,16 @@ public interface ActSuppliesHistorydataMapper
List<ActSuppliesHistorydata> selectActSuppliesHistorydata(Integer tylkStatus);
int updateActSuppliesHistorydataStatusById(Long gethId);
/**
* 修改历史表数据内容表
*
* @return 结果
*/
void updateActSUppliesHistoryContent(ActSuppliesHistorydata actSuppliesHistorydata);
/**
* 新增历史表数据内容表
*
* @return 结果
*/
void insertActSuppliesHistorycontent(ActSuppliesHistorydata actSuppliesHistorydata);
}
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesHistorydataServiceImpl.java
View file @ 907f2388
......@@ -5,6 +5,8 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
......@@ -113,57 +115,87 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
{
return actSuppliesHistorydataMapper.deleteActSuppliesHistorydataById(id);
}
/**
* 新增 历史数据信息
*
* @param actSuppliesHistorydata 历史数据ID
* @return 结果
*/
@Override
public int addInsertActSuppliesHistorydata(List<ActSuppliesHistorydata> actSuppliesHistorydata) {
SysUser user = SecurityUtils.getLoginUser().getUser();
ActSuppliesHistorydata actSuppliesHistorydata1 = new ActSuppliesHistorydata();
List<ActSuppliesHistorydata> s = actSuppliesHistorydataMapper.selectActSuppliesHistorydatauuid(actSuppliesHistorydata.get(0).getImportUuid());
List<ActSuppliesHistorydata> s = actSuppliesHistorydataMapper.selectActSuppliesHistorydatauuid(actSuppliesHistorydata.get(0));
if (s.size()>0){
//如果存在相同时间和所属矿的表
if (s.get(0).getCleanStatus()>0){
for (int j=0;j<s.size();j++){
if (s.get(j).getIdentifyingCode()==0){
//删除导入表数据
actSuppliesCleaningRuleMapper.deleteActSuppliesImportTable(s.get(j).getId());
actSuppliesCleaningRuleMapper.deleteActSuppliesImportCleaning(s.get(j).getId());
}else if (s.get(j).getIdentifyingCode()==1){
//删除生成表数据
actSuppliesCleaningRuleMapper.deleteActSuppliesSixMinesSummaryTable(s.get(j).getId());
}
}
}
for (int i=0;i<actSuppliesHistorydata.size();i++) {
if (actSuppliesHistorydata.get(i).getIdentifyingCode()==0){
for (int j=0;j<s.size();j++){
if (s.get(j).getIdentifyingCode()==0){
actSuppliesHistorydata.get(i).setImportUuid(s.get(j).getImportUuid());
}
}
}
if (actSuppliesHistorydata.get(i).getIdentifyingCode()==1){
for (int j=0;j<s.size();j++){
if (s.get(j).getIdentifyingCode()==1){
actSuppliesHistorydata.get(i).setImportUuid(s.get(j).getImportUuid());
}
}
}
actSuppliesHistorydata.get(i).setCreateBy(user.getUserName());
actSuppliesHistorydata.get(i).setCreateTime(DateUtils.getNowDate());
actSuppliesHistorydataMapper.updateActSuppliesHistorydatas(actSuppliesHistorydata.get(i));
actSuppliesHistorydataMapper.updateActSUppliesHistoryContent(actSuppliesHistorydata.get(i));
}
}else {
//如果没有重复数据直接新增导入表和生成表
for (int i =0;i<actSuppliesHistorydata.size();i++){
UUID uuid = UUID.randomUUID();
String uuids = StringUtils.remove(uuid.toString(), '-');
if (actSuppliesHistorydata.get(i).getIdentifyingCode()==0){
actSuppliesHistorydata1 = actSuppliesHistorydata.get(i);
actSuppliesHistorydata1.setImportUuid(uuids);
actSuppliesHistorydata1.setStatus(0L);
actSuppliesHistorydata1.setIdentifyingCode(0L);
actSuppliesHistorydataMapper.insertActSuppliesHistorydata(actSuppliesHistorydata1);
actSuppliesHistorydataMapper.insertActSuppliesHistorycontent(actSuppliesHistorydata1);
}else {
actSuppliesHistorydata1 = actSuppliesHistorydata.get(i);
actSuppliesHistorydata1.setImportUuid(uuids);
actSuppliesHistorydata1.setStatus(0L);
actSuppliesHistorydata1.setIdentifyingCode(1L);
actSuppliesHistorydataMapper.insertActSuppliesHistorydata(actSuppliesHistorydata1);
actSuppliesHistorydataMapper.insertActSuppliesHistorycontent(actSuppliesHistorydata1);
}
}
for (int i=0;i<actSuppliesHistorydata.size();i++){
actSuppliesHistorydata.get(i).setCreateBy(user.getUserName());
......@@ -247,8 +279,6 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
}
}
};
......@@ -271,7 +301,53 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
public void run() {
//String[] attributes = {"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"};
//导入清洗表数据
for (int i = 0; i < actOperation2s.size(); i++) {
//JSONArray parse = (JSONArray) JSONArray.parse(actOperation2s.get(i).getHistoryRole());
//int k=(int)parse.getJSONObject(0).get("HeaderRow");
//获取导入excel表数据存储到生成表实体类中
JSONArray parse1 = (JSONArray) JSONArray.parse(actOperation2s.get(i).getHistoryRole());
for (int x = (int)parse1.getJSONObject(0).get("HeaderRow"); x < actOperation2s.get(i).getActOperation2().length; x++) {
//判断数据是否为空，为空结束循环
if (actOperation2s.get(i).getActOperation2()[x] != null) {
ActSuppliesImportCleaning actSuppliesImportCleaning = new ActSuppliesImportCleaning();
UUID uuid = UUID.randomUUID();
String s = StringUtils.remove(uuid.toString(), '-');
actSuppliesImportCleaning.setId(s);
actSuppliesImportCleaning.setRoleId(actOperation2s.get(i).getRoleId());
actSuppliesImportCleaning.sethId(actOperation2s.get(i).gethId());
actSuppliesImportCleaning.setCreateBy(actOperation2s.get(i).getCreateBy());
actSuppliesImportCleaning.setCreateTime(DateUtils.getNowDate());
actSuppliesImportCleaning.setDate(actOperation2s.get(i).gethDate());
actSuppliesImportCleaning.setSskId(actOperation2s.get(i).getMining());
//获取数组x行的真实非空长度
//List<Object> actOperation2s1 = Arrays.asList(actOperation2s.get(i).getActOperation2()[x]);
//long count = Arrays.stream(actOperation2s.get(i).getActOperation2()[x]).filter(Objects::nonNull).count();
//循环保存到实体类字段中
JSONArray parse = (JSONArray) JSONArray.parse(actOperation2s.get(i).getHistoryRole());
if (actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("CodeColumn") - 1)] != null) {
if (actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("CodeColumn") - 1)].getV() != null) {
//[{"HeaderRow": 1, "CodeColumn": 6, "DateColumn": 5, "NameColumn": 7, "MoneyColumn": 12, "NumberColumn": 11, "DepartmentColumn": 2}]
actSuppliesImportCleaning.setNameColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("NameColumn") - 1)].getV());
actSuppliesImportCleaning.setCodeColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("CodeColumn") - 1)].getV());
actSuppliesImportCleaning.setDepartmentColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("DepartmentColumn") - 1)].getV());
actSuppliesImportCleaning.setNumberColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("NumberColumn") - 1)].getV());
actSuppliesImportCleaning.setMoneyColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("MoneyColumn") - 1)].getV());
actSuppliesImportCleaning.setDateColumn(actOperation2s.get(i).getActOperation2()[x][((int) parse.getJSONObject(0).get("DateColumn") - 1)].getV());
//actSuppliesImportCleaning.setDateColumn(actOperation2s.get(i).getActOperation2()[x][JSON.parseObject(actOperation2s.get(i).getHistoryRole()).getInteger("DateColumn")].getV());
//新增一条生成表数据
actSuppliesCleaningRuleMapper.addActSuppliesImportCleaning(actSuppliesImportCleaning);
}
}
} else {
break;
}
}
}
String[] attributes = new String[200];
......
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesRoleDetailServiceImpl.java
View file @ 907f2388
......@@ -63,20 +63,22 @@ public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailS
//re:导入表的行，ce:导入表的列，se:导入表的sheet;rt:模板表的行，ct:模板表的列，st:模板表的sheet;ys:运算符
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()+"\"}") ;
}
// [{"ce": "0", "re": "0","le":"10" , "ze":"1" ,"ct":"1", "rt": "1", "lt": "10", "zt": "2","ys":"1"}]
// [{"ce": "0", "re": "0","le":"10" , "ze":"1" ,"ct":"1", "rt": "1", "lt": "10", "zt": "2","ys":"1"}]
String content = String.join(",",filteredList);
String content = String.join(",",filteredList);
String content2 = "["+content+"]";
content2 = "["+content+"]";
}
......
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesCleaningRuleMapper.xml
View file @ 907f2388
......@@ -3,6 +3,54 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.ActSuppliesCleaningRuleMapper">
<resultMap type="ActSuppliesImportCleaning" id="ActSuppliesImportCleaningResult">
<result property="id" column="id" />
<result property="roleId" column="role_id" />
<result property="hId" column="h_id" />
<result property="sskId" column="ssk_id" />
<result property="date" column="date" />
<result property="nameColumn" column="name_column"/>
<result property="codeColumn" column="code_column" />
<result property="departmentColumn" column="department_column" />
<result property="numberColumn" column="number_column" />
<result property="moneyColumn" column="money_column" />
<result property="dateColumn" column="date_column" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
</resultMap>
<insert id="insertActSuppliesImportCleaning" parameterType="ActSuppliesImportCleaning" useGeneratedKeys="true" keyProperty="id">
insert into act_supplies_import_cleaning
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="roleId!= null">role_id,</if>
<if test="sskId!= null">ssk_id,</if>
<if test="date!= null">date,</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_olumn,</if>
<if test="moneyColumn!= null">money_column,</if>
<if test="dateColumn!= null">date_column,</if>
<if test="createBy!= null">create_by,</if>
<if test="createTime!= null">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="roleId != null">#{roleId},</if>
<if test="sskId != null">#{sskId},</if>
<if test="date != null">#{date},</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="moneyColumn != null">#{moneyColumn},</if>
<if test="dateColumn != null">#{dateColumn},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
</trim>
</insert>
<insert id="addActSuppliesSixMinesSummaryTable" parameterType="ActSuppliesSixMinesSummaryTable" useGeneratedKeys="true" keyProperty="id">
insert into act_supplies_sixminessummarytable
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -176,6 +224,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</insert>
<insert id="addActSuppliesImportCleaning" parameterType="ActSuppliesImportCleaning" useGeneratedKeys="true" keyProperty="id">
insert into act_supplies_import_cleaning
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="roleId != null">role_id,</if>
<if test="hId != null">h_id,</if>
<if test="sskId != null">ssk_id,</if>
<if test="date != null">date,</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="moneyColumn != null">money_column,</if>
<if test="dateColumn != null">date_column,</if>
<if test="createBy!= null">create_by,</if>
<if test="createTime!= null">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="roleId != null">#{roleId},</if>
<if test="hId != null">#{hId},</if>
<if test="sskId != null">#{sskId},</if>
<if test="date != null">#{date},</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="moneyColumn != null">#{moneyColumn},</if>
<if test="dateColumn != null">#{dateColumn},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
</trim>
</insert>
<insert id="addInsertConvert1" parameterType="ActSuppliesImportTable" useGeneratedKeys="true" keyProperty="id">
insert into act_supplies_generate_six
......@@ -467,6 +548,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from act_supplies_sixminessummarytable where h_id = #{id}
</delete>
<delete id="deleteActSuppliesImportCleaning" parameterType="Long">
delete from act_supplies_import_cleaning where h_id = #{id}
</delete>
<delete id="deleteActSuppliesImportTable" parameterType="Long">
delete from act_supplies_import_table where h_id = #{id}
</delete>
......
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesHistorydataMapper.xml
View file @ 907f2388
......@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="exportUuid" column="export_uuid" />
<result property="roleId" column="role_id" />
<result property="historyName" column="history_name" />
<result property="historyRole" column="history_role" />
<result property="historyContent" column="history_content" />
<result property="identifyingCode" column="identifying_code" />
<result property="cleanStatus" column="clean_status" />
......@@ -25,12 +26,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<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, ssk_id from act_supplies_historydata
select id, import_uuid, template_id, export_uuid, role_id, history_name, history_role, identifying_code,clean_status ,status, create_by, date, create_time, ssk_id from act_supplies_historydata
</sql>
<select id="selectActSuppliesHistorydataList" parameterType="ActSuppliesHistorydata" resultMap="ActSuppliesHistorydataResult">
<!--<include refid="selectActSuppliesHistorydataVo"/>-->
SELECT t1.id, t1.template_id, t2.template_name, t3.role_name, t1.import_uuid, t1.export_uuid, t1.role_id, t1.history_name, t1.history_content, t1.identifying_code, t1.status, t1.create_by, t1.create_time
SELECT t1.id, t1.template_id, t2.template_name, t3.role_name, t1.import_uuid, t1.export_uuid, t1.role_id, t1.history_name, t1.history_role, t1.identifying_code, t1.status, t1.create_by, t1.create_time
FROM act_supplies_historydata t1
LEFT JOIN act_supplies_template t2 ON t1.template_id = t2.id
LEFT JOIN act_supplies_role t3 ON t1.role_id = t3.id
......@@ -39,15 +40,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="templateName != null and templateName != ''"> and t2.template_name like concat('%', #{templateName}, '%')</if>
<if test="roleName != null and roleName != ''"> and t3.role_name like concat('%', #{roleName}, '%')</if>
<if test="historyName != null and historyName != ''"> and history_name like concat('%', #{historyName}, '%')</if>
<if test="historyContent != null and historyContent != ''"> and history_content = #{historyContent}</if>
<if test="identifyingCode != null "> and identifying_code = #{identifyingCode}</if>
<if test="status != null "> and status = #{status}</if>
</where>
</select>
<select id="selectActSuppliesHistorydataById" parameterType="Long" resultMap="ActSuppliesHistorydataResult">
<include refid="selectActSuppliesHistorydataVo"/>
where id = #{id}
SELECT t1.id, t1.template_id, t1.import_uuid, t1.export_uuid, t1.role_id, t1.history_name, t1.history_role,t2.history_content, t1.identifying_code, t1.status, t1.create_by, t1.create_time
FROM act_supplies_historydata t1
LEFT JOIN act_supplies_historycontent t2 ON t1.import_uuid = t2.hid
<where>
t1.id = #{id}
</where>
</select>
<insert id="insertActSuppliesHistorydata" parameterType="ActSuppliesHistorydata" useGeneratedKeys="true" keyProperty="id">
......@@ -58,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="exportUuid != null">export_uuid,</if>
<if test="roleId != null">role_id,</if>
<if test="historyName != null">history_name,</if>
<if test="historyContent != null">history_content,</if>
<if test="historyRole != null">history_role,</if>
<if test="identifyingCode != null">identifying_code,</if>
clean_status,
<if test="tylkStatus != null">tylk_status,</if>
......@@ -74,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="exportUuid != null">#{exportUuid},</if>
<if test="roleId != null">#{roleId},</if>
<if test="historyName != null">#{historyName},</if>
<if test="historyContent != null">#{historyContent},</if>
<if test="historyRole != null">#{historyRole},</if>
<if test="identifyingCode != null">#{identifyingCode},</if>
0,
<if test="tylkStatus != null">#{tylkStatus},</if>
......@@ -86,6 +90,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</insert>
<insert id="insertActSuppliesHistorycontent" parameterType="ActSuppliesHistorydata" useGeneratedKeys="true" keyProperty="id">
insert into act_supplies_historycontent
<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=",">
......@@ -94,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="exportUuid != null">export_uuid = #{exportUuid},</if>
<if test="roleId != null">role_id = #{roleId},</if>
<if test="historyName != null">history_name = #{historyName},</if>
<if test="historyContent != null">history_content = #{historyContent},</if>
<if test="historyRole != null">history_role = #{historyRole},</if>
<if test="identifyingCode != null">identifying_code = #{identifyingCode},</if>
<if test="status != null">status = #{status},</if>
<if test="createBy != null">create_by = #{createBy},</if>
......@@ -119,10 +135,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<select id="selectActSuppliesHistorydatauuid" parameterType="String" resultMap="ActSuppliesHistorydataResult">
select id, import_uuid, template_id, export_uuid, role_id, history_name, identifying_code,clean_status ,status, create_by, date, create_time, ssk_id from act_supplies_historydata where import_uuid = #{importUuid}
select id, import_uuid, template_id, export_uuid, role_id, history_name, identifying_code,clean_status ,status, create_by, date, create_time, ssk_id from act_supplies_historydata where ssk_id = #{mining} and date = #{date}
</select>
<select id="selectActSuppliesRole" parameterType="Long" resultType="Long">
......@@ -133,7 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update act_supplies_historydata
<trim prefix="SET" suffixOverrides=",">
<if test="historyName != null">history_name = #{historyName},</if>
<if test="historyContent != null">history_content = #{historyContent},</if>
<if test="historyRole != null">history_role = #{historyRole},</if>
<if test="identifyingCode != null">identifying_code = #{identifyingCode},</if>
clean_status = 0,
<if test="tylkStatus != null">tylk_status = #{tylkStatus},</if>
......@@ -151,9 +165,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</update>
<update id="updateActSUppliesHistoryContent" parameterType="ActSuppliesHistorydata">
update act_supplies_historycontent
<trim prefix="SET" suffixOverrides=",">
<if test="historyContent != null">history_content = #{historyContent}</if>
</trim>
<where>
<if test="importUuid != null">and hid = #{importUuid}</if>
</where>
</update>
<select id="selectActSuppliesHistorydata" parameterType="java.lang.Integer" resultMap="ActSuppliesHistorydataResult">
<include refid="selectActSuppliesHistorydataVo"/>
where clean_status = 0 and tylk_status =#{tylkStatus}
SELECT t1.id,t1.import_uuid, t1.template_id, t1.export_uuid, t1.role_id, t1.history_name, t1.history_role,t2.history_content, t1.identifying_code, t1.status, t1.create_by, t1.create_time,t1.date,t1.ssk_id
FROM act_supplies_historydata t1
LEFT JOIN act_supplies_historycontent 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">
......
ruoyi-ui/src/views/system/ActSuppliesDetails/ActSuppliesDetails/index.vue
View file @ 907f2388
......@@ -493,7 +493,7 @@ export default {
this.fetchOptions();
this.reset();
this.open = true;
this.title = "新增物料";
this.title = "新增物料分类";
},
/** 修改按钮操作 */
handleUpdate(row) {
......
ruoyi-ui/src/views/system/Actsupplies/Actsupplies/index.vue
View file @ 907f2388
......@@ -494,7 +494,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "新增二级分类";
this.title = "新增物料分类";
},
/** 修改按钮操作 */
async handleUpdate(row) {
......
ruoyi-ui/src/views/system/historydata/index.vue
View file @ 907f2388
......@@ -80,13 +80,13 @@
@click="handleDetails(scope.row)"
v-hasPermi="['system:historydata']"
>详情</el-button>
<el-button
<!-- <el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:historydata:remove']"
>删除</el-button>
>删除</el-button>-->
</template>
</el-table-column>
</el-table>
......@@ -166,11 +166,13 @@ export default {
roleId: null,
historyName: null,
historyContent: null,
historyRole:null,
identifyingCode: null,
status: null,
},
// 表单参数
form: {},
formContent:{},
};
},
......@@ -208,7 +210,8 @@ export default {
exportUuid: null,
roleId: null,
historyName: null,
historyContent: null,
historyRole: null,
historyContent: null,
identifyingCode: null,
status: 0,
createBy: null,
......@@ -270,22 +273,27 @@ export default {
},
handleDetails(row) {
this.positionValue = 'absolute';
luckysheet.destroy();
luckysheet.create({
container: "luckysheet", // Luckysheet 的容器元素 ID
title: row.historyName, // Excel 文件名
data: JSON.parse(row.historyContent), // Excel 数据
showtoolbar: false, //是否第二列显示工具栏
showinfobar: true, //是否显示顶部名称栏
showsheetbar: false, //是否显示底部表格名称区域
pointEdit: false, //是否是编辑器插入表格模式
pointEditUpdate: null, //编辑器表格更新函数
allowEdit: false,//作用：是否允许前台编辑
functionButton: '<button id="exportButton" class="btn btn-primary" style=" padding:3px 6px; font-size: 16px;width: 100px;height: 27px; margin-right: 85px;" onclick="handleReturnButtonClick()">返回</button>',
getHistorydata(row.id).then(response => {
this.formContent = response.data;
this.positionValue = 'absolute';
luckysheet.destroy();
luckysheet.create({
container: "luckysheet", // Luckysheet 的容器元素 ID
title: this.formContent.historyName, // Excel 文件名
data: JSON.parse(this.formContent.historyContent), // Excel 数据
showtoolbar: false, //是否第二列显示工具栏
showinfobar: true, //是否显示顶部名称栏
showsheetbar: false, //是否显示底部表格名称区域
pointEdit: false, //是否是编辑器插入表格模式
pointEditUpdate: null, //编辑器表格更新函数
allowEdit: false,//作用：是否允许前台编辑
functionButton: '<button id="exportButton" class="btn btn-primary" style=" padding:3px 6px; font-size: 16px;width: 100px;height: 27px; margin-right: 85px;" onclick="handleReturnButtonClick()">返回</button>',
});
});
},
/**详情返回按钮 */
handleReturnButtonClick() {
......@@ -293,7 +301,7 @@ export default {
luckysheet.destroy();
},
/** 删除按钮操作 */
handleDelete(row) {
/* handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm('是否确认删除 历史数据编号为"' + ids + '"的数据项?', "警告", {
confirmButtonText: "确定",
......@@ -305,7 +313,7 @@ export default {
this.getList();
this.msgSuccess("删除成功");
})
},
},*/
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
......
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