From 7329c54eab5b9f6a9773e7a9fb8d969974d50b9d Mon Sep 17 00:00:00 2001 From: shaoyong Date: Tue, 24 Oct 2023 18:07:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E9=A1=B9=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 06835b43..d3047883 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 35e11ec7..73d670bd 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 2676ee09..9fa1b38f 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 f5094d7a..bc93b9a0 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 1c5f8282..7e7be901 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 f949c67d..c37f5bc5 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 b1ecb32a..c1eb83b3 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 8ee3d17f..5867ad43 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 c6466dcc..4307a3bc 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 e369e4d7..ca9eeb4d 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 3ec1b2ae..d8a447ef 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 71f587bc..848abac1 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 c9e5cbd8..47207f0f 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 a90f283a..87dfadf0 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, From 9d55da3a0b3c0adabcbbfdfae74045a2cb562861 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 25 Oct 2023 08:46:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E6=A3=80=E9=AA=8C+=E6=89=8B=E6=8C=81=E5=8F=91=E7=89=88?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IWCInterfaceServiceImpl.java | 3 + .../QcCheckTaskProduceController.java | 48 +++++++ .../op/quality/domain/QcCheckTaskProduce.java | 39 +++++- .../service/IQcCheckTaskProduceService.java | 16 ++- .../impl/QcCheckTaskProduceServiceImpl.java | 7 + .../quality/QcCheckTaskProduceMapper.xml | 16 ++- .../controller/BaseApkFileController.java | 108 +++++++++++++++ .../com/op/system/domain/BaseApkFile.java | 123 ++++++++++++++++++ .../op/system/mapper/BaseApkFileMapper.java | 65 +++++++++ .../system/service/IBaseApkFileService.java | 62 +++++++++ .../service/impl/BaseApkFileServiceImpl.java | 98 ++++++++++++++ .../mapper/system/BaseApkFileMapper.xml | 117 +++++++++++++++++ 12 files changed, 688 insertions(+), 14 deletions(-) create mode 100644 op-modules/op-system/src/main/java/com/op/system/controller/BaseApkFileController.java create mode 100644 op-modules/op-system/src/main/java/com/op/system/domain/BaseApkFile.java create mode 100644 op-modules/op-system/src/main/java/com/op/system/mapper/BaseApkFileMapper.java create mode 100644 op-modules/op-system/src/main/java/com/op/system/service/IBaseApkFileService.java create mode 100644 op-modules/op-system/src/main/java/com/op/system/service/impl/BaseApkFileServiceImpl.java create mode 100644 op-modules/op-system/src/main/resources/mapper/system/BaseApkFileMapper.xml diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index 020ab184..1a0b384d 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -131,6 +131,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } dto.setStationNos(stationNos); dto.setCode("0"); + }else{ + dto.setCode("1"); + dto.setMessage("MES管理系统接口调用异常:数据缺失"); } }catch (Exception e){ dto.setCode("1"); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskProduceController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskProduceController.java index d0773a15..3296d3eb 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskProduceController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskProduceController.java @@ -1,7 +1,13 @@ package com.op.quality.controller; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.op.common.core.utils.DateUtils; +import com.op.quality.domain.QcSupplier; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -39,6 +45,22 @@ public class QcCheckTaskProduceController extends BaseController { @RequiresPermissions("quality:qcProduce:list") @GetMapping("/list") public TableDataInfo list(QcCheckTaskProduce qcCheckTaskProduce) { + + //默认时间范围T 00:00:00~T+1 00:00:00 + if(StringUtils.isEmpty(qcCheckTaskProduce.getProduceDateStart())){ + qcCheckTaskProduce.setProduceDateStart(DateUtils.getDate()+" 00:00:00");//start + LocalDate date = LocalDate.now(); + LocalDate dateEnd = date.plusDays(1); + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + String dateEndStr = dtf.format(dateEnd)+" 00:00:00"; + qcCheckTaskProduce.setProduceDateEnd(dateEndStr);//end + } + + if(StringUtils.isEmpty(qcCheckTaskProduce.getCheckTimeStart())){ + qcCheckTaskProduce.setCheckTimeStart(qcCheckTaskProduce.getProduceDateStart());//start + qcCheckTaskProduce.setCheckTimeEnd(qcCheckTaskProduce.getProduceDateEnd());//end + } + startPage(); List list = qcCheckTaskProduceService.selectQcCheckTaskProduceList(qcCheckTaskProduce); return getDataTable(list); @@ -51,6 +73,22 @@ public class QcCheckTaskProduceController extends BaseController { @Log(title = "生产过程检验任务", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, QcCheckTaskProduce qcCheckTaskProduce) { + + //默认时间范围T 00:00:00~T+1 00:00:00 + if(StringUtils.isEmpty(qcCheckTaskProduce.getProduceDateStart())){ + qcCheckTaskProduce.setProduceDateStart(DateUtils.getDate()+" 00:00:00");//start + LocalDate date = LocalDate.now(); + LocalDate dateEnd = date.plusDays(1); + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + String dateEndStr = dtf.format(dateEnd)+" 00:00:00"; + qcCheckTaskProduce.setProduceDateEnd(dateEndStr);//end + } + + if(StringUtils.isEmpty(qcCheckTaskProduce.getCheckTimeStart())){ + qcCheckTaskProduce.setCheckTimeStart(qcCheckTaskProduce.getProduceDateStart());//start + qcCheckTaskProduce.setCheckTimeEnd(qcCheckTaskProduce.getProduceDateEnd());//end + } + List list = qcCheckTaskProduceService.selectQcCheckTaskProduceList(qcCheckTaskProduce); ExcelUtil util = new ExcelUtil(QcCheckTaskProduce.class); util.exportExcel(response, list, "生产过程检验任务数据"); @@ -94,4 +132,14 @@ public class QcCheckTaskProduceController extends BaseController { public AjaxResult remove(@PathVariable String[] recordIds) { return toAjax(qcCheckTaskProduceService.deleteQcCheckTaskProduceByRecordIds(recordIds)); } + + /** + * 查询供应商列表 + */ + @GetMapping("/getQcListWorkCenter") + public TableDataInfo getQcListWorkCenter(QcCheckTaskProduce qcCheckTaskProduce) { + startPage(); + List list = qcCheckTaskProduceService.getQcListWorkCenter(qcCheckTaskProduce); + return getDataTable(list); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java index 5a6914cc..5777afb4 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java @@ -10,7 +10,7 @@ import com.op.common.core.web.domain.BaseEntity; /** * 生产过程检验任务对象 qc_check_task_produce - * + * * @author Open Platform * @date 2023-10-19 */ @@ -113,6 +113,43 @@ public class QcCheckTaskProduce extends BaseEntity { /** 删除标识1删除0正常 */ private String delFlag; + private String produceDateStart; + private String produceDateEnd; + private String checkTimeStart; + private String checkTimeEnd; + + public String getProduceDateStart() { + return produceDateStart; + } + + public void setProduceDateStart(String produceDateStart) { + this.produceDateStart = produceDateStart; + } + + public String getProduceDateEnd() { + return produceDateEnd; + } + + public void setProduceDateEnd(String produceDateEnd) { + this.produceDateEnd = produceDateEnd; + } + + public String getCheckTimeStart() { + return checkTimeStart; + } + + public void setCheckTimeStart(String checkTimeStart) { + this.checkTimeStart = checkTimeStart; + } + + public String getCheckTimeEnd() { + return checkTimeEnd; + } + + public void setCheckTimeEnd(String checkTimeEnd) { + this.checkTimeEnd = checkTimeEnd; + } + public void setRecordId(String recordId) { this.recordId = recordId; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskProduceService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskProduceService.java index 86da5b81..97ecdbca 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskProduceService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskProduceService.java @@ -5,14 +5,14 @@ import com.op.quality.domain.QcCheckTaskProduce; /** * 生产过程检验任务Service接口 - * + * * @author Open Platform * @date 2023-10-19 */ public interface IQcCheckTaskProduceService { /** * 查询生产过程检验任务 - * + * * @param recordId 生产过程检验任务主键 * @return 生产过程检验任务 */ @@ -20,7 +20,7 @@ public interface IQcCheckTaskProduceService { /** * 查询生产过程检验任务列表 - * + * * @param qcCheckTaskProduce 生产过程检验任务 * @return 生产过程检验任务集合 */ @@ -28,7 +28,7 @@ public interface IQcCheckTaskProduceService { /** * 新增生产过程检验任务 - * + * * @param qcCheckTaskProduce 生产过程检验任务 * @return 结果 */ @@ -36,7 +36,7 @@ public interface IQcCheckTaskProduceService { /** * 修改生产过程检验任务 - * + * * @param qcCheckTaskProduce 生产过程检验任务 * @return 结果 */ @@ -44,7 +44,7 @@ public interface IQcCheckTaskProduceService { /** * 批量删除生产过程检验任务 - * + * * @param recordIds 需要删除的生产过程检验任务主键集合 * @return 结果 */ @@ -52,9 +52,11 @@ public interface IQcCheckTaskProduceService { /** * 删除生产过程检验任务信息 - * + * * @param recordId 生产过程检验任务主键 * @return 结果 */ public int deleteQcCheckTaskProduceByRecordId(String recordId); + + List getQcListWorkCenter(QcCheckTaskProduce qcCheckTaskProduce); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java index c58fafba..4cf7a889 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java @@ -94,4 +94,11 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService public int deleteQcCheckTaskProduceByRecordId(String recordId) { return qcCheckTaskProduceMapper.deleteQcCheckTaskProduceByRecordId(recordId); } + + @Override + public List getQcListWorkCenter(QcCheckTaskProduce qcCheckTaskProduce) { + return null; + } + + } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index ad9995bf..877db21b 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into qc_check_task_produce @@ -175,9 +179,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from qc_check_task_produce where record_id in + delete from qc_check_task_produce where record_id in #{recordId} - \ No newline at end of file + diff --git a/op-modules/op-system/src/main/java/com/op/system/controller/BaseApkFileController.java b/op-modules/op-system/src/main/java/com/op/system/controller/BaseApkFileController.java new file mode 100644 index 00000000..669c29d6 --- /dev/null +++ b/op-modules/op-system/src/main/java/com/op/system/controller/BaseApkFileController.java @@ -0,0 +1,108 @@ +package com.op.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.StringUtils; +import com.op.common.core.utils.uuid.IdUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.system.domain.BaseApkFile; +import com.op.system.service.IBaseApkFileService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 手持apk版本控制Controller + * + * @author Open Platform + * @date 2023-10-24 + */ +@RestController +@RequestMapping("/apkFile") +public class BaseApkFileController extends BaseController { + @Autowired + private IBaseApkFileService baseApkFileService; + + /** + * 查询手持apk版本控制列表 + */ + @RequiresPermissions("system:apkFile:list") + @GetMapping("/list") + public TableDataInfo list(BaseApkFile baseApkFile) { + startPage(); + List list = baseApkFileService.selectBaseApkFileList(baseApkFile); + return getDataTable(list); + } + + /** + * 导出手持apk版本控制列表 + */ + @RequiresPermissions("system:apkFile:export") + @Log(title = "手持apk版本控制", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BaseApkFile baseApkFile) { + List list = baseApkFileService.selectBaseApkFileList(baseApkFile); + ExcelUtil util = new ExcelUtil(BaseApkFile.class); + util.exportExcel(response, list, "手持apk版本控制数据"); + } + + /** + * 获取手持apk版本控制详细信息 + */ + @RequiresPermissions("system:apkFile:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) { + return success(baseApkFileService.selectBaseApkFileById(id)); + } + + /** + * 新增手持apk版本控制 + */ + @RequiresPermissions("system:apkFile:add") + @Log(title = "手持apk版本控制", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BaseApkFile baseApkFile) { + return toAjax(baseApkFileService.insertBaseApkFile(baseApkFile)); + } + + /** + * 修改手持apk版本控制 + */ + @RequiresPermissions("system:apkFile:edit") + @Log(title = "手持apk版本控制", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BaseApkFile baseApkFile) { + return toAjax(baseApkFileService.updateBaseApkFile(baseApkFile)); + } + + /** + * 删除手持apk版本控制 + */ + @RequiresPermissions("system:apkFile:remove") + @Log(title = "手持apk版本控制", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { + return toAjax(baseApkFileService.deleteBaseApkFileByIds(ids)); + } + + /**手持请求**/ + @PostMapping("/getLastApkVersion") + public AjaxResult getLastApkVersion(@RequestBody BaseApkFile baseApkFile) { + + return success(baseApkFileService.getLastApkVersion(baseApkFile)); + } +} diff --git a/op-modules/op-system/src/main/java/com/op/system/domain/BaseApkFile.java b/op-modules/op-system/src/main/java/com/op/system/domain/BaseApkFile.java new file mode 100644 index 00000000..e5ba184f --- /dev/null +++ b/op-modules/op-system/src/main/java/com/op/system/domain/BaseApkFile.java @@ -0,0 +1,123 @@ +package com.op.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 手持apk版本控制对象 base_apk_file + * + * @author Open Platform + * @date 2023-10-24 + */ +public class BaseApkFile extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** ID */ + private String id; + + /** 文件名称 */ + @Excel(name = "文件名称") + private String fileName; + + /** 文件地址 */ + @Excel(name = "文件地址") + private String fileAddress; + + /** 版本号 */ + @Excel(name = "版本号") + private String version; + + /** 备用1 */ + @Excel(name = "备用1") + private String attr1; + + /** 备用2 */ + @Excel(name = "备用2") + private String attr2; + + /** 备用3 */ + @Excel(name = "备用3") + private String attr3; + + /** 备用4 */ + @Excel(name = "备用4") + private String attr4; + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileName() { + return fileName; + } + public void setFileAddress(String fileAddress) { + this.fileAddress = fileAddress; + } + + public String getFileAddress() { + return fileAddress; + } + public void setVersion(String version) { + this.version = version; + } + + public String getVersion() { + return version; + } + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAttr1() { + return attr1; + } + public void setAttr2(String attr2) { + this.attr2 = attr2; + } + + public String getAttr2() { + return attr2; + } + public void setAttr3(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setAttr4(String attr4) { + this.attr4 = attr4; + } + + public String getAttr4() { + return attr4; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("fileName", getFileName()) + .append("fileAddress", getFileAddress()) + .append("version", getVersion()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/op-modules/op-system/src/main/java/com/op/system/mapper/BaseApkFileMapper.java b/op-modules/op-system/src/main/java/com/op/system/mapper/BaseApkFileMapper.java new file mode 100644 index 00000000..851e39fd --- /dev/null +++ b/op-modules/op-system/src/main/java/com/op/system/mapper/BaseApkFileMapper.java @@ -0,0 +1,65 @@ +package com.op.system.mapper; + +import java.util.List; + +import com.op.system.domain.BaseApkFile; +import org.apache.ibatis.annotations.Mapper; + +/** + * 手持apk版本控制Mapper接口 + * + * @author Open Platform + * @date 2023-10-24 + */ +@Mapper +public interface BaseApkFileMapper { + /** + * 查询手持apk版本控制 + * + * @param id 手持apk版本控制主键 + * @return 手持apk版本控制 + */ + public BaseApkFile selectBaseApkFileById(String id); + + /** + * 查询手持apk版本控制列表 + * + * @param baseApkFile 手持apk版本控制 + * @return 手持apk版本控制集合 + */ + public List selectBaseApkFileList(BaseApkFile baseApkFile); + + /** + * 新增手持apk版本控制 + * + * @param baseApkFile 手持apk版本控制 + * @return 结果 + */ + public int insertBaseApkFile(BaseApkFile baseApkFile); + + /** + * 修改手持apk版本控制 + * + * @param baseApkFile 手持apk版本控制 + * @return 结果 + */ + public int updateBaseApkFile(BaseApkFile baseApkFile); + + /** + * 删除手持apk版本控制 + * + * @param id 手持apk版本控制主键 + * @return 结果 + */ + public int deleteBaseApkFileById(String id); + + /** + * 批量删除手持apk版本控制 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseApkFileByIds(String[] ids); + + BaseApkFile getLastApkVersion(BaseApkFile baseApkFile); +} diff --git a/op-modules/op-system/src/main/java/com/op/system/service/IBaseApkFileService.java b/op-modules/op-system/src/main/java/com/op/system/service/IBaseApkFileService.java new file mode 100644 index 00000000..8eb383e9 --- /dev/null +++ b/op-modules/op-system/src/main/java/com/op/system/service/IBaseApkFileService.java @@ -0,0 +1,62 @@ +package com.op.system.service; + +import java.util.List; +import com.op.system.domain.BaseApkFile; + +/** + * 手持apk版本控制Service接口 + * + * @author Open Platform + * @date 2023-10-24 + */ +public interface IBaseApkFileService { + /** + * 查询手持apk版本控制 + * + * @param id 手持apk版本控制主键 + * @return 手持apk版本控制 + */ + public BaseApkFile selectBaseApkFileById(String id); + + /** + * 查询手持apk版本控制列表 + * + * @param baseApkFile 手持apk版本控制 + * @return 手持apk版本控制集合 + */ + public List selectBaseApkFileList(BaseApkFile baseApkFile); + + /** + * 新增手持apk版本控制 + * + * @param baseApkFile 手持apk版本控制 + * @return 结果 + */ + public int insertBaseApkFile(BaseApkFile baseApkFile); + + /** + * 修改手持apk版本控制 + * + * @param baseApkFile 手持apk版本控制 + * @return 结果 + */ + public int updateBaseApkFile(BaseApkFile baseApkFile); + + /** + * 批量删除手持apk版本控制 + * + * @param ids 需要删除的手持apk版本控制主键集合 + * @return 结果 + */ + public int deleteBaseApkFileByIds(String[] ids); + + /** + * 删除手持apk版本控制信息 + * + * @param id 手持apk版本控制主键 + * @return 结果 + */ + public int deleteBaseApkFileById(String id); + + BaseApkFile getLastApkVersion(BaseApkFile baseApkFile); +} diff --git a/op-modules/op-system/src/main/java/com/op/system/service/impl/BaseApkFileServiceImpl.java b/op-modules/op-system/src/main/java/com/op/system/service/impl/BaseApkFileServiceImpl.java new file mode 100644 index 00000000..c8a04a94 --- /dev/null +++ b/op-modules/op-system/src/main/java/com/op/system/service/impl/BaseApkFileServiceImpl.java @@ -0,0 +1,98 @@ +package com.op.system.service.impl; + +import java.util.List; +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.system.mapper.BaseApkFileMapper; +import com.op.system.domain.BaseApkFile; +import com.op.system.service.IBaseApkFileService; + +/** + * 手持apk版本控制Service业务层处理 + * + * @author Open Platform + * @date 2023-10-24 + */ +@Service +public class BaseApkFileServiceImpl implements IBaseApkFileService { + @Autowired + private BaseApkFileMapper baseApkFileMapper; + + /** + * 查询手持apk版本控制 + * + * @param id 手持apk版本控制主键 + * @return 手持apk版本控制 + */ + @Override + public BaseApkFile selectBaseApkFileById(String id) { + return baseApkFileMapper.selectBaseApkFileById(id); + } + + /** + * 查询手持apk版本控制列表 + * + * @param baseApkFile 手持apk版本控制 + * @return 手持apk版本控制 + */ + @Override + public List selectBaseApkFileList(BaseApkFile baseApkFile) { + return baseApkFileMapper.selectBaseApkFileList(baseApkFile); + } + + /** + * 新增手持apk版本控制 + * + * @param baseApkFile 手持apk版本控制 + * @return 结果 + */ + @Override + public int insertBaseApkFile(BaseApkFile baseApkFile) { + baseApkFile.setId(IdUtils.fastSimpleUUID()); + baseApkFile.setCreateTime(DateUtils.getNowDate()); + return baseApkFileMapper.insertBaseApkFile(baseApkFile); + } + + /** + * 修改手持apk版本控制 + * + * @param baseApkFile 手持apk版本控制 + * @return 结果 + */ + @Override + public int updateBaseApkFile(BaseApkFile baseApkFile) { + baseApkFile.setUpdateTime(DateUtils.getNowDate()); + return baseApkFileMapper.updateBaseApkFile(baseApkFile); + } + + /** + * 批量删除手持apk版本控制 + * + * @param ids 需要删除的手持apk版本控制主键 + * @return 结果 + */ + @Override + public int deleteBaseApkFileByIds(String[] ids) { + return baseApkFileMapper.deleteBaseApkFileByIds(ids); + } + + /** + * 删除手持apk版本控制信息 + * + * @param id 手持apk版本控制主键 + * @return 结果 + */ + @Override + public int deleteBaseApkFileById(String id) { + return baseApkFileMapper.deleteBaseApkFileById(id); + } + + @Override + public BaseApkFile getLastApkVersion(BaseApkFile baseApkFile) { + return baseApkFileMapper.getLastApkVersion(baseApkFile); + } + + +} diff --git a/op-modules/op-system/src/main/resources/mapper/system/BaseApkFileMapper.xml b/op-modules/op-system/src/main/resources/mapper/system/BaseApkFileMapper.xml new file mode 100644 index 00000000..92612e6f --- /dev/null +++ b/op-modules/op-system/src/main/resources/mapper/system/BaseApkFileMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + select id, file_name, file_address, version, attr1, attr2, attr3, attr4, + create_by, create_time, update_by, update_time, remark + from base_apk_file + + + + + + + + + insert into base_apk_file + + id, + file_name, + file_address, + version, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{fileName}, + #{fileAddress}, + #{version}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update base_apk_file + + file_name = #{fileName}, + file_address = #{fileAddress}, + version = #{version}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from base_apk_file where id = #{id} + + + + delete from base_apk_file where id in + + #{id} + + +