From 6551e07899ebbb2681b0dc455d6b3a651a1ab0b5 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 20 Oct 2023 14:04:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=B3=BB=E7=BB=9F-=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=862?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/system/api/domain/SysUser.java | 9 + .../QcCheckTaskIncomeController.java | 21 ++ .../com/op/quality/domain/QcSupplier.java | 300 ++++++++++++++++++ .../mapper/QcCheckTaskIncomeMapper.java | 6 + .../service/IQcCheckTaskIncomeService.java | 6 + .../impl/QcCheckTaskIncomeServiceImpl.java | 14 + .../quality/QcCheckTaskIncomeMapper.xml | 20 +- 7 files changed, 375 insertions(+), 1 deletion(-) create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/domain/QcSupplier.java diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java index 32c7dbb0..56102a91 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java @@ -31,6 +31,7 @@ public class SysUser extends BaseEntity { /** 用户账号 */ @Excel(name = "登录名称") private String userName; + private String userCode; /** 用户昵称 */ @Excel(name = "用户名称") @@ -99,6 +100,14 @@ public class SysUser extends BaseEntity { } + public String getUserCode() { + return userCode; + } + + public void setUserCode(String userCode) { + this.userCode = userCode; + } + public SysUser(Long userId) { this.userId = userId; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java index 68bc62da..39663522 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java @@ -4,6 +4,8 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.op.quality.domain.QcBomComponent; +import com.op.quality.domain.QcSupplier; +import com.op.system.api.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -106,4 +108,23 @@ public class QcCheckTaskIncomeController extends BaseController { List list = qcCheckTaskIncomeService.getQcListBom(bomComponent); return getDataTable(list); } + /** + * 查询供应商列表 + */ + @GetMapping("/getQcListSupplier") + public TableDataInfo getQcListSupplier(QcSupplier qcSupplier) { + startPage(); + List list = qcCheckTaskIncomeService.getQcListSupplier(qcSupplier); + return getDataTable(list); + } + /** + * 查询人员列表 + */ + @GetMapping("/getQcListUser") + public TableDataInfo getQcListUser(SysUser sysUser) { + startPage(); + List list = qcCheckTaskIncomeService.getQcListUser(sysUser); + return getDataTable(list); + } + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcSupplier.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcSupplier.java new file mode 100644 index 00000000..3a360641 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcSupplier.java @@ -0,0 +1,300 @@ +package com.op.quality.domain; + +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; + +/** + * 供应商管理对象 base_supplier + * + * @author Open Platform + * @date 2023-07-18 + */ +public class QcSupplier extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键uuid */ + private String supplierId; + + /** 供应商代码 */ + @Excel(name = "供应商代码") + private String supplierCode; + private String supplierName; + + /** 中文描述 */ + @Excel(name = "中文描述") + private String zhDesc; + + /** 英文描述 */ + @Excel(name = "英文描述") + private String enDesc; + + /** 供应商类型 */ + @Excel(name = "供应商类型") + private String supplierType; + + /** 账号 */ + @Excel(name = "账号") + private String accountNumber; + + /** 证照编码 */ + @Excel(name = "证照编码") + private String licenceNumber; + + /** 经营范围 */ + @Excel(name = "经营范围") + private String businessScope; + + /** 省 */ + @Excel(name = "省") + private String province; + + /** 市 */ + @Excel(name = "市") + private String city; + + /** 区 */ + @Excel(name = "区") + private String area; + + /** 详细地址 */ + @Excel(name = "详细地址") + private String address; + + /** 邮编 */ + @Excel(name = "邮编") + private String postcode; + + /** 联系人 */ + @Excel(name = "联系人") + private String contact; + + /** 联系人电话 */ + @Excel(name = "联系人电话") + private String contactPhone; + + /** 联系人职务 */ + @Excel(name = "联系人职务") + private String contactPosition; + + /** 联系人电子邮件 */ + @Excel(name = "联系人电子邮件") + private String contactEmail; + + /** 激活标记 */ + @Excel(name = "激活标记") + private String activeFlag; + + /** 用户自定义1--国家 */ + @Excel(name = "用户自定义1--国家") + private String userDefined1; + + /** 用户自定义2--税号 */ + @Excel(name = "用户自定义2--税号") + private String userDefined2; + + /** 用户自定义3 */ + @Excel(name = "用户自定义3") + private String userDefined3; + + /** 删除标志 */ + @Excel(name = "删除标志") + private String delFlag; + + public String getSupplierName() { + return supplierName; + } + + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + public String getDelFlag() { + return delFlag; + } + + public void setSupplierId(String supplierId) { + this.supplierId = supplierId; + } + + public String getSupplierId() { + return supplierId; + } + public void setSupplierCode(String supplierCode) { + this.supplierCode = supplierCode; + } + + public String getSupplierCode() { + return supplierCode; + } + public void setZhDesc(String zhDesc) { + this.zhDesc = zhDesc; + } + + public String getZhDesc() { + return zhDesc; + } + public void setEnDesc(String enDesc) { + this.enDesc = enDesc; + } + + public String getEnDesc() { + return enDesc; + } + public void setSupplierType(String supplierType) { + this.supplierType = supplierType; + } + + public String getSupplierType() { + return supplierType; + } + public void setAccountNumber(String accountNumber) { + this.accountNumber = accountNumber; + } + + public String getAccountNumber() { + return accountNumber; + } + public void setLicenceNumber(String licenceNumber) { + this.licenceNumber = licenceNumber; + } + + public String getLicenceNumber() { + return licenceNumber; + } + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessScope() { + return businessScope; + } + public void setProvince(String province) { + this.province = province; + } + + public String getProvince() { + return province; + } + public void setCity(String city) { + this.city = city; + } + + public String getCity() { + return city; + } + public void setArea(String area) { + this.area = area; + } + + public String getArea() { + return area; + } + public void setAddress(String address) { + this.address = address; + } + + public String getAddress() { + return address; + } + public void setPostcode(String postcode) { + this.postcode = postcode; + } + + public String getPostcode() { + return postcode; + } + public void setContact(String contact) { + this.contact = contact; + } + + public String getContact() { + return contact; + } + public void setContactPhone(String contactPhone) { + this.contactPhone = contactPhone; + } + + public String getContactPhone() { + return contactPhone; + } + public void setContactPosition(String contactPosition) { + this.contactPosition = contactPosition; + } + + public String getContactPosition() { + return contactPosition; + } + public void setContactEmail(String contactEmail) { + this.contactEmail = contactEmail; + } + + public String getContactEmail() { + return contactEmail; + } + public void setActiveFlag(String activeFlag) { + this.activeFlag = activeFlag; + } + + public String getActiveFlag() { + return activeFlag; + } + public void setUserDefined1(String userDefined1) { + this.userDefined1 = userDefined1; + } + + public String getUserDefined1() { + return userDefined1; + } + public void setUserDefined2(String userDefined2) { + this.userDefined2 = userDefined2; + } + + public String getUserDefined2() { + return userDefined2; + } + public void setUserDefined3(String userDefined3) { + this.userDefined3 = userDefined3; + } + + public String getUserDefined3() { + return userDefined3; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("supplierId", getSupplierId()) + .append("supplierCode", getSupplierCode()) + .append("zhDesc", getZhDesc()) + .append("enDesc", getEnDesc()) + .append("supplierType", getSupplierType()) + .append("accountNumber", getAccountNumber()) + .append("licenceNumber", getLicenceNumber()) + .append("businessScope", getBusinessScope()) + .append("province", getProvince()) + .append("city", getCity()) + .append("area", getArea()) + .append("address", getAddress()) + .append("postcode", getPostcode()) + .append("contact", getContact()) + .append("contactPhone", getContactPhone()) + .append("contactPosition", getContactPosition()) + .append("contactEmail", getContactEmail()) + .append("activeFlag", getActiveFlag()) + .append("userDefined1", getUserDefined1()) + .append("userDefined2", getUserDefined2()) + .append("userDefined3", getUserDefined3()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java index cd1a8835..97bba6ea 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java @@ -4,6 +4,8 @@ import java.util.List; import com.op.quality.domain.QcBomComponent; import com.op.quality.domain.QcCheckTaskIncome; +import com.op.quality.domain.QcSupplier; +import com.op.system.api.domain.SysUser; /** * 来料检验Mapper接口 @@ -61,4 +63,8 @@ public interface QcCheckTaskIncomeMapper { public int deleteQcCheckTaskIncomeByRecordIds(String[] recordIds); public List getQcListBom(QcBomComponent bomComponent); + + public List getQcListSupplier(QcSupplier qcSupplier); + + public List getQcListUser(SysUser sysUser); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java index 4432d512..ea17af8f 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java @@ -4,6 +4,8 @@ import java.util.List; import com.op.quality.domain.QcBomComponent; import com.op.quality.domain.QcCheckTaskIncome; +import com.op.quality.domain.QcSupplier; +import com.op.system.api.domain.SysUser; /** * 来料检验Service接口 @@ -61,4 +63,8 @@ public interface IQcCheckTaskIncomeService { public int deleteQcCheckTaskIncomeByRecordId(String recordId); public List getQcListBom(com.op.quality.domain.QcBomComponent bomComponent); + + public List getQcListSupplier(QcSupplier qcSupplier); + + public List getQcListUser(SysUser sysUser); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index a97c6b1a..06c65812 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -5,6 +5,8 @@ import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; import com.op.quality.domain.QcBomComponent; +import com.op.quality.domain.QcSupplier; +import com.op.system.api.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.quality.mapper.QcCheckTaskIncomeMapper; @@ -102,4 +104,16 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { return qcCheckTaskIncomeMapper.getQcListBom(bomComponent); } + @Override + @DS("#header.poolName") + public List getQcListSupplier(QcSupplier qcSupplier) { + return qcCheckTaskIncomeMapper.getQcListSupplier(qcSupplier); + } + + //在公共库里不需要切库 + @Override + public List getQcListUser(SysUser sysUser) { + return qcCheckTaskIncomeMapper.getQcListUser(sysUser); + } + } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index 2ad2c75a..05e727b7 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -78,8 +78,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and product_code like concat('%', #{component}, '%') and product_desc_zh like concat('%', #{componentName}, '%') + + - + insert into qc_check_task_income record_id,