From 83730931eabff6036b743671a721aa5212dfada8 Mon Sep 17 00:00:00 2001 From: gsz Date: Thu, 6 Jun 2024 22:27:48 +0800 Subject: [PATCH] =?UTF-8?q?MES-PCN=20=E9=87=8D=E6=96=B0=E7=82=B9=E6=A3=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java index cc141d8..55b145f 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java @@ -306,6 +306,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { } //保存新点检单 spotCheckOrderTemp.setSpotCheckOrderNo(orderNo); + spotCheckOrderTemp.setStatus(MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.CREATE.getValue()); + spotCheckOrderTemp.setSpotCheckOrderResult(0); ConvertBean.serviceModelInitialize(spotCheckOrderTemp, AuthUtil.getSessionUser().getUserName()); spotCheckOrderTemp = spotCheckOrderRepository.insert(spotCheckOrderTemp); @@ -322,7 +324,9 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { BeanUtils.copyProperties(k, result, "id"); result.setPid(finalOrderTemp.getId()); result.setSpotCheckOrderNo(finalOrderTemp.getSpotCheckOrderNo()); -// ConvertBean.serviceModelInitialize(result, "LML"); + result.setSpotCheckRealValue(""); + result.setIsTolerance(0); + result.setSpotCheckTime(""); ConvertBean.serviceModelInitialize(result, AuthUtil.getSessionUser().getUserName()); orderResultNewList.add(result); }); @@ -342,6 +346,7 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { MesSpotCheckOrderPart spotCheckOrderPart = new MesSpotCheckOrderPart(); BeanUtils.copyProperties(k, spotCheckOrderPart, "id"); spotCheckOrderPart.setSpotCheckOrderId(finalOrderTemp.getId()); + spotCheckOrderPart.setSn(""); // ConvertBean.serviceModelInitialize(spotCheckOrderPart, "LML"); ConvertBean.serviceModelInitialize(spotCheckOrderPart, AuthUtil.getSessionUser().getUserName()); spotCheckOrderPartList.add(spotCheckOrderPart);