forked from I3-YF/i3plus-mes-pcn-yfai
赛力斯报表部分迁移至工位端
logic.fang
4 months ago
parent
5e6bd2e36e
commit
77ef72b2f4
@ -0,0 +1,20 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.api.report;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.seres.MesCimSeresJisQueue;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.seres.MesCimSeresSrmRunSheetJis;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface IMesCimSeresReportService {
|
||||
|
||||
ListPager<MesCimSeresSrmRunSheetJis> querySrmSunSheetJisLogByPager(Integer status, Pager pager);
|
||||
|
||||
void doSrmSunSheetJisNormal(List<Long> ids);
|
||||
|
||||
ListPager<MesCimSeresJisQueue> queryJisQueueLogByPager(Integer checkStatus, Pager pager);
|
||||
|
||||
void doJisQueueNormal(List<Long> ids);
|
||||
|
||||
}
|
||||
@ -0,0 +1,82 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.report;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.report.IMesCimSeresReportService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.model.CimSeresJisQueueNormalModel;
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.seres.MesCimSeresJisQueue;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.seres.MesCimSeresSrmRunSheetJis;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
|
||||
import cn.estsh.impp.framework.boot.util.ResultBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Api("赛力斯报表")
|
||||
@RestController
|
||||
@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCimSeresReport")
|
||||
public class MesCimSeresReportController {
|
||||
|
||||
@Autowired
|
||||
private IMesCimSeresReportService mesCimSeresReportService;
|
||||
|
||||
@ApiOperation(value = "赛力斯JIS单接收日志", notes = "赛力斯JIS单接收日志")
|
||||
@GetMapping("/query-srm-sun-sheet-jis-log")
|
||||
public ResultBean querySrmSunSheetJisLogByPager(Integer status, Pager pager){
|
||||
try {
|
||||
ListPager<MesCimSeresSrmRunSheetJis> queryResultListPager = mesCimSeresReportService.querySrmSunSheetJisLogByPager(status, pager);
|
||||
return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(queryResultListPager);
|
||||
} catch (ImppBusiException e) {
|
||||
return ResultBean.fail(e);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "赛力斯JIS单转正常", notes = "赛力斯JIS单转正常")
|
||||
@PostMapping("/srm-sun-sheet-jis-normal")
|
||||
public ResultBean doSrmSunSheetJisNormal(@RequestBody List<Long> ids) {
|
||||
try {
|
||||
mesCimSeresReportService.doSrmSunSheetJisNormal(ids);
|
||||
return ResultBean.success("执行成功");
|
||||
} catch (ImppBusiException e) {
|
||||
return ResultBean.fail(e);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "赛力斯JIS队列接收日志", notes = "赛力斯JIS队列接收日志")
|
||||
@GetMapping("/query-jis-queue-log")
|
||||
public ResultBean queryJisQueueLogByPager(Integer checkStatus, Pager pager){
|
||||
try {
|
||||
ListPager<MesCimSeresJisQueue> queryResultListPager = mesCimSeresReportService.queryJisQueueLogByPager(checkStatus, pager);
|
||||
return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(queryResultListPager);
|
||||
} catch (ImppBusiException e) {
|
||||
return ResultBean.fail(e);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "赛力斯JIS队列转正常", notes = "赛力斯JIS队列转正常")
|
||||
@PostMapping("/jis-queue-normal")
|
||||
public ResultBean doJisQueueNormal(@RequestBody CimSeresJisQueueNormalModel model) {
|
||||
try {
|
||||
mesCimSeresReportService.doJisQueueNormal(model.getIds());
|
||||
return ResultBean.success("执行成功");
|
||||
} catch (ImppBusiException e) {
|
||||
return ResultBean.fail(e);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,73 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.report;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.report.IMesCimSeresReportService;
|
||||
import cn.estsh.i3plus.platform.common.tool.TimeTool;
|
||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.seres.MesCimSeresJisQueue;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.seres.MesCimSeresSrmRunSheetJis;
|
||||
import cn.estsh.i3plus.pojo.mes.repository.seres.IMesCimSeresJisQueueRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.repository.seres.IMesCimSeresSrmRunSheetJisRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
|
||||
import cn.estsh.impp.framework.boot.auth.AuthUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService {
|
||||
|
||||
@Autowired
|
||||
private IMesCimSeresSrmRunSheetJisRepository runSheetJisRDao;
|
||||
|
||||
@Autowired
|
||||
private IMesCimSeresJisQueueRepository queueJisRDao;
|
||||
|
||||
@Override
|
||||
public ListPager<MesCimSeresSrmRunSheetJis> querySrmSunSheetJisLogByPager(Integer status, Pager pager) {
|
||||
final String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
|
||||
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
|
||||
DdlPreparedPack.getNumEqualPack(status, "status", packBean);
|
||||
DdlPreparedPack.getOrderBy("id", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), packBean);
|
||||
|
||||
pager = PagerHelper.getPager(pager, runSheetJisRDao.findByHqlWhereCount(packBean));
|
||||
List<MesCimSeresSrmRunSheetJis> list = runSheetJisRDao.findByHqlWherePage(packBean, pager);
|
||||
return new ListPager<>(list, pager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doSrmSunSheetJisNormal(List<Long> ids) {
|
||||
final String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
|
||||
final String username = AuthUtil.getSessionUser().getUserName();
|
||||
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
|
||||
DdlPreparedPack.getInPackList(ids, "id", packBean);
|
||||
|
||||
runSheetJisRDao.updateByProperties(new String[]{"status","modifyUser","modifyDatetime"},new Object[]{MesExtEnumUtil.CIM_SERES_JIS_STATUS.WAIT_CHECK.getValue(), username, TimeTool.getNowTime(true)}, packBean);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ListPager<MesCimSeresJisQueue> queryJisQueueLogByPager(Integer checkStatus, Pager pager) {
|
||||
final String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
|
||||
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
|
||||
DdlPreparedPack.getNumEqualPack(checkStatus, "checkStatus", packBean);
|
||||
DdlPreparedPack.getOrderBy("id", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), packBean);
|
||||
|
||||
pager = PagerHelper.getPager(pager, queueJisRDao.findByHqlWhereCount(packBean));
|
||||
List<MesCimSeresJisQueue> list = queueJisRDao.findByHqlWherePage(packBean, pager);
|
||||
return new ListPager<>(list, pager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doJisQueueNormal(List<Long> ids) {
|
||||
final String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
|
||||
final String username = AuthUtil.getSessionUser().getUserName();
|
||||
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
|
||||
DdlPreparedPack.getInPackList(ids, "id", packBean);
|
||||
|
||||
queueJisRDao.updateByProperties(new String[]{"checkStatus","modifyUser","modifyDatetime"},new Object[]{MesExtEnumUtil.CIM_SERES_JIS_STATUS.WAIT_CHECK.getValue(), username, TimeTool.getNowTime(true)}, packBean);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.pojo.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : logic
|
||||
* @CreateDate : 2025/3/28 23:05
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class CimSeresJisQueueNormalModel {
|
||||
|
||||
private List<Long> ids;
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue