jx pcn 下线补录来源于DB的采集数据

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<String, Object> map, String snField) {
         return proxyObject.assembleSn(map, snField);
     }

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());