jx pcn job 生产数据补录

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/collect/SxThirdPartyPlcCollectProductDataStepService.java

@@ -80,7 +80,7 @@ public class SxThirdPartyPlcCollectProductDataStepService implements ISxThirdPar
             productData.setOrderNo(workOrderNo);
             productData.setObjectCode(objectCode);
             productData.setLineData(JSON.toJSONString(getLineDataList(stepResult, objectCodeMap.get(objectCode))));
-            productData.setSystemSyncStatus(MesPcnExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue());
+            productData.setSystemSyncStatus(0);
             ConvertBean.serviceModelInitialize(productData, userInfo);
             productDataList.add(productData);
         }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/job/jx/JxRestoreProductDataService.java

@@ -62,8 +62,8 @@ public class JxRestoreProductDataService implements IJxRestoreProductDataService
 
     private Map<String, List<MesProductData>> findProductData(String organizeCode, Integer limit) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getIsNull(MesPcnExtConstWords.ORDER_NO, packBean);
-        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{MesPcnExtConstWords.SYSTEM_SYNC_STATUS}, packBean);
+        DdlPreparedPack.getNumberSmallerEqualPack(0, MesPcnExtConstWords.SYSTEM_SYNC_STATUS, packBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{MesPcnExtConstWords.SYSTEM_SYNC_STATUS}, packBean);
         List<MesProductData> productDataList = productDataRepository.findByHqlTopWhere(packBean, limit);
 
         log.info("工厂{} RESTORE PRODUCT DATA JOB --- EXEC --- PRODUCT DATA SIZE:[{}]", organizeCode, CollectionUtils.isEmpty(productDataList) ? 0 : productDataList.size());
@@ -84,7 +84,7 @@ public class JxRestoreProductDataService implements IJxRestoreProductDataService
         if (null != workCellLineOffRecord) count = productDataList.size();
         for (MesProductData productData : productDataList) {
             if (null == productData) continue;
-            if (count == 0) productData.setSystemSyncStatus(productData.getSystemSyncStatus() == 1 ? 3 : productData.getSystemSyncStatus() + 1);
+            if (count == 0) productData.setSystemSyncStatus(productData.getSystemSyncStatus() > 0 ? 0 : productData.getSystemSyncStatus() - 1);
             else {
                 productData.setOrderNo(workCellLineOffRecord.getWorkOrderNo());
                 productData.setPartNo(workCellLineOffRecord.getPartNo());