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

Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev

Browse Source
tags/yfai-mes-ext-v1.0
gsz 11 months ago
parent 2ba89b2cdf 14d23ee8d3
commit 41cd3c45b6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
Unescape Escape View File

@ -229,7 +229,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
} }
} }
//在加工的工单不能修改物料信息 //在加工的工单不能修改物料信息
if (result.getWorkOrderStatus() >= MesExtEnumUtil.ORDER_STATUS.process.getValue()) { if (result.getWorkOrderStatus() >= MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue()) {
if (!Objects.equals(bean.getPartNo(), result.getPartNo())) { if (!Objects.equals(bean.getPartNo(), result.getPartNo())) {
MesException.throwMesBusiException(String.format("工单状态为【%s】不允许修改物料", MesException.throwMesBusiException(String.format("工单状态为【%s】不允许修改物料",
MesExtEnumUtil.ORDER_TYPE.valueOfDescription(result.getWorkOrderStatus()))); MesExtEnumUtil.ORDER_TYPE.valueOfDescription(result.getWorkOrderStatus())));
@ -532,7 +532,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
} else if (Objects.equals(mesWorkOrder.getReportedQty(), mesWorkOrder.getQty())) { } else if (Objects.equals(mesWorkOrder.getReportedQty(), mesWorkOrder.getQty())) {
mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue()); mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue());
} else { } else {
mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.process.getValue()); mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
} }
update(mesWorkOrder); update(mesWorkOrder);
@ -583,7 +583,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
} else if (Objects.equals(mesWorkOrder.getReportedQty(), mesWorkOrder.getQty())) { } else if (Objects.equals(mesWorkOrder.getReportedQty(), mesWorkOrder.getQty())) {
mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue()); mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue());
} else { } else {
mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.process.getValue()); mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
} }
//获取生产版本 //获取生产版本
MesProductVersion mesProductVersion = getMesProductVersion(mesWorkOrder); MesProductVersion mesProductVersion = getMesProductVersion(mesWorkOrder);
@ -818,7 +818,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
@Override @Override
public List<MesWorkOrder> queryMesWorkOrderProcessToSap(String organizeCode) { public List<MesWorkOrder> queryMesWorkOrderProcessToSap(String organizeCode) {
List<Integer> statusList = new ArrayList<>(); List<Integer> statusList = new ArrayList<>();
statusList.add(MesExtEnumUtil.ORDER_STATUS.process.getValue()); statusList.add(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
// statusList.add(MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()); // statusList.add(MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue());
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);

Write Preview
Loading…
Cancel
Save