From 533ce6588bdd2e7ecbb0561b5ba5d827f286b6d5 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 22 Feb 2024 13:49:46 +0800 Subject: [PATCH] =?UTF-8?q?jx=20pcn=20job=20=E7=94=9F=E4=BA=A7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A1=A5=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busi/collect/SxThirdPartyPlcCollectProductDataStepService.java | 2 +- .../apiservice/serviceimpl/job/jx/JxRestoreProductDataService.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/collect/SxThirdPartyPlcCollectProductDataStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/collect/SxThirdPartyPlcCollectProductDataStepService.java index c5f524f..41e6896 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/collect/SxThirdPartyPlcCollectProductDataStepService.java +++ b/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); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/job/jx/JxRestoreProductDataService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/job/jx/JxRestoreProductDataService.java index 0d8eac3..b3c44af 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/job/jx/JxRestoreProductDataService.java +++ b/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> 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 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());