From 9b92111034d456f065dd5e422d85cf3c7605c806 Mon Sep 17 00:00:00 2001 From: jun Date: Fri, 10 May 2024 20:01:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B7=A5=E5=8D=95=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index ed740f6..5dc05d3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -160,7 +160,14 @@ public class MesWorkOrderService extends BaseMesService implements } result.setQty(bean.getQty()); - result.setWorkOrderStatus(bean.getWorkOrderStatus()); + //更新完成数量 + if (bean.getCompleteQty() > 0) { + result.setCompleteQty(bean.getCompleteQty()); + } + //更新状态 + if (bean.getWorkOrderStatus() > 0) { + result.setWorkOrderStatus(bean.getWorkOrderStatus()); + } ConvertBean.serviceModelInitialize(bean, AuthUtil.getSessionUser().getUserName()); MesWorkOrderLog workOrderLog = new MesWorkOrderLog(); @@ -268,7 +275,7 @@ public class MesWorkOrderService extends BaseMesService implements List mesBoms = mesBomRDao.findByHqlWhere(ddlPackBean); if (CollectionUtils.isEmpty(mesBoms)) { MesException.throwMesBusiException("物料【%s】生产版本【%s】对应bom信息不存在", - mesWorkOrder.getPartNo(), mesProductVersion.getProductVersion()); + mesWorkOrder.getPartNo(), mesProductVersion.getProductVersion()); } //更新工单状态 mesWorkOrder.setCompleteQty(MathOperation.add(mesWorkOrder.getNum(), mesWorkOrder.getCompleteQty()));