From 15157dd26e11b7679c2407c18596b55e4ffacb40 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 8 Nov 2023 09:05:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E4=B8=AD=E5=BF=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/domain/mes/BaseTeamTDTO.java | 342 ++++++++++++++++++ op-auth/src/main/resources/bootstrap.yml | 4 +- op-gateway/src/main/resources/bootstrap.yml | 6 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../op-file/src/main/resources/bootstrap.yml | 4 +- .../op-gen/src/main/resources/bootstrap.yml | 4 +- .../op-job/src/main/resources/bootstrap.yml | 4 +- .../MesReportWorkConsumeController.java | 9 + .../mapper/MesReportWorkConsumeMapper.java | 3 + .../service/IMesReportWorkConsumeService.java | 3 + .../impl/MesReportWorkConsumeServiceImpl.java | 6 + .../op-mes/src/main/resources/bootstrap.yml | 4 +- .../mapper/mes/MesReportWorkConsumeMapper.xml | 8 +- .../op-plan/src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../quality/QcCheckReportIncomeMapper.xml | 5 +- .../op-sap/src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../resources/mapper/system/SysMenuMapper.xml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../op-wms/src/main/resources/bootstrap.yml | 4 +- 23 files changed, 407 insertions(+), 35 deletions(-) create mode 100644 op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseTeamTDTO.java diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseTeamTDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseTeamTDTO.java new file mode 100644 index 00000000..03f50102 --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseTeamTDTO.java @@ -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 rightData; + + /** 删除标志 */ + @Excel(name = "删除标志") + private String delFlag; + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + public String getDelFlag() { + return delFlag; + } + + public void setRightData(List rightData) { + this.rightData = rightData; + } + + public List 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(); + } +} diff --git a/op-auth/src/main/resources/bootstrap.yml b/op-auth/src/main/resources/bootstrap.yml index 068f4b57..b83233e2 100644 --- a/op-auth/src/main/resources/bootstrap.yml +++ b/op-auth/src/main/resources/bootstrap.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 # 共享配置 diff --git a/op-gateway/src/main/resources/bootstrap.yml b/op-gateway/src/main/resources/bootstrap.yml index bd1f68ea..8103b4a8 100644 --- a/op-gateway/src/main/resources/bootstrap.yml +++ b/op-gateway/src/main/resources/bootstrap.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 diff --git a/op-modules/op-device/src/main/resources/bootstrap.yml b/op-modules/op-device/src/main/resources/bootstrap.yml index b166ed59..efdd19ba 100644 --- a/op-modules/op-device/src/main/resources/bootstrap.yml +++ b/op-modules/op-device/src/main/resources/bootstrap.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 # 共享配置 diff --git a/op-modules/op-energy/src/main/resources/bootstrap.yml b/op-modules/op-energy/src/main/resources/bootstrap.yml index 57f1f21a..5565492d 100644 --- a/op-modules/op-energy/src/main/resources/bootstrap.yml +++ b/op-modules/op-energy/src/main/resources/bootstrap.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 # 共享配置 diff --git a/op-modules/op-file/src/main/resources/bootstrap.yml b/op-modules/op-file/src/main/resources/bootstrap.yml index 4761653f..87f14b59 100644 --- a/op-modules/op-file/src/main/resources/bootstrap.yml +++ b/op-modules/op-file/src/main/resources/bootstrap.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 # 共享配置 diff --git a/op-modules/op-gen/src/main/resources/bootstrap.yml b/op-modules/op-gen/src/main/resources/bootstrap.yml index 8bbf1fa7..75c3c997 100644 --- a/op-modules/op-gen/src/main/resources/bootstrap.yml +++ b/op-modules/op-gen/src/main/resources/bootstrap.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 # 共享配置 diff --git a/op-modules/op-job/src/main/resources/bootstrap.yml b/op-modules/op-job/src/main/resources/bootstrap.yml index 6c487c9e..e2706f6d 100644 --- a/op-modules/op-job/src/main/resources/bootstrap.yml +++ b/op-modules/op-job/src/main/resources/bootstrap.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 # 共享配置 diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkConsumeController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkConsumeController.java index 4794e870..d4009628 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkConsumeController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkConsumeController.java @@ -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 list = mesReportWorkConsumeService.getMesListBom(dto); return getDataTable(list); } + + /**获取班组**/ + @GetMapping("/getTeamList") + public List getTeamList(BaseTeamTDTO dto) { + startPage(); + List list = mesReportWorkConsumeService.getTeamList(dto); + return list; + } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java index 1113aea8..befe9fda 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java @@ -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 selectMesReportWorkConsumeListById(MesReportWorkConsume mesReportWorkConsume); List getMesListBom(BaseBomDTO dto); + + List getTeamList(BaseTeamTDTO dto); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java index 61b93cdd..ba8fd9d6 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java @@ -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 getMesListBom(BaseBomDTO dto); + + public List getTeamList(BaseTeamTDTO dto); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java index 06677fa3..44959025 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java @@ -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 getTeamList(BaseTeamTDTO dto) { + return mesReportWorkConsumeMapper.getTeamList(dto); + } + } diff --git a/op-modules/op-mes/src/main/resources/bootstrap.yml b/op-modules/op-mes/src/main/resources/bootstrap.yml index 014cd085..a4dc0dd0 100644 --- a/op-modules/op-mes/src/main/resources/bootstrap.yml +++ b/op-modules/op-mes/src/main/resources/bootstrap.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 # 共享配置 diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml index 2b003bf2..57853cf0 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml @@ -75,8 +75,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bp.product_group like concat('%', #{productGroup}, '%') and bp.product_group_name like concat('%', #{productGroupName}, '%') + - + insert into mes_report_work_consume record_id, diff --git a/op-modules/op-plan/src/main/resources/bootstrap.yml b/op-modules/op-plan/src/main/resources/bootstrap.yml index 3f029c5d..39d689e4 100644 --- a/op-modules/op-plan/src/main/resources/bootstrap.yml +++ b/op-modules/op-plan/src/main/resources/bootstrap.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 # 共享配置 diff --git a/op-modules/op-quality/src/main/resources/bootstrap.yml b/op-modules/op-quality/src/main/resources/bootstrap.yml index d9eea330..b7338532 100644 --- a/op-modules/op-quality/src/main/resources/bootstrap.yml +++ b/op-modules/op-quality/src/main/resources/bootstrap.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 # 共享配置 diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml index bc241d47..70b71de0 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml @@ -36,7 +36,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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