jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

Finish Task#6320 23032-部品报缺报表 PCR-20240322

Browse Source
tags/yfai-mes-ext-v1.0
puxiao 1 year ago
parent e73c7a4102
commit 69ccbf067f
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File

4
modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IWorkOrderExtService.java
Unescape Escape View File

@ -52,7 +52,9 @@ public interface IWorkOrderExtService {
* @param pager 分页参数
* @return 生产工单 分页数据
*/
ListPager<WorkOrderPageVo> getListPageByCondition(WorkOrderQueryDto workOrderQueryDto, Pager pager);
ListPager<WorkOrderPageVo> getListPageByCondition(WorkOrderQueryDto workOrderQueryDto,
Pager pager,
boolean filterWorkOrderStatusLst);
/**

4
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/WorkOrderExtController.java
Unescape Escape View File

@ -123,7 +123,7 @@ public class WorkOrderExtController extends MesBaseController {
// 生产工单分页列表
return ResultBean.success("生产工单分页查询成功")
.setListPager(workOrderExtService.getListPageByCondition(workOrderQueryDto, pager))
.setListPager(workOrderExtService.getListPageByCondition(workOrderQueryDto, pager,false))
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException imppException) {
LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException);
@ -139,7 +139,7 @@ public class WorkOrderExtController extends MesBaseController {
try {
return ResultBean.success("生产工单分页查询成功")
.setListPager(workOrderExtService.getListPageByCondition(reportPagerModel.getReportModel(), reportPagerModel.getPager()))
.setListPager(workOrderExtService.getListPageByCondition(reportPagerModel.getReportModel(), reportPagerModel.getPager(),true))
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException imppException) {
LOGGER.error(imppException.getErrorMsg() + "：{}", imppException.getErrorDetail(), imppException);

25
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/WorkOrderExtService.java
Unescape Escape View File

@ -1036,7 +1036,8 @@ public class WorkOrderExtService implements IWorkOrderExtService {
* @return {@link ListPager<MesWorkOrderExt>}
*/
@Override
public ListPager<WorkOrderPageVo> getListPageByCondition(WorkOrderQueryDto workOrderQueryDto, Pager pager) {
public ListPager<WorkOrderPageVo> getListPageByCondition(WorkOrderQueryDto workOrderQueryDto, Pager pager,
boolean filterWorkOrderStatusLst) {
String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
if (!ObjectUtils.isEmpty(workOrderQueryDto)) {
@ -1046,15 +1047,21 @@ public class WorkOrderExtService implements IWorkOrderExtService {
DdlPreparedPack.getStringLikerPack(workOrderQueryDto.getPartNo(), MesExtConstWords.PART_NO, ddlPackBean);
DdlPreparedPack.getStringLikerPack(workOrderQueryDto.getCreateUser(), MesExtConstWords.CREATE_USER, ddlPackBean);
DdlPreparedPack.getStringLikerPack(workOrderQueryDto.getErpWarehouse(), MesExtConstWords.ERP_WARE_HOUSE, ddlPackBean);
if (!StringUtils.isEmpty(workOrderQueryDto.getWorkOrderStatus())) {
DdlPreparedPack.getNumEqualPack(workOrderQueryDto.getWorkOrderStatus(), MesExtConstWords.WORK_ORDER_STATUS, ddlPackBean);
} else if (StringUtils.isEmpty(workOrderQueryDto.getIsHasDel()) || !workOrderQueryDto.getIsHasDel().equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValueStr())) {
DdlPreparedPack.getNumNOEqualPack(MesExtEnumUtil.WORK_ORDER_STATUS.REMOVE.getValue(), MesExtConstWords.WORK_ORDER_STATUS, ddlPackBean);
}
if(!CollectionUtils.isEmpty(workOrderQueryDto.getWorkOrderStatusLst())) {
DdlPreparedPack.getInPackList(workOrderQueryDto.getWorkOrderStatusLst(),
MesExtConstWords.WORK_ORDER_STATUS,ddlPackBean);
if(filterWorkOrderStatusLst) {
if(!CollectionUtils.isEmpty(workOrderQueryDto.getWorkOrderStatusLst())) {
DdlPreparedPack.getInPackList(workOrderQueryDto.getWorkOrderStatusLst(),
MesExtConstWords.WORK_ORDER_STATUS,ddlPackBean);
}
} else {
if (!StringUtils.isEmpty(workOrderQueryDto.getWorkOrderStatus())) {
DdlPreparedPack.getNumEqualPack(workOrderQueryDto.getWorkOrderStatus(), MesExtConstWords.WORK_ORDER_STATUS, ddlPackBean);
} else if (StringUtils.isEmpty(workOrderQueryDto.getIsHasDel()) ||
!workOrderQueryDto.getIsHasDel().equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValueStr())) {
DdlPreparedPack.getNumNOEqualPack(MesExtEnumUtil.WORK_ORDER_STATUS.REMOVE.getValue(), MesExtConstWords.WORK_ORDER_STATUS, ddlPackBean);
}
}
DdlPreparedPack.getNumEqualPack(workOrderQueryDto.getWorkOrderType(), MesExtConstWords.WORK_ORDER_TYPE, ddlPackBean);
DdlPreparedPack.getIsNotNull(MesExtConstWords.WORK_CENTER_CODE, ddlPackBean);
if (!StringUtils.isEmpty(workOrderQueryDto.getStartTimeStart()) || !StringUtils.isEmpty(workOrderQueryDto.getStartTimeEnd())) {

Write Preview
Loading…
Cancel
Save