From 367b48d0c57188307c48cd403a0ba4ead94a500f Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 4 Feb 2024 10:31:21 +0800 Subject: [PATCH] =?UTF-8?q?jx=20pcn=20=E4=B8=8B=E7=BA=BF=E8=A1=A5=E5=BD=95?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E4=BA=8EDB=E7=9A=84=E9=87=87=E9=9B=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/SxThirdPartyDbCollectDataProxyProdDataService.java | 8 ++++++++ .../serviceimpl/busi/jx/JxProdBusiStrategyCommonService.java | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/collect/SxThirdPartyDbCollectDataProxyProdDataService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/collect/SxThirdPartyDbCollectDataProxyProdDataService.java index 56490be..971bad7 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/collect/SxThirdPartyDbCollectDataProxyProdDataService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/collect/SxThirdPartyDbCollectDataProxyProdDataService.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtEnumUtil; import cn.estsh.i3plus.mes.pcn.api.iservice.base.IBaseDataService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesDatasource; import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; @@ -135,6 +136,7 @@ public class SxThirdPartyDbCollectDataProxyProdDataService implements ISxThirdPa result.setSystemSyncStatus(MesPcnExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue()); packDynamicsField(collect, map, result); + packDefaultField(collect, result); } @Override @@ -156,6 +158,12 @@ public class SxThirdPartyDbCollectDataProxyProdDataService implements ISxThirdPa } @Override + public void packDefaultField(SxThirdPartyDbCollectDataModel collect, BaseBean baseBean) { + if (StringUtils.isEmpty(collect.getDefaultValueField())) return; + proxyObject.packDefaultField(collect, baseBean); + } + + @Override public String assembleSn(Map map, String snField) { return proxyObject.assembleSn(map, snField); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxProdBusiStrategyCommonService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxProdBusiStrategyCommonService.java index 01a407b..cf468e6 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxProdBusiStrategyCommonService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxProdBusiStrategyCommonService.java @@ -541,9 +541,7 @@ public class JxProdBusiStrategyCommonService implements IJxProdBusiStrategyServi for (MesProductData item : productDataList) { if (null == item) continue; - if (!StringUtils.isEmpty(item.getWorkCenterCode())) continue; - item.setWorkCenterCode(params.getWorkCenterCode()); - item.setWorkCellCode(workCellCode2Pd); + if (!StringUtils.isEmpty(item.getOrderNo())) continue; item.setPartNo(params.getOrderModel().getPartNo()); item.setPartDesc(params.getOrderModel().getPartNameRdd()); item.setOrderNo(params.getOrderModel().getOrderNo());