mes/nalinv-qms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 弹窗模糊查询

Browse Source
This commit is contained in:
luochen 2024-12-25 16:37:16 +08:00
parent 2cf8f39681
commit 9422fa4979
6 changed files with 140 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecJobController.java
View File

@ -50,6 +50,24 @@ public class QmsInspecJobController {
return R.ok(qmsInspecJobService.selectAll(page.genOrders(), dto));
}
// /**
// * 检验任务编号分页查询
// */
// @ApiOperation(value = "检验任务编号分页查询", notes = "检验任务编号分页查询")
// @GetMapping("/jobNo/page")
// public R getJobNo(FrontPage page, QmsInspecJobDTO dto) {
// return R.ok(qmsInspecJobService.getJobNoPage(page.genOrders(), dto));
// }
/**
* 检验人员群组分页查询
*/
@ApiOperation(value = "检验人员群组分页查询", notes = "检验人员群组分页查询")
@GetMapping("getUserGroup/page")
public R getUserGroup(FrontPage page) {
return R.ok(qmsInspecJobService.getUserGroup(page));
}
/**
* 扫描条码查询
* @param dto
@ -90,6 +108,15 @@ public class QmsInspecJobController {
public R getItem(FrontPage page, @RequestParam(value = "item", required = false) String item) {
return R.ok(qmsInspecJobService.getItem(page, item));
}
/**
* 物料分页查询
*/
@ApiOperation(value = "物料分页查询", notes = "物料分页查询")
@GetMapping("/item/newPage")
public R selectItemPage(FrontPage page, @RequestParam(value = "item", required = false) String item) {
return R.ok(qmsInspecJobService.selectItemPage(page, item));
}
@ApiOperation(value = "設備編號開窗", notes = "設備編號開窗")
@GetMapping("/resrce/page")
@ -97,6 +124,15 @@ public class QmsInspecJobController {
@RequestParam(value = "operation", required = false) String operation) {
return R.ok(qmsInspecJobService.getResrce(page, resrce, operation));
}
/**
* 设备分页查询
*/
@ApiOperation(value = "设备分页查询", notes = "设备分页查询")
@GetMapping("/resrce/newPage")
public R selectResrcePage(FrontPage page, @RequestParam(value = "operation", required = false) String operation) {
return R.ok(qmsInspecJobService.selectResrcePage(page, operation));
}
@ApiOperation(value = "收料单号開窗", notes = "收料单号開窗")
@GetMapping("/receiptNo/page")

21
qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsQcPlanController.java
View File

