diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesSortShippingCheckController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesSortShippingCheckController.java index 76a166f..6366f2e 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesSortShippingCheckController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesSortShippingCheckController.java @@ -64,7 +64,7 @@ public class MesSortShippingCheckController { shippingOrderManagement.setOrganizeCode(organizeCode); ConvertBean.serviceModelUpdate(shippingOrderManagement, userInfo); MesSortShippingCheckModel model = sortShippingCheckService.doShippingOrderNoQuery(shippingOrderManagement); - return ResultBean.success("查询成功").setResultObject(model); + return ResultBean.success(model.getMsg()).setResultObject(model); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { @@ -110,7 +110,7 @@ public class MesSortShippingCheckController { model.setOrganizeCode(organizeCode); model.setUserInfo(userInfo); sortShippingCheckService.saveSn(model); - return ResultBean.success("扫描成功").setResultObject(model); + return ResultBean.success(model.getMsg()).setResultObject(model); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java index de8a1e6..8cebfc4 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java @@ -124,6 +124,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService if (!Objects.isNull(lastShippingOrder)) { model.setRecentlyScanShippingCode(lastShippingOrder.getShippingCode()); } + model.setMsg(String.format("发运单【%s】扫描成功",model.getShippingCode())); return model; } @@ -145,6 +146,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService if (model.getIsScanCount() == model.getDetailList().size() && StringUtils.isEmpty(orderManagement.getCheckSeqCode())) { //保存数据库 saveDate(orderManagement, model, model.getOrganizeCode(), model.getUserInfo()); + model.setMsg(String.format("发运单【%s】已发运完成,请扫描下一个发运单",model.getShippingCode())); } return model; } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnAndOrderStrategyServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnAndOrderStrategyServiceImpl.java index 7d999f9..e1e970a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnAndOrderStrategyServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnAndOrderStrategyServiceImpl.java @@ -60,9 +60,6 @@ public class MesShippingScanSnAndOrderStrategyServiceImpl implements IMesShippin private MesCustomerPartRepository mesCustomerPartRepository; @Autowired - private IMesConfigService mesConfigService; - - @Autowired private IMesWorkOrderExtService mesWorkOrderExtService; @Override @@ -76,10 +73,12 @@ public class MesShippingScanSnAndOrderStrategyServiceImpl implements IMesShippin checkVisualOrderNoIsScan(model); detail.setVisualOrderNo(model.getSn()); model.setSn(detail.getBarcode()); + model.setMsg(String.format("条码【%s】扫描成功,请扫描下一个目视单",model.getSn())); } else { //校验条码是否已经扫描 checkIsScan(model); detail.setBarcode(model.getSn()); + model.setMsg(String.format("目视单【%s】扫描成功,请扫描下一个条码",model.getSn())); } MesProduceSn produceSn = checkSn(model); updateOrderManagementDetails(orderManagement, detail, getMesWorkOrder(model, produceSn, detail), produceSn, model.getUserInfo()); @@ -109,6 +108,12 @@ public class MesShippingScanSnAndOrderStrategyServiceImpl implements IMesShippin if (!scanFlg) { throw new ImppBusiException(String.format("【%s】此目视单对应的【%s】物料号与发运单中物料号不匹配,请检查数据!", model.getSn(), partNo)); } + //提示信息 + if(Objects.isNull(workOrder)){ + model.setMsg(String.format("条码【%s】扫描成功,请扫描目视单",model.getSn())); + }else{ + model.setMsg(String.format("目视单【%s】扫描成功,请扫描条码",model.getSn())); + } } return model; diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java index c76b283..739588a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java @@ -86,6 +86,7 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr if (!scanFlg) { throw new ImppBusiException(String.format("【%s】此条码对应的【%s】物料号与发运单中物料号不匹配,请检查数据!", model.getSn(), produceSn.getPartNo())); } + model.setMsg(String.format("条码【%s】扫描完成,请扫描下一个条码",model.getSn())); return model; } diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesSortShippingCheckModel.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesSortShippingCheckModel.java index 8fe0cbd..aea5c1f 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesSortShippingCheckModel.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesSortShippingCheckModel.java @@ -51,6 +51,9 @@ public class MesSortShippingCheckModel { @ApiParam("最后扫描的发运单明细ID") private Long lastShippingDetailId; + @ApiParam("提示引导信息") + private String msg; + public void setDetailList(List detailList) { this.detailList = detailList; this.isScanCount = (int) detailList.stream().filter(k -> Objects.equals(k.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER)).count();