From 52dd69f7276304760bbec029ab1c4f803144b189 Mon Sep 17 00:00:00 2001 From: yxw Date: Thu, 2 Nov 2023 09:26:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E4=BF=AE=E4=BA=8C=E6=AC=A1=E4=B8=8A?= =?UTF-8?q?=E7=BA=BF=E6=9C=AA=E7=BB=99=E6=9D=A1=E7=A0=81=E6=A0=87=E8=AE=B0?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/apiservice/serviceimpl/base/SxRepairWorkService.java | 2 +- .../apiservice/serviceimpl/busi/jx/JxProdBusiStrategyCommonService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxRepairWorkService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxRepairWorkService.java index e382228..db4987d 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxRepairWorkService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxRepairWorkService.java @@ -979,7 +979,7 @@ public class SxRepairWorkService implements ISxRepairWorkService { unbindKeyResult = prodBindRecordExtRepository.updateByProperties( new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.PRODUCT_SN, MesPcnExtConstWords.WORK_ORDER_NO, MesPcnExtConstWords.IS_BIND_KEY, MesPcnExtConstWords.ACTION_TYPE}, - new Object[]{organizeCode, MesPcnExtConstWords.WORK_ORDER_NO, CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + new Object[]{organizeCode, CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), produceSnExt.getProductSn(), workOrderNo, MesPcnExtEnumUtil.MES_IS_BIND_KEY.IS_BIND_KEY.getValue(), MesPcnExtEnumUtil.MES_ACTION_TYPE.BIND.getValue()}, new String[]{MesPcnExtConstWords.ACTION_TYPE, MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.MODIFY_DATE_TIME}, new Object[]{MesPcnExtEnumUtil.MES_ACTION_TYPE.UNTYING.getValue(), modifyUser, TimeTool.getNowTime(true)}); 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 e711865..a0fc590 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 @@ -223,7 +223,7 @@ public class JxProdBusiStrategyCommonService implements IJxProdBusiStrategyServi if (MesPcnExtEnumUtil.SN_OPERATE_TYPE.REPAIR.getValue() == produceSnExtDb.getOperateType()) return stepResult.isCompleted(false).msg(String.format("过程条码[%s]产品条码[%s]对应的信息当前业务状态[返修]!", params.getSerialNumber(), params.getProductSn())); - if (MesPcnExtEnumUtil.PRODUCE_SN_STATUS.PROCESS.getValue() <= produceSnExtDb.getSnStatus()) return stepResult; + //if (MesPcnExtEnumUtil.PRODUCE_SN_STATUS.PROCESS.getValue() <= produceSnExtDb.getSnStatus()) return stepResult; produceSnExtDb.setSnStatus(MesPcnExtEnumUtil.PRODUCE_SN_STATUS.PROCESS.getValue()); produceSnExtService.doPackSnExtProcess((StationRequestBean) params.getObj(), produceSnExtDb);