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

赛力斯报表部分迁移至工位端-添加查询条件

Browse Source
uat-temp-wj-chongqingdaqu-dev-temp-logic-20250328-seresReport
logic.fang 4 months ago
parent 367cfa8964
commit 22e987369d
4 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File

4
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,11 @@ import java.util.List;
public interface IMesCimSeresReportService {
ListPager<MesCimSeresSrmRunSheetJis> querySrmSunSheetJisLogByPager(Integer status, Pager pager);
ListPager<MesCimSeresSrmRunSheetJis> querySrmSunSheetJisLogByPager(Integer status, String docNo, Pager pager);
void doSrmSunSheetJisNormal(List<Long> ids);
ListPager<MesCimSeresJisQueue> queryJisQueueLogByPager(Integer checkStatus, Pager pager);
ListPager<MesCimSeresJisQueue> queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, Pager pager);
void doJisQueueNormal(List<Long> ids);

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

@ -3,7 +3,6 @@ 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;
@ -17,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
@Api("赛力斯报表")
@ -29,9 +29,9 @@ public class MesCimSeresReportController {
@ApiOperation(value = "赛力斯JIS单接收日志", notes = "赛力斯JIS单接收日志")
@GetMapping("/query-srm-sun-sheet-jis-log")
public ResultBean querySrmSunSheetJisLogByPager(Integer status, Pager pager){
public ResultBean querySrmSunSheetJisLogByPager(Integer status, String docNo, Pager pager){
try {
ListPager<MesCimSeresSrmRunSheetJis> queryResultListPager = mesCimSeresReportService.querySrmSunSheetJisLogByPager(status, pager);
ListPager<MesCimSeresSrmRunSheetJis> queryResultListPager = mesCimSeresReportService.querySrmSunSheetJisLogByPager(status, docNo, pager);
return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(queryResultListPager);
} catch (ImppBusiException e) {
return ResultBean.fail(e);
@ -42,9 +42,10 @@ public class MesCimSeresReportController {
@ApiOperation(value = "赛力斯JIS单转正常", notes = "赛力斯JIS单转正常")
@PostMapping("/srm-sun-sheet-jis-normal")
public ResultBean doSrmSunSheetJisNormal(@RequestBody List<Long> ids) {
public ResultBean doSrmSunSheetJisNormal(@RequestBody Long[] idArray) {
try {
mesCimSeresReportService.doSrmSunSheetJisNormal(ids);
List<Long> idList = Arrays.asList(idArray);
mesCimSeresReportService.doSrmSunSheetJisNormal(idList);
return ResultBean.success("执行成功");
} catch (ImppBusiException e) {
return ResultBean.fail(e);
@ -55,9 +56,9 @@ public class MesCimSeresReportController {
@ApiOperation(value = "赛力斯JIS队列接收日志", notes = "赛力斯JIS队列接收日志")
@GetMapping("/query-jis-queue-log")
public ResultBean queryJisQueueLogByPager(Integer checkStatus, Pager pager){
public ResultBean queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, Pager pager){
try {
ListPager<MesCimSeresJisQueue> queryResultListPager = mesCimSeresReportService.queryJisQueueLogByPager(checkStatus, pager);
ListPager<MesCimSeresJisQueue> queryResultListPager = mesCimSeresReportService.queryJisQueueLogByPager(checkStatus, vin, materielCode, pager);
return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(queryResultListPager);
} catch (ImppBusiException e) {
return ResultBean.fail(e);
@ -68,9 +69,10 @@ public class MesCimSeresReportController {
@ApiOperation(value = "赛力斯JIS队列转正常", notes = "赛力斯JIS队列转正常")
@PostMapping("/jis-queue-normal")
public ResultBean doJisQueueNormal(@RequestBody CimSeresJisQueueNormalModel model) {
public ResultBean doJisQueueNormal(@RequestBody Long[] idArray) {
try {
mesCimSeresReportService.doJisQueueNormal(model.getIds());
List<Long> idList = Arrays.asList(idArray);
mesCimSeresReportService.doJisQueueNormal(idList);
return ResultBean.success("执行成功");
} catch (ImppBusiException e) {
return ResultBean.fail(e);

7
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,9 +29,10 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService {
private IMesCimSeresJisQueueRepository queueJisRDao;
@Override
public ListPager<MesCimSeresSrmRunSheetJis> querySrmSunSheetJisLogByPager(Integer status, Pager pager) {
public ListPager<MesCimSeresSrmRunSheetJis> querySrmSunSheetJisLogByPager(Integer status, String docNo, Pager pager) {
final String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringLikerPack(docNo, "docNo", packBean);
DdlPreparedPack.getNumEqualPack(status, "status", packBean);
DdlPreparedPack.getOrderBy("id", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), packBean);
@ -51,9 +52,11 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService {
}
@Override
public ListPager<MesCimSeresJisQueue> queryJisQueueLogByPager(Integer checkStatus, Pager pager) {
public ListPager<MesCimSeresJisQueue> queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, 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.getOrderBy("id", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), packBean);

19
modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/CimSeresJisQueueNormalModel.java
Unescape Escape View File

@ -1,19 +0,0 @@
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;
}
Write Preview
Loading…
Cancel
Save