From 7329c54eab5b9f6a9773e7a9fb8d969974d50b9d Mon Sep 17 00:00:00 2001 From: shaoyong Date: Tue, 24 Oct 2023 18:07:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=A3=80=E9=AA=8C=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=B4=E6=8A=A4=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/controller/QcMaterialGroupController.java | 2 +- .../controller/QcMaterialGroupDetailController.java | 2 +- .../java/com/op/quality/domain/QcCheckProject.java | 10 ++++++++++ .../com/op/quality/domain/QcCheckTypeProject.java | 11 ++++++++++- .../com/op/quality/mapper/QcCheckProjectMapper.java | 2 ++ .../serviceImpl/QcCheckProjectServiceImpl.java | 10 ++++++++++ .../serviceImpl/QcCheckTypeProjectServiceImpl.java | 1 - .../serviceImpl/QcMaterialGroupDetailServiceImpl.java | 1 + .../serviceImpl/QcMaterialGroupServiceImpl.java | 1 + .../serviceImpl/QcUserMaterialServiceImpl.java | 1 + .../resources/mapper/quality/QcCheckProjectMapper.xml | 6 ++++++ .../mapper/quality/QcCheckTypeProjectMapper.xml | 4 +++- .../mapper/quality/QcMaterialGroupDetailMapper.xml | 2 +- .../mapper/quality/QcMaterialGroupMapper.xml | 2 +- 14 files changed, 48 insertions(+), 7 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java index 06835b433..d30478830 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java @@ -98,7 +98,7 @@ public class QcMaterialGroupController extends BaseController { */ @RequiresPermissions("quality:materialGroup:remove") @Log(title = "物料组", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") + @DeleteMapping("/{id}") public AjaxResult remove(@PathVariable String id) { QcMaterialGroup parent = new QcMaterialGroup(); parent.setId(id); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupDetailController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupDetailController.java index 35e11ec7b..73d670bd1 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupDetailController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupDetailController.java @@ -92,7 +92,7 @@ public class QcMaterialGroupDetailController extends BaseController { */ @RequiresPermissions("quality:materialGroupDetail:remove") @Log(title = "物料组成员", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") + @DeleteMapping("/{id}") public AjaxResult remove(@PathVariable String id) { QcMaterialGroupDetail groupDetail = qcMaterialGroupDetailService.selectQcMaterialGroupDetailById(id); boolean hasRule = qcMaterialGroupDetailService.validationData(groupDetail.getMaterialCode()); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java index 2676ee09a..9fa1b38f0 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java @@ -56,6 +56,8 @@ public class QcCheckProject extends BaseEntity { /** 删除标识1删除0正常 */ private String delFlag; + private Long serialNumber; + public void setId(String id) { this.id = id; } @@ -134,6 +136,14 @@ public class QcCheckProject extends BaseEntity { return delFlag; } + public Long getSerialNumber() { + return serialNumber; + } + + public void setSerialNumber(Long serialNumber) { + this.serialNumber = serialNumber; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java index f5094d7a2..bc93b9a06 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java @@ -72,6 +72,8 @@ public class QcCheckTypeProject extends BaseEntity { private Integer sort; + private String projectNo; + public Integer getSort() { return sort; } @@ -191,11 +193,18 @@ public class QcCheckTypeProject extends BaseEntity { public String getPropertyCode() { return propertyCode; } - public void setPropertyCode(String propertyCode) { this.propertyCode = propertyCode; } + public String getProjectNo() { + return projectNo; + } + + public void setProjectNo(String projectNo) { + this.projectNo = projectNo; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckProjectMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckProjectMapper.java index 1c5f8282a..7e7be901d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckProjectMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckProjectMapper.java @@ -60,4 +60,6 @@ public interface QcCheckProjectMapper { * @return 结果 */ public int deleteQcCheckProjectByIds(String[] ids); + + public QcCheckProject selectSerialNumber(); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckProjectServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckProjectServiceImpl.java index f949c67d2..c37f5bc59 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckProjectServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckProjectServiceImpl.java @@ -63,6 +63,7 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService { public int insertQcCheckProject(QcCheckProject qcCheckProject) { if (StringUtils.isNotBlank(qcCheckProject.getRuleName())){ qcCheckProject.setId(IdUtils.fastSimpleUUID()); + qcCheckProject.setOrderNum(getOrderNum()); qcCheckProject.setCreateBy(SecurityUtils.getUsername()); qcCheckProject.setCreateTime(DateUtils.getNowDate()); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); @@ -111,4 +112,13 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService { public int deleteQcCheckProjectById(String id) { return qcCheckProjectMapper.deleteQcCheckProjectById(id); } + + private String getOrderNum() { + String orderNum = ""; + String now = DateUtils.getDate(); + now = now.replace("-",""); + QcCheckProject checkProject = qcCheckProjectMapper.selectSerialNumber(); + orderNum = now + "0" + checkProject.getSerialNumber(); + return orderNum; + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeProjectServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeProjectServiceImpl.java index b1ecb32ad..c1eb83b35 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeProjectServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeProjectServiceImpl.java @@ -6,7 +6,6 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; -import org.apache.catalina.security.SecurityUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.quality.mapper.QcCheckTypeProjectMapper; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcMaterialGroupDetailServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcMaterialGroupDetailServiceImpl.java index 8ee3d17f7..5867ad430 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcMaterialGroupDetailServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcMaterialGroupDetailServiceImpl.java @@ -107,6 +107,7 @@ public class QcMaterialGroupDetailServiceImpl implements IQcMaterialGroupDetailS } @Override + @DS("#header.poolName") public boolean validationData(String materialCode) { return qcMaterialGroupDetailMapper.validationData(materialCode).size() > 0; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcMaterialGroupServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcMaterialGroupServiceImpl.java index c6466dcce..4307a3bc3 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcMaterialGroupServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcMaterialGroupServiceImpl.java @@ -174,6 +174,7 @@ public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService { } @Override + @DS("#header.poolName") public boolean validationData(String id) { return qcMaterialGroupMapper.validationData(id).size() > 0; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcUserMaterialServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcUserMaterialServiceImpl.java index e369e4d71..ca9eeb4d6 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcUserMaterialServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcUserMaterialServiceImpl.java @@ -30,6 +30,7 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { private QcUserMaterialMapper qcUserMaterialMapper; @Override + @DS("#header.poolName") public List selectUserList(QcUserMaterial qcUserMaterial) { return qcUserMaterialMapper.selectUserList( qcUserMaterial); } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckProjectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckProjectMapper.xml index 3ec1b2aef..d8a447efe 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckProjectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckProjectMapper.xml @@ -116,4 +116,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + \ No newline at end of file diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml index 71f587bca..848abac15 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml @@ -156,6 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group_id, material_code, sample_num + project_no #{id}, @@ -175,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{delFlag}, #{groupId}, #{materialCode}, - #{sampleNum} + #{projectNo} @@ -199,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group_id = #{groupId}, material_code = #{materialCode}, sample_num = #{sampleNum} + project_no = #{projectNo} where id = #{id} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupDetailMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupDetailMapper.xml index c9e5cbd8a..47207f0f2 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupDetailMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupDetailMapper.xml @@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - select id, create_by, diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml index a90f283a8..87dfadf08 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml @@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - select id, create_by,