From 642bb9a2859ee13648ad9972fa174074a0c8ade1 Mon Sep 17 00:00:00 2001 From: jun Date: Sun, 1 Dec 2024 01:58:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=B7=A5=E6=89=93=E5=8D=B0=E6=96=B0?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=EF=BC=8C=E5=8A=A0=E5=B7=A5=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E8=A3=85=E9=85=8D=E4=BB=B6=E8=AE=B0=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E8=BF=94=E5=B7=A5=E5=8D=95=E8=AE=B0=E5=BD=95=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E6=9C=AA=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/MesReworkTaskServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java index dc7ef38..b0b09a2 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java @@ -379,17 +379,17 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { DdlPreparedPack.getStringEqualPack(requestModel.getSn(),"productSn",packBean); DdlPreparedPack.getStringEqualPack(sn.getPartNo(),"partNo",packBean); //更新加工记录 - mesProductionRecordRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime","productSn","description"}, - new Object[]{userName, TimeTool.getNowTime(true),sn.getProductSn(),sn.getDescription()},packBean); + mesProductionRecordRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "productSn", "description", "systemSyncStatus"}, + new Object[]{userName, TimeTool.getNowTime(true), sn.getProductSn(), sn.getDescription(), CommonEnumUtil.FALSE}, packBean); //更新装配记录 - mesProductionAssemblyRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime","productSn","description"}, - new Object[]{userName, TimeTool.getNowTime(true),sn.getProductSn(),sn.getDescription()},packBean); + mesProductionAssemblyRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "productSn", "description", "systemSyncStatus"}, + new Object[]{userName, TimeTool.getNowTime(true), sn.getProductSn(), sn.getDescription(), CommonEnumUtil.FALSE}, packBean); //更新返工记录 packBean = DdlPackBean.getDdlPackBean(organizeCode); - DdlPreparedPack.getStringEqualPack(requestModel.getSn(),"sn",packBean); - DdlPreparedPack.getStringEqualPack(sn.getPartNo(),"partNo",packBean); - mesReworkTaskRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime","sn","description"}, - new Object[]{userName, TimeTool.getNowTime(true),sn.getProductSn(),sn.getDescription()},packBean); + DdlPreparedPack.getStringEqualPack(requestModel.getSn(), "sn", packBean); + DdlPreparedPack.getStringEqualPack(sn.getPartNo(), "partNo", packBean); + mesReworkTaskRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "sn", "description", "systemSyncStatus"}, + new Object[]{userName, TimeTool.getNowTime(true), sn.getProductSn(), sn.getDescription(), CommonEnumUtil.FALSE}, packBean); IPrintTemplateStrategyService strategyService = (IPrintTemplateStrategyService) SpringContextsUtil.getBean(methodCode); return strategyService.execute(null, mesProduceSnPrintModel, null, null, null, true); }