测试版本注册中心修改

highway
zhaoxiaolin 1 year ago
parent 362a8ac15a
commit 15157dd26e

@ -0,0 +1,342 @@
package com.op.system.api.domain.mes;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
import java.util.List;
/**
* base_team_t
*
* @author Open Platform
* @date 2023-07-05
*/
public class BaseTeamTDTO extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 班组主键 */
private String teamId;
/** 组织机构主键 */
@Excel(name = "组织机构主键")
private String orgId;
/** 班组编码 */
@Excel(name = "班组编码")
private String teamCode;
/** 班组简称 */
@Excel(name = "班组简称")
private String teamDesc;
/** 班组通用名称 */
@Excel(name = "班组通用名称")
private String teamDescGlobal;
/** 班组扩展名称 */
@Excel(name = "班组扩展名称")
private String teamDescExtended;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createDate;
/** 最后更新人 */
@Excel(name = "最后更新人")
private String lastUpdateBy;
/** 最后更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date lastUpdateDate;
/** 可用标识 */
@Excel(name = "可用标识")
private String Active;
/** 企业主键 */
@Excel(name = "企业主键")
private String enterpriseId;
/** 企业编码 */
@Excel(name = "企业编码")
private String enterpriseCode;
/** 工厂主键 */
@Excel(name = "工厂主键")
private String siteId;
/** 工厂编码 */
@Excel(name = "工厂编码")
private String siteCode;
/** 线体编码 */
@Excel(name = "线体编码")
private String productionLineCode;
/** 班组长编码 */
@Excel(name = "班组长编码")
private String teamLeaderCode;
/** 班组长编码 */
@Excel(name = "班组长编码")
private String teamLeaderName;
/** 定编岗位数量 */
@Excel(name = "定编岗位数量")
private Integer planPostQuantity;
/** 已分配岗位数量 */
@Excel(name = "已分配岗位数量")
private Integer actualPostQuantity;
/** 薪酬类型(0总装1:小时节点筹; */
@Excel(name = "薪酬类型(0总装1:小时节点筹;")
private String salaryType;
/** 班组属性 */
@Excel(name = "班组属性")
private String teamProperties;
/** 应出勤人数 */
@Excel(name = "应出勤人数")
private Integer attendanceQuantity;
/** 已分配人数 */
@Excel(name = "已分配人数")
private Integer assignedQuantity;
/** 班组类型 */
@Excel(name = "班组类型")
private String teamType;
private List<String> rightData;
/** 删除标志 */
@Excel(name = "删除标志")
private String delFlag;
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
public void setRightData(List<String> rightData) {
this.rightData = rightData;
}
public List<String> getRightData() {
return rightData;
}
public void setTeamType(String teamType) {
this.teamType = teamType;
}
public String getTeamType() {
return teamType;
}
public void setTeamId(String teamId) {
this.teamId = teamId;
}
public String getTeamId() {
return teamId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getOrgId() {
return orgId;
}
public void setTeamCode(String teamCode) {
this.teamCode = teamCode;
}
public String getTeamCode() {
return teamCode;
}
public void setTeamDesc(String teamDesc) {
this.teamDesc = teamDesc;
}
public String getTeamDesc() {
return teamDesc;
}
public void setTeamDescGlobal(String teamDescGlobal) {
this.teamDescGlobal = teamDescGlobal;
}
public String getTeamDescGlobal() {
return teamDescGlobal;
}
public void setTeamDescExtended(String teamDescExtended) {
this.teamDescExtended = teamDescExtended;
}
public String getTeamDescExtended() {
return teamDescExtended;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
public Date getCreateDate() {
return createDate;
}
public void setLastUpdateBy(String lastUpdateBy) {
this.lastUpdateBy = lastUpdateBy;
}
public String getLastUpdateBy() {
return lastUpdateBy;
}
public void setLastUpdateDate(Date lastUpdateDate) {
this.lastUpdateDate = lastUpdateDate;
}
public Date getLastUpdateDate() {
return lastUpdateDate;
}
public void setActive(String Active) {
this.Active = Active;
}
public String getActive() {
return Active;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseCode(String enterpriseCode) {
this.enterpriseCode = enterpriseCode;
}
public String getEnterpriseCode() {
return enterpriseCode;
}
public void setSiteId(String siteId) {
this.siteId = siteId;
}
public String getSiteId() {
return siteId;
}
public void setSiteCode(String siteCode) {
this.siteCode = siteCode;
}
public String getSiteCode() {
return siteCode;
}
public void setProductionLineCode(String productionLineCode) {
this.productionLineCode = productionLineCode;
}
public String getProductionLineCode() {
return productionLineCode;
}
public void setTeamLeaderCode(String teamLeaderCode) {
this.teamLeaderCode = teamLeaderCode;
}
public String getTeamLeaderCode() {
return teamLeaderCode;
}
public void setTeamLeaderName(String teamLeaderName) {
this.teamLeaderName = teamLeaderName;
}
public String getTeamLeaderName() {
return teamLeaderName;
}
public void setPlanPostQuantity(Integer planPostQuantity) {
this.planPostQuantity = planPostQuantity;
}
public Integer getPlanPostQuantity() {
return planPostQuantity;
}
public void setActualPostQuantity(Integer actualPostQuantity) {
this.actualPostQuantity = actualPostQuantity;
}
public Integer getActualPostQuantity() {
return actualPostQuantity;
}
public void setSalaryType(String salaryType) {
this.salaryType = salaryType;
}
public String getSalaryType() {
return salaryType;
}
public void setTeamProperties(String teamProperties) {
this.teamProperties = teamProperties;
}
public String getTeamProperties() {
return teamProperties;
}
public void setAttendanceQuantity(Integer attendanceQuantity) {
this.attendanceQuantity = attendanceQuantity;
}
public Integer getAttendanceQuantity() {
return attendanceQuantity;
}
public void setAssignedQuantity(Integer assignedQuantity) {
this.assignedQuantity = assignedQuantity;
}
public Integer getAssignedQuantity() {
return assignedQuantity;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("teamId", getTeamId())
.append("orgId", getOrgId())
.append("teamCode", getTeamCode())
.append("teamDesc", getTeamDesc())
.append("teamDescGlobal", getTeamDescGlobal())
.append("teamDescExtended", getTeamDescExtended())
.append("createBy", getCreateBy())
.append("createDate", getCreateDate())
.append("lastUpdateBy", getLastUpdateBy())
.append("lastUpdateDate", getLastUpdateDate())
.append("Active", getActive())
.append("enterpriseId", getEnterpriseId())
.append("enterpriseCode", getEnterpriseCode())
.append("siteId", getSiteId())
.append("siteCode", getSiteCode())
.append("productionLineCode", getProductionLineCode())
.append("teamLeaderCode", getTeamLeaderCode())
.append("teamLeaderName", getTeamLeaderName())
.append("planPostQuantity", getPlanPostQuantity())
.append("actualPostQuantity", getActualPostQuantity())
.append("salaryType", getSalaryType())
.append("teamProperties", getTeamProperties())
.append("attendanceQuantity", getAttendanceQuantity())
.append("assignedQuantity", getAssignedQuantity())
.append("teamType", getTeamType())
.append("delFlag", getDelFlag())
.toString();
}
}

@ -19,13 +19,13 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
#命名空间
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

@ -19,13 +19,13 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
#命名空间
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置
@ -41,7 +41,7 @@ spring:
datasource:
ds1:
nacos:
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
dataId: sentinel-op-gateway
groupId: DEFAULT_GROUP
data-type: json

@ -16,12 +16,12 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

@ -16,12 +16,12 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

@ -16,13 +16,13 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
# 配置中心地址
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

@ -16,13 +16,13 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
#命名空间
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

@ -16,12 +16,12 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.system.api.domain.dto.BaseBomDTO;
import com.op.system.api.domain.mes.BaseProductDTO;
import com.op.system.api.domain.mes.BaseTeamTDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -119,4 +120,12 @@ public class MesReportWorkConsumeController extends BaseController {
List<BaseBomDTO> list = mesReportWorkConsumeService.getMesListBom(dto);
return getDataTable(list);
}
/**获取班组**/
@GetMapping("/getTeamList")
public List<BaseTeamTDTO> getTeamList(BaseTeamTDTO dto) {
startPage();
List<BaseTeamTDTO> list = mesReportWorkConsumeService.getTeamList(dto);
return list;
}
}

@ -4,6 +4,7 @@ import java.util.List;
import com.op.mes.domain.MesReportWorkConsume;
import com.op.system.api.domain.dto.BaseBomDTO;
import com.op.system.api.domain.mes.BaseTeamTDTO;
/**
* Mapper
@ -63,4 +64,6 @@ public interface MesReportWorkConsumeMapper {
List<MesReportWorkConsume> selectMesReportWorkConsumeListById(MesReportWorkConsume mesReportWorkConsume);
List<BaseBomDTO> getMesListBom(BaseBomDTO dto);
List<BaseTeamTDTO> getTeamList(BaseTeamTDTO dto);
}

@ -4,6 +4,7 @@ import java.util.List;
import com.op.mes.domain.MesReportWorkConsume;
import com.op.system.api.domain.dto.BaseBomDTO;
import com.op.system.api.domain.mes.BaseProductDTO;
import com.op.system.api.domain.mes.BaseTeamTDTO;
/**
* Service
@ -69,4 +70,6 @@ public interface IMesReportWorkConsumeService {
public int deleteMesReportWorkConsumeByRecordId(String recordId);
public List<BaseBomDTO> getMesListBom(BaseBomDTO dto);
public List<BaseTeamTDTO> getTeamList(BaseTeamTDTO dto);
}

@ -7,6 +7,7 @@ import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.system.api.domain.dto.BaseBomDTO;
import com.op.system.api.domain.mes.BaseProductDTO;
import com.op.system.api.domain.mes.BaseTeamTDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.mes.mapper.MesReportWorkConsumeMapper;
@ -117,5 +118,10 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer
return mesReportWorkConsumeMapper.getMesListBom(dto);
}
@Override
public List<BaseTeamTDTO> getTeamList(BaseTeamTDTO dto) {
return mesReportWorkConsumeMapper.getTeamList(dto);
}
}

@ -16,12 +16,12 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

@ -75,8 +75,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productGroup != null and productGroup != ''"> and bp.product_group like concat('%', #{productGroup}, '%')</if>
<if test="productGroupName != null and productGroupName != ''"> and bp.product_group_name like concat('%', #{productGroupName}, '%')</if>
</select>
<select id="getTeamList" resultType="com.op.system.api.domain.mes.BaseTeamTDTO">
select Team_Code teamCode,
Team_Desc teamDesc
from base_team_t
where del_flag = '0'
</select>
<insert id="insertMesReportWorkConsume" parameterType="MesReportWorkConsume">
<insert id="insertMesReportWorkConsume" parameterType="MesReportWorkConsume">
insert into mes_report_work_consume
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="recordId != null">record_id,</if>

@ -16,12 +16,12 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

@ -16,12 +16,12 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

@ -36,7 +36,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectQcCheckReportIncomeVo">
select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit, supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag from qc_check_task
select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit,
supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name,
check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time,
factory_code, del_flag from qc_check_task
</sql>
<select id="selectQcCheckReportIncomeList" parameterType="QcCheckReportIncome" resultMap="QcCheckReportIncomeResult">

@ -16,12 +16,12 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

@ -16,12 +16,12 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

@ -16,12 +16,12 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

@ -153,7 +153,7 @@
<if test="orderNum != null">order_num = #{orderNum},</if>
<if test="path != null and path != ''">path = #{path},</if>
<if test="component != null">component = #{component},</if>
<if test="query != null">`query` = #{query},</if>
<if test="query != null">query = #{query},</if>
<if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
<if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
<if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
@ -176,7 +176,7 @@
<if test="orderNum != null">order_num,</if>
<if test="path != null and path != ''">path,</if>
<if test="component != null and component != ''">component,</if>
<if test="query != null and query != ''">`query`,</if>
<if test="query != null and query != ''">query,</if>
<if test="isFrame != null and isFrame != ''">is_frame,</if>
<if test="isCache != null and isCache != ''">is_cache,</if>
<if test="menuType != null and menuType != ''">menu_type,</if>

@ -16,12 +16,12 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

@ -16,12 +16,12 @@ spring:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
config:
namespace: lanju-op
group: zxl
# 服务注册地址
server-addr: 140.249.53.142:8848
server-addr: 175.27.215.92:8848
# 配置文件格式
file-extension: yml
# 共享配置

Loading…
Cancel
Save