puxiao.liao
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

46141 PCN：赛力斯JIS单接收日志和赛力斯JIS队列接收日志增加零件类查询条件模糊查询

Browse Source
uat-temp-wj-chongqingdaqu-prod-temp-logic-20250410-46141
logic.fang 3 months ago
parent 952cbdbae0
commit 7855af58a4
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File

6
modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/report/IMesCimSeresReportService.java
Unescape Escape View File

@ -9,11 +9,13 @@ import java.util.List;
public interface IMesCimSeresReportService {
ListPager<MesCimSeresSrmRunSheetJis> querySrmSunSheetJisLogByPager(Integer status, String docNo, Pager pager);
ListPager<MesCimSeresSrmRunSheetJis> querySrmSunSheetJisLogByPager(Integer status, String docNo,
String partClassCode, String partClassName, Pager pager);
void doSrmSunSheetJisNormal(List<Long> ids);
ListPager<MesCimSeresJisQueue> queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, Pager pager);
ListPager<MesCimSeresJisQueue> queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode,
String partClassCode, String partClassName, Pager pager);
void doJisQueueNormal(List<Long> ids);

13
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/report/MesCimSeresReportController.java
Unescape Escape View File

@ -29,9 +29,11 @@ public class MesCimSeresReportController {
@ApiOperation(value = "赛力斯JIS单接收日志", notes = "赛力斯JIS单接收日志")
@GetMapping("/query-srm-sun-sheet-jis-log")
public ResultBean querySrmSunSheetJisLogByPager(Integer status, String docNo, Pager pager){
public ResultBean querySrmSunSheetJisLogByPager(Integer status, String docNo, String partClassCode,
String partClassName, Pager pager){
try {
ListPager<MesCimSeresSrmRunSheetJis> queryResultListPager = mesCimSeresReportService.querySrmSunSheetJisLogByPager(status, docNo, pager);
ListPager<MesCimSeresSrmRunSheetJis> queryResultListPager =
mesCimSeresReportService.querySrmSunSheetJisLogByPager(status, docNo, partClassCode, partClassName, pager);
return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(queryResultListPager);
} catch (ImppBusiException e) {
return ResultBean.fail(e);
@ -56,9 +58,12 @@ public class MesCimSeresReportController {
@ApiOperation(value = "赛力斯JIS队列接收日志", notes = "赛力斯JIS队列接收日志")
@GetMapping("/query-jis-queue-log")
public ResultBean queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, Pager pager){
public ResultBean queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode,
String partClassCode, String partClassName, Pager pager){
try {
ListPager<MesCimSeresJisQueue> queryResultListPager = mesCimSeresReportService.queryJisQueueLogByPager(checkStatus, vin, materielCode, pager);
ListPager<MesCimSeresJisQueue> queryResultListPager =
mesCimSeresReportService.queryJisQueueLogByPager(checkStatus, vin, materielCode, partClassCode,
partClassName, pager);
return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(queryResultListPager);
} catch (ImppBusiException e) {
return ResultBean.fail(e);

11
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java
Unescape Escape View File

@ -29,11 +29,15 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService {
private IMesCimSeresJisQueueRepository queueJisRDao;
@Override
public ListPager<MesCimSeresSrmRunSheetJis> querySrmSunSheetJisLogByPager(Integer status, String docNo, Pager pager) {
public ListPager<MesCimSeresSrmRunSheetJis> querySrmSunSheetJisLogByPager(Integer status, String docNo,
String partClassCode, String partClassName,
Pager pager) {
final String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringLikerPack(docNo, "docNo", packBean);
DdlPreparedPack.getNumEqualPack(status, "status", packBean);
DdlPreparedPack.getStringLikerPack(partClassCode, "partClassCode", packBean);
DdlPreparedPack.getStringLikerPack(partClassName, "partClassName", packBean);
DdlPreparedPack.getOrderBy("id", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), packBean);
pager = PagerHelper.getPager(pager, runSheetJisRDao.findByHqlWhereCount(packBean));
@ -52,12 +56,15 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService {
}
@Override
public ListPager<MesCimSeresJisQueue> queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, Pager pager) {
public ListPager<MesCimSeresJisQueue> queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode,
String partClassCode, String partClassName, Pager pager) {
final String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringLikerPack(vin, "vin", packBean);
DdlPreparedPack.getStringLikerPack(materielCode, "materielCode", packBean);
DdlPreparedPack.getNumEqualPack(checkStatus, "checkStatus", packBean);
DdlPreparedPack.getStringLikerPack(partClassCode, "partClassCode", packBean);
DdlPreparedPack.getStringLikerPack(partClassName, "partClassName", packBean);
DdlPreparedPack.getOrderBy("id", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), packBean);
pager = PagerHelper.getPager(pager, queueJisRDao.findByHqlWhereCount(packBean));

Write Preview
Loading…
Cancel
Save