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

Merge branch 'dev-temp-wj-2412120000-44244' into test

Browse Source
tags/yfai-pcn-ext-v2.5
王杰 5 months ago
parent cbca3e6e73 570e2bfab1
commit 62faf00e3d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

22
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/spot/MesSpotCheckOrderController.java
Unescape Escape View File

@ -34,7 +34,7 @@ public class MesSpotCheckOrderController {
public ResultBean findEquipmentSpotCheck(MesEquipmentSpotCheck spotCheckOrder) { public ResultBean findEquipmentSpotCheck(MesEquipmentSpotCheck spotCheckOrder) {
try { try {
spotCheckOrder.setOrganizeCode(!StringUtils.isEmpty(spotCheckOrder.getOrganizeCode())?spotCheckOrder.getOrganizeCode():AuthUtil.getOrganizeCode()); spotCheckOrder.setOrganizeCode(!StringUtils.isEmpty(spotCheckOrder.getOrganizeCode())?spotCheckOrder.getOrganizeCode():AuthUtil.getOrganizeCode());
return ResultBean.success("查询成功").setResultList(spotCheckOrderService.findEquipmentSpotCheck(spotCheckOrder)); return ResultBean.success("查询成功!").setResultList(spotCheckOrderService.findEquipmentSpotCheck(spotCheckOrder));
} catch (ImppBusiException imppException) { } catch (ImppBusiException imppException) {
return ResultBean.fail(imppException); return ResultBean.fail(imppException);
} catch (Exception e) { } catch (Exception e) {
@ -50,7 +50,7 @@ public class MesSpotCheckOrderController {
try { try {
spotCheckOrder.setOrganizeCode(!StringUtils.isEmpty(spotCheckOrder.getOrganizeCode())?spotCheckOrder.getOrganizeCode():AuthUtil.getOrganizeCode()); spotCheckOrder.setOrganizeCode(!StringUtils.isEmpty(spotCheckOrder.getOrganizeCode())?spotCheckOrder.getOrganizeCode():AuthUtil.getOrganizeCode());
return ResultBean.success("查询成功").setResultList(spotCheckOrderService.queryEquipmentSpotCheck(spotCheckOrder)); return ResultBean.success("查询成功!").setResultList(spotCheckOrderService.queryEquipmentSpotCheck(spotCheckOrder));
} catch (ImppBusiException imppException) { } catch (ImppBusiException imppException) {
return ResultBean.fail(imppException); return ResultBean.fail(imppException);
} catch (Exception e) { } catch (Exception e) {
@ -68,7 +68,7 @@ public class MesSpotCheckOrderController {
throw new ImppBusiException("点检单不能为空"); throw new ImppBusiException("点检单不能为空");
} }
bean.setOrganizeCode(!StringUtils.isEmpty(bean.getOrganizeCode())?bean.getOrganizeCode():AuthUtil.getOrganizeCode()); bean.setOrganizeCode(!StringUtils.isEmpty(bean.getOrganizeCode())?bean.getOrganizeCode():AuthUtil.getOrganizeCode());
return ResultBean.success("扫描产品条码成功").setResultObject(spotCheckOrderService.insert(bean)); return ResultBean.success("扫描产品条码成功!").setResultObject(spotCheckOrderService.insert(bean));
} catch (ImppBusiException imppException) { } catch (ImppBusiException imppException) {
return ResultBean.fail(imppException); return ResultBean.fail(imppException);
} catch (Exception e) { } catch (Exception e) {
@ -83,7 +83,7 @@ public class MesSpotCheckOrderController {
try { try {
spotCheckOrder.setOrganizeCode(!StringUtils.isEmpty(spotCheckOrder.getOrganizeCode())?spotCheckOrder.getOrganizeCode():AuthUtil.getOrganizeCode()); spotCheckOrder.setOrganizeCode(!StringUtils.isEmpty(spotCheckOrder.getOrganizeCode())?spotCheckOrder.getOrganizeCode():AuthUtil.getOrganizeCode());
return ResultBean.success("查询成功").setListPager(spotCheckOrderService.querySpotCheckOrder(spotCheckOrder, pager)); return ResultBean.success("查询成功!").setListPager(spotCheckOrderService.querySpotCheckOrder(spotCheckOrder, pager));
} catch (ImppBusiException imppException) { } catch (ImppBusiException imppException) {
return ResultBean.fail(imppException); return ResultBean.fail(imppException);
} catch (Exception e) { } catch (Exception e) {
@ -98,7 +98,7 @@ public class MesSpotCheckOrderController {
try { try {
spotCheckOrder.setOrganizeCode(!StringUtils.isEmpty(spotCheckOrder.getOrganizeCode())?spotCheckOrder.getOrganizeCode():AuthUtil.getOrganizeCode()); spotCheckOrder.setOrganizeCode(!StringUtils.isEmpty(spotCheckOrder.getOrganizeCode())?spotCheckOrder.getOrganizeCode():AuthUtil.getOrganizeCode());
return ResultBean.success("查询成功").setResultObject(spotCheckOrderService.querySpotCheckOrderResult(spotCheckOrder)); return ResultBean.success("查询成功!").setResultObject(spotCheckOrderService.querySpotCheckOrderResult(spotCheckOrder));
} catch (ImppBusiException imppException) { } catch (ImppBusiException imppException) {
return ResultBean.fail(imppException); return ResultBean.fail(imppException);
} catch (Exception e) { } catch (Exception e) {
@ -121,7 +121,7 @@ public class MesSpotCheckOrderController {
if (CollectionUtils.isEmpty(model.getOrderPartList())) { if (CollectionUtils.isEmpty(model.getOrderPartList())) {
throw new ImppBusiException("点检明细零件不能为空"); throw new ImppBusiException("点检明细零件不能为空");
} }
return ResultBean.success("扫描产品条码成功").setResultObject(spotCheckOrderService.scanProduceSn(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode())); return ResultBean.success("扫描产品条码成功!").setResultObject(spotCheckOrderService.scanProduceSn(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode()));
} catch (ImppBusiException imppException) { } catch (ImppBusiException imppException) {
return ResultBean.fail(imppException); return ResultBean.fail(imppException);
} catch (Exception e) { } catch (Exception e) {
@ -142,7 +142,7 @@ public class MesSpotCheckOrderController {
if (CollectionUtils.isEmpty(model.getOrderResultList())) { if (CollectionUtils.isEmpty(model.getOrderResultList())) {
throw new ImppBusiException("点检单明细不能为空"); throw new ImppBusiException("点检单明细不能为空");
} }
return ResultBean.success("点检结果获取成功").setResultObject(spotCheckOrderService.queryEquipInfo(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode())); return ResultBean.success("点检结果获取成功!").setResultObject(spotCheckOrderService.queryEquipInfo(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode()));
} catch (ImppBusiException imppException) { } catch (ImppBusiException imppException) {
return ResultBean.fail(imppException); return ResultBean.fail(imppException);
} catch (Exception e) { } catch (Exception e) {
@ -165,7 +165,7 @@ public class MesSpotCheckOrderController {
} }
spotCheckOrderService.saveCheck(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode()); spotCheckOrderService.saveCheck(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode());
return ResultBean.success("完成点检成功"); return ResultBean.success("完成点检成功!");
} catch (ImppBusiException imppException) { } catch (ImppBusiException imppException) {
return ResultBean.fail(imppException); return ResultBean.fail(imppException);
} catch (Exception e) { } catch (Exception e) {
@ -185,7 +185,7 @@ public class MesSpotCheckOrderController {
spotCheckOrderService.saveReCheck(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode()); spotCheckOrderService.saveReCheck(model, !StringUtils.isEmpty(model.getOrganizeCode())?model.getOrganizeCode():AuthUtil.getOrganizeCode());
return ResultBean.success("重新点检成功"); return ResultBean.success("重新点检成功!");
} catch (ImppBusiException imppException) { } catch (ImppBusiException imppException) {
return ResultBean.fail(imppException); return ResultBean.fail(imppException);
} catch (Exception e) { } catch (Exception e) {
@ -194,14 +194,14 @@ public class MesSpotCheckOrderController {
} }
@PostMapping("/batch-delete-ids") @PostMapping("/batch-delete-ids")
@ApiOperation(value = "重新点检") @ApiOperation(value = "删除点检")
public ResultBean deleteBatchIds(Long[] ids, String userName, String organizeCode) { public ResultBean deleteBatchIds(Long[] ids, String userName, String organizeCode) {
try { try {
if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(userName) || null == ids) { if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(userName) || null == ids) {
throw new ImppBusiException("请检查参数"); throw new ImppBusiException("请检查参数");
} }
spotCheckOrderService.deleteBatchIds(ids, userName, organizeCode); spotCheckOrderService.deleteBatchIds(ids, userName, organizeCode);
return ResultBean.success("重新点检成功"); return ResultBean.success("删除成功!");
} catch (ImppBusiException imppException) { } catch (ImppBusiException imppException) {
return ResultBean.fail(imppException); return ResultBean.fail(imppException);
} catch (Exception e) { } catch (Exception e) {

Write Preview
Loading…
Cancel
Save