@ -2,6 +2,7 @@ package com.foreverwin.iep.qms.controller;
import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.foreverwin.iep.common.base.FrontPage;
@ -74,7 +75,25 @@ public class QmsQcPlanController {
.forEach(qcPlan -> qcPlan.setInspecFreqNo(HandleBoProcessor.trimHandle(qcPlan.getInspecFreqBo())));
return R.ok(iPage);
}
/**
* 分页查询 （模糊查询）
*/
@ApiOperation(value = "分页查询（模糊查询）", notes = "分页查询（模糊查询）")
@GetMapping("/newPage")
public R newPage(FrontPage page, QmsQcPlanByConditionDTO qmsQcPlanByConditionDTO) {
LambdaQueryWrapper<QmsQcPlan> lambdaQueryWrapper = new LambdaQueryWrapper<>();
String site = TenantContextHolder.getTenantId();
lambdaQueryWrapper.eq(QmsQcPlan::getSite,site)
.eq(QmsQcPlan::getCurrentRevision,"Y")
.eq(QmsQcPlan::getInspecType,"0");
if (page.getSearchText() != null && !"".equals(page.getSearchText())) {
lambdaQueryWrapper.and(wrapper -> wrapper.like(QmsQcPlan::getQcPlan, page.getSearchText())
.or().like(QmsQcPlan::getDescription, page.getSearchText()));
}
return R.ok(qmsQcPlanService.page(page, lambdaQueryWrapper));
}
/**
* 通过id查询检验计划
*

7
qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsInspecJobService.java
View File

@ -9,6 +9,7 @@ import com.foreverwin.iep.qms.dto.QmsInspecJobDTO;
import com.foreverwin.iep.qms.dto.QmsInspecResultNccodeDTO;
import com.foreverwin.iep.qms.entity.QmsInspecJob;
import com.foreverwin.iep.qms.entity.QmsInspectionLevel;
import com.foreverwin.mom.admin.api.entity.SysRole;
import java.util.List;
@ -31,6 +32,8 @@ public interface QmsInspecJobService extends IService<QmsInspecJob> {
* @return 項目列表的分頁結果
*/
IPage<Item> getItem(FrontPage page, String item);
IPage<Item> selectItemPage(FrontPage page, String item);
/**
* 獲取資源列表
@ -209,4 +212,8 @@ public interface QmsInspecJobService extends IService<QmsInspecJob> {
List<QmsInspecJob> getQmsInspecJobList(String site, String operationBo, String targetBo);
String sendOa(QmsInspecJobDTO dto,String approveTxt);
IPage<Resource> selectResrcePage(FrontPage page, String operation);
IPage<SysRole> getUserGroup(FrontPage page);
}

18
qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
View File

@ -189,7 +189,11 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
String site = TenantContextHolder.getTenantId();
return baseMapper.selectItem(page, site, item);
}
@Override
public IPage<Item> selectItemPage(FrontPage page, String item) {
String site = TenantContextHolder.getTenantId();
return baseMapper.selectItemPage(page,site,page.getSearchText());
}
@Override
public IPage<Resource> getResrce(FrontPage page, String resrce, String operation) {
String site = TenantContextHolder.getTenantId();
@ -2095,6 +2099,18 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
return str;
}
@Override
public IPage<Resource> selectResrcePage(FrontPage page ,String operation) {
String site = TenantContextHolder.getTenantId();
return baseMapper.selectResrcePage(page,site,page.getSearchText(),operation);
}
@Override
public IPage<SysRole> getUserGroup(FrontPage page) {
String site = TenantContextHolder.getTenantId();
return baseMapper.getUserGroup(page, site, page.getSearchText());
}
@Override
public void selectQualification(String user, String password,String qualification,String operationBo) {
String site = TenantContextHolder.getTenantId();

7
qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsInspecJobMapper.java
View File

@ -8,6 +8,7 @@ import com.foreverwin.iep.qms.domain.ReceiptInfo;
import com.foreverwin.iep.qms.domain.Resource;
import com.foreverwin.iep.qms.dto.QmsInspecJobDTO;
import com.foreverwin.iep.qms.entity.QmsInspecJob;
import com.foreverwin.mom.admin.api.entity.SysRole;
import com.foreverwin.mom.admin.api.entity.SysUser;
import com.foreverwin.mom.common.data.datascope.MomBaseMapper;
import org.apache.ibatis.annotations.Mapper;
@ -28,6 +29,8 @@ public interface QmsInspecJobMapper extends MomBaseMapper<QmsInspecJob> {
Item selectItemByRef(@Param("handle") String handle);
IPage<Item> selectItem(FrontPage page, @Param("site") String site, @Param("item") String item);
IPage<Item> selectItemPage(FrontPage page, @Param("site") String site, @Param("searchText")String searchText);
IPage<Resource> selectResrce(FrontPage page, @Param("site") String site, @Param("resrce") String resrce,
@Param("operation") String operation);
@ -75,4 +78,8 @@ public interface QmsInspecJobMapper extends MomBaseMapper<QmsInspecJob> {
List<QmsInspecJob> getQmsInspecJobList(@Param("site") String site, @Param("operationBo")String operationBo, @Param("targetBo")String targetBo, @Param("qcSubCategories") String qcSubCategories);
//根据设备查询存储地点
Map<String,String> selectStorageLocationByResrce(@Param("site")String site,@Param("resrce")String resrce);
IPage<Resource> selectResrcePage(FrontPage page, @Param("site") String site, @Param("searchText") String searchText,
@Param("operation") String operation);
IPage<SysRole> getUserGroup(FrontPage page, @Param("site")String site, @Param("searchText") String searchText);
}

53
qms-db/src/main/resources/qms/mapper/QmsInspecJobMapper.xml
View File

@ -104,6 +104,19 @@
</where>
order by b.ITEM
</select>
<select id="selectItemPage" resultMap="item">
select distinct b.ITEM, b.DESCRIPTION
from shop_order a
join item b on a.ITEM_BO = b.HANDLE
<where>
and a.SITE = #{site}
<if test="searchText != null and searchText != ''">
and b.ITEM like concat('%', concat(#{searchText},'%'))
or b.DESCRIPTION like concat('%', concat(#{searchText},'%'))
</if>
</where>
order by b.ITEM
</select>
<select id="selectResrce" resultMap="resrce">
select e.HANDLE RESOURCE_BO,
e.RESRCE,
@ -128,6 +141,46 @@
</where>
order by e.RESRCE
</select>
<select id="selectResrcePage" resultMap="resrce">
select e.HANDLE RESOURCE_BO,
e.RESRCE,
e.DESCRIPTION,
c.CATEGORY_NO,
c.DESCRIPTION CATEGORY_DESC,
d.TYPE_NO,
d.DESCRIPTION TYPE_DESC
from OPERATION a
join OP_EQP_CATEGORY b on a.HANDLE = b.OPERATION_BO
join EQP_CATEGORY c on b.EQP_CATEGORY_bo = c.HANDLE
join EQP_TYPE d on c.HANDLE = d.EQP_CATEGORY_BO
join resrce e on d.HANDLE = e.EQP_TYPE_BO
<where>
and a.SITE = #{site}
<if test="searchText != null and searchText != ''">
AND e.RESRCE LIKE concat('%', concat(#{searchText}, '%'))
OR e.DESCRIPTION LIKE concat('%', concat(#{searchText}, '%'))
OR d.TYPE_NO LIKE concat('%', concat(#{searchText}, '%'))
OR d.DESCRIPTION LIKE concat('%', concat(#{searchText}, '%'))
OR c.CATEGORY_NO LIKE concat('%', concat(#{searchText}, '%'))
OR c.DESCRIPTION LIKE concat('%', concat(#{searchText}, '%'))
</if>
<if test="operation != null and operation != ''">
and a.OPERATION = #{operation}
</if>
</where>
order by e.RESRCE
</select>
<select id="getUserGroup" resultType="com.foreverwin.mom.admin.api.entity.SysRole">
SELECT *
from momx.SYS_ROLE
where TENANT_ID = #{site}
<if test="searchText != null and searchText != ''">
and (ROLE_CODE like concat('%', concat(#{searchText},'%'))
or ROLE_NAME like concat('%', concat(#{searchText},'%'))
or ROLE_DESC like concat('%', concat(#{searchText},'%')))
</if>
</select>
<select id="selectReceiptNo" resultMap="receiptInfo">
select DISTINCT C.RECEIPT_NO, D.PURCHASE_NO, E.SUPPLIER_NO, E.SUPPLIER_NAME
from QMS_INSPEC_JOB a