From 29efaba4ac3bd8c2db4a6e9d4b3607e0c0e10e63 Mon Sep 17 00:00:00 2001 From: jun Date: Fri, 30 Aug 2024 19:32:24 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4=E5=A2=9E=E5=8A=A0=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesWorkOrderDaoImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesWorkOrderDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesWorkOrderDaoImpl.java index 407426e..7205dec 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesWorkOrderDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesWorkOrderDaoImpl.java @@ -37,7 +37,7 @@ public class MesWorkOrderDaoImpl implements IMesWorkOrderDao { StringBuffer hql = new StringBuffer("select organize_code as organizeCode,part_no as partNo, date_format(plan_start_time, '%Y-%m-%d' ) as planStartTime, product_version as productVersion, " + " sum(case when work_order_status = 40 then reported_qty else qty end ) as qty " + " from mes_work_order where is_deleted=:isDeleted and is_valid = :isValid and organize_code = :organizeCode " + - " and work_order_type = :workOrderType and order_flag != :orderFlag and work_order_status in (20,30,40) and plan_start_time >= :today" + + " and work_order_type = :workOrderType and order_flag != :orderFlag and work_order_status in (20,30,40,50) and plan_start_time >= :today" + " group by organize_code,part_no, date_format(plan_start_time, '%Y-%m-%d' ), product_version "); Query query = entityManager.createNativeQuery(hql.toString()); query.setParameter("organizeCode", organizeCode); From 6faa207574d6abccea5e14c8ac2b55d4741082cf Mon Sep 17 00:00:00 2001 From: jun Date: Sun, 1 Sep 2024 13:40:39 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E5=85=B3=E7=B3=BB=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesOrgServiceImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesOrgServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesOrgServiceImpl.java index 48e7d3f..fb38f23 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesOrgServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesOrgServiceImpl.java @@ -5,7 +5,6 @@ import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.MesOrg; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -25,11 +24,7 @@ public class MesOrgServiceImpl extends BaseMesService implements IMesOrg @Override protected void setPackQueryBean(MesOrg bean, DdlPackBean packBean) { DdlPreparedPack.getStringEqualPack(bean.getInventoryLocationCode(), "inventoryLocationCode", packBean); - if(StringUtil.isEmpty(bean.getResponsibleParty())){ - DdlPreparedPack.getIsNotNull( "responsibleParty", packBean); - }else { - DdlPreparedPack.getStringEqualPack(bean.getResponsibleParty(), "responsibleParty", packBean); - } + DdlPreparedPack.getStringEqualPack(bean.getResponsibleParty(), "responsibleParty", packBean); } From 7cb382e5162820329e8e779cc2430eb6770854dc Mon Sep 17 00:00:00 2001 From: jun Date: Sun, 1 Sep 2024 13:41:11 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 2155f44..30d65f3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -1046,6 +1046,7 @@ public class MesWorkOrderService extends BaseMesService implements if(CollectionUtils.isEmpty(mesWorkOrderList)){ return; } + log.info("关闭工单个数{},工单:{}",mesWorkOrderList.size(),mesWorkOrderList.stream().map(MesWorkOrder::getWorkOrderNo).collect(Collectors.toList())); //关闭工单回传 List partNoAndDataKey = mesWorkOrderList.stream().map(t -> new StringJoiner(MesExtConstWords.COMMA).add(t.getPartNo()).add(t.getProductVersion()).add(t.getPlanStartTime().substring(0, 10)).toString()).distinct().collect(Collectors.toList()); List mesWorkOrderToSapList = new ArrayList<>(); @@ -1056,8 +1057,8 @@ public class MesWorkOrderService extends BaseMesService implements } mesWorkOrderToSapRepository.saveAll(mesWorkOrderToSapList); //关闭工单 - baseRDao.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "workOrderStatus"}, - new Object[]{userName, TimeTool.getNowTime(true), MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()}, ddlPackBean); + baseRDao.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "workOrderStatus","systemSyncStatus"}, + new Object[]{userName, TimeTool.getNowTime(true), MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue(),CommonEnumUtil.FALSE}, ddlPackBean); } From edfeb08797027f4b5bd720148d56613a9848d50e Mon Sep 17 00:00:00 2001 From: jun Date: Sun, 1 Sep 2024 13:41:52 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/groovy/Mes2Pisces/MesToPiscesProductSn.groovy | 9 ++++++++- .../src/groovy/Pisces2Mes/PiscesToMesProductSn.groovy | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesProductSn.groovy b/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesProductSn.groovy index 01efd03..04b330f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesProductSn.groovy +++ b/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesProductSn.groovy @@ -1,3 +1,4 @@ +import cn.estsh.i3plus.mes.apiservice.util.DateUtil import cn.estsh.i3plus.platform.common.tool.TimeTool import cn.estsh.i3plus.platform.plugin.datasource.DynamicDataSourceProxy import cn.estsh.i3plus.pojo.base.bean.DdlPackBean @@ -48,6 +49,8 @@ class MesToPiscesProductSn { LOGGER.info("未查询到跨工厂配置"); return new ArrayList<>(); } + LOGGER.info("跨工厂配置个数{}",crossOrganizeCfgList.size()); + List> srcData = new ArrayList<>(); List updateList = new ArrayList<>(); //循环处理数据 @@ -62,15 +65,19 @@ class MesToPiscesProductSn { } String sql = "select * from " + mapper.getSrcTableName() + " where organize_code = :srcOrganizeCode and part_no = :partNo and create_date_time >= :createDateTime and " + mapper.getSrcWhere() + " order by " + mapper.getSrcOrderBy() + " limit " + mapper.getSrcGetLimit() + LOGGER.info("工厂:{}，物料:{}，时间:{}，查询sql:{}",crossOrganizeCfg.getOrganizeCode(),crossOrganizeCfg.getPartNo(),params.get("createDateTime"),sql); //查询待同步的数据 List> dataList = queryDataTable(sql, params); if (!CollectionUtils.isEmpty(dataList)) { + LOGGER.info("工厂:{}，物料:{}，查询行数:{}",crossOrganizeCfg.getSrcOrganizeCode(),crossOrganizeCfg.getPartNo(),dataList.size()); + //目标工厂 for (Map rowMap : dataList) { rowMap.put("DEST_ORGANIZE_CODE", crossOrganizeCfg.getSrcOrganizeCode()) } srcData.addAll(dataList); - String createDateTime = dataList.iterator().next().get("create_date_time") + + String createDateTime = TimeTool.pareDateToString(DateUtil.addMinutes(TimeTool.parseDate(dataList.iterator().next().get("create_date_time")), -5)); //更新配置 updateList.add("update mes_cross_organize_cfg set last_create_date_time = '"+createDateTime+"',last_exe_time = '"+ TimeTool.getNowTime(true)+"' where id= " + crossOrganizeCfg.getId() + " ;") } diff --git a/modules/i3plus-ext-mes-apiservice/src/groovy/Pisces2Mes/PiscesToMesProductSn.groovy b/modules/i3plus-ext-mes-apiservice/src/groovy/Pisces2Mes/PiscesToMesProductSn.groovy index 37e54f0..b1b548b 100644 --- a/modules/i3plus-ext-mes-apiservice/src/groovy/Pisces2Mes/PiscesToMesProductSn.groovy +++ b/modules/i3plus-ext-mes-apiservice/src/groovy/Pisces2Mes/PiscesToMesProductSn.groovy @@ -39,6 +39,7 @@ class PiscesToMesProductSn { LOGGER.info("未查询到跨工厂配置"); return new ArrayList<>(); } + LOGGER.info("跨工厂配置个数{}",crossOrganizeCfgList.size()); List> srcData = new ArrayList<>(); //循环处理数据 for (MesCrossOrganizeCfg crossOrganizeCfg : crossOrganizeCfgList) { @@ -46,9 +47,11 @@ class PiscesToMesProductSn { params.put("srcOrganizeCode", crossOrganizeCfg.getSrcOrganizeCode()) params.put("partNo", crossOrganizeCfg.getPartNo()) String sql = "select top "+mapper.getSrcGetLimit()+" * from " + mapper.getSrcTableName() + " where PLANT = :srcOrganizeCode and PART_NO = :partNo and " + mapper.getSrcWhere() + " order by "+mapper.getSrcOrderBy() + LOGGER.info("工厂:{}，物料:{}，查询sql:{}",crossOrganizeCfg.getSrcOrganizeCode(),crossOrganizeCfg.getPartNo(),sql); //查询待同步的数据 List> dataList = queryDataTable(sql, params); if (!CollectionUtils.isEmpty(dataList)) { + LOGGER.info("工厂:{}，物料:{}，查询行数:{}",crossOrganizeCfg.getSrcOrganizeCode(),crossOrganizeCfg.getPartNo(),dataList.size()); srcData.addAll(dataList); } } From 0d88a90ecc59d8dd25f9efcc6dffac7e97ae4da8 Mon Sep 17 00:00:00 2001 From: jun Date: Tue, 3 Sep 2024 09:02:43 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=20=E9=9D=9E=E6=8E=92=E5=BA=8F=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF-=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=97=B6=E6=A0=A1=E9=AA=8C=E5=A1=AB=E5=86=99=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=97=A5=E6=9C=9F=E7=9A=84=E6=A0=BC=E5=BC=8F=E8=A6=81?= =?UTF-8?q?=E4=B8=8Eyyyy-MM-dd=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= =?UTF-8?q?=EF=BC=8C=E8=8B=A5=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=97=B6=E5=BC=B9=E7=AA=97=E6=8A=A5=E9=94=99(?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E8=A6=81=E6=8F=90=E7=A4=BA=E5=85=B7=E4=BD=93?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0)=EF=BC=8C=E6=95=B4=E4=B8=AA=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=A8=A1=E6=9D=BF=E6=97=A0=E6=B3=95=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 30d65f3..1411ba9 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -483,7 +483,7 @@ public class MesWorkOrderService extends BaseMesService implements } catch (ImppBusiException busExcep) { MesException.throwMesBusiException(busExcep.getErrorDetail()); } catch (Exception e) { - MesException.throwMesBusiException("计划日期格式异常"); + MesException.throwMesBusiException("计划日期格式异常，日期格式应为:%s",DateUtil.SHORT_FORMAT); } //查询班次信息 List mesShifts = mesShiftMap.get(item.getWorkCenterCode() + item.getShiftCode()); From 5b3862b7e3ac4b577ee30da011585e3478a1acb7 Mon Sep 17 00:00:00 2001 From: jun Date: Wed, 4 Sep 2024 08:42:10 +0800 Subject: [PATCH 06/14] =?UTF-8?q?42904=20=E8=AF=95=E5=88=B6=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=92=8C=E8=AF=95=E5=88=B6=E9=9B=B6=E4=BB=B6=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=B7=A5=E5=8D=95=E4=BF=A1=E6=81=AF=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/daoimpl/MesWorkOrderDaoImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesWorkOrderDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesWorkOrderDaoImpl.java index 7205dec..04bfb1d 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesWorkOrderDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesWorkOrderDaoImpl.java @@ -34,15 +34,20 @@ public class MesWorkOrderDaoImpl implements IMesWorkOrderDao { @Override public List sumMesWorkOrderQtyToSap(String organizeCode) { - StringBuffer hql = new StringBuffer("select organize_code as organizeCode,part_no as partNo, date_format(plan_start_time, '%Y-%m-%d' ) as planStartTime, product_version as productVersion, " + - " sum(case when work_order_status = 40 then reported_qty else qty end ) as qty " + - " from mes_work_order where is_deleted=:isDeleted and is_valid = :isValid and organize_code = :organizeCode " + - " and work_order_type = :workOrderType and order_flag != :orderFlag and work_order_status in (20,30,40,50) and plan_start_time >= :today" + - " group by organize_code,part_no, date_format(plan_start_time, '%Y-%m-%d' ), product_version "); + StringBuffer hql = new StringBuffer("select workOrder.organize_code as organizeCode,workOrder.part_no as partNo, " + + " date_format(workOrder.plan_start_time, '%Y-%m-%d' ) as planStartTime, workOrder.product_version as productVersion, " + + " sum(case when workOrder.work_order_status = 40 then workOrder.reported_qty else workOrder.qty end ) as qty " + + " from mes_work_order as workOrder left join mes_part_sap as partSap on workOrder.part_no = partSap.part_no" + + " where workOrder.is_deleted=:isDeleted and workOrder.is_valid = :isValid and workOrder.organize_code = :organizeCode " + + " and partSap.is_deleted=:isDeleted and partSap.is_valid = :isValid and partSap.organize_code = :organizeCode " + + " and partSap.is_test_piece = :isTestPiece and workOrder.work_order_type = :workOrderType and workOrder.order_flag != :orderFlag " + + " and workOrder.work_order_status in (20,30,40,50) and workOrder.plan_start_time >= :today" + + " group by workOrder.organize_code,workOrder.part_no, date_format(workOrder.plan_start_time, '%Y-%m-%d' ), workOrder.product_version "); Query query = entityManager.createNativeQuery(hql.toString()); query.setParameter("organizeCode", organizeCode); query.setParameter("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); query.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + query.setParameter("isTestPiece", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); query.setParameter("today", TimeTool.getToday()); query.setParameter("workOrderType", MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue()); query.setParameter("orderFlag", MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue()); From 129f5b00bcbbfbcaa053b1a808852034817f1c09 Mon Sep 17 00:00:00 2001 From: jun Date: Wed, 4 Sep 2024 09:48:02 +0800 Subject: [PATCH 07/14] =?UTF-8?q?PCN=E5=92=8C=E7=BD=91=E9=A1=B5=E7=AB=AF?= =?UTF-8?q?=E7=9A=84=E5=B7=A5=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=81=9A=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E6=8A=A5=E5=B7=A5=EF=BC=8C=E7=94=9F=E6=88=90=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A7=84=E5=88=99=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=8F=96=E7=89=A9=E6=96=99=E6=89=A9=E5=B1=95=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E7=9A=84=E6=9D=A1=E7=A0=81=E8=A7=84=E5=88=99=EF=BC=8C=E5=8F=96?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=9B=BA=E5=AE=9A=E7=9A=84=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=8D=B3=E5=8F=AF=EF=BC=888=E4=BD=8D=E5=B9=B4=E6=9C=88?= =?UTF-8?q?=E6=97=A5+4=E4=BD=8D=E6=B5=81=E6=B0=B4=E5=8F=B7=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/MesWorkOrderService.java | 32 ++++++++++------------ 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 1411ba9..727a9a1 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -847,12 +847,7 @@ public class MesWorkOrderService extends BaseMesService implements //查询物料信息 MesPart mesPart = iMesPartService.getPartByPartNo(mesWorkOrderDb.getPartNo(), mesWorkOrderDb.getOrganizeCode()); //查询产线信息 - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesWorkOrderDb.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(mesWorkOrderDb.getWorkCenterCode(), "workCenterCode", ddlPackBean); - MesWorkCenter mesWorkCenter = mesWorkCenterRDao.getByProperty(ddlPackBean); - if (Objects.isNull(mesWorkCenter)) { - MesException.throwMesBusiException("产线【%s】不存在", mesWorkOrderDb.getWorkCenterCode()); - } + MesWorkCenter mesWorkCenter = getMesWorkCenter(mesWorkOrderDb.getOrganizeCode(),mesWorkOrderDb.getWorkCenterCode()); //获取生产版本 MesProductVersion mesProductVersion = getMesProductVersion(mesWorkOrderDb); //物料+生产版本获取bom信息 @@ -864,19 +859,15 @@ public class MesWorkOrderService extends BaseMesService implements double unCompleteQty = MathOperation.sub(mesWorkOrderDb.getQty(), mesWorkOrderDb.getReportedQty()); mesWorkOrderDb.setUnCompleteQty(unCompleteQty > 0 ? unCompleteQty : 0); if (mesWorkOrderDb.getReportedQty() > mesWorkOrderDb.getQty()) { - //查询产线信息 - DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkOrder.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); - MesWorkCenter workCenter = mesWorkCenterRDao.getByProperty(packBean); // 以下则是超工单逻辑 // 如果产线中没有配置超工单，则直接阻断 - if (!Objects.equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), workCenter.getIsCheckOrderQty())) { + if (!Objects.equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), mesWorkCenter.getIsCheckOrderQty())) { MesException.throwMesBusiException("请检查工单数量,工单号[%s],工单数量[%s]报工数量[%s],且未配置超工单!", mesWorkOrder.getWorkOrderNo(), mesWorkOrder.getQty(), mesWorkOrder.getReportedQty()); } // 如果配置了超工单，且比例已经超过了配置的超工单比例，也需要阻断 double rate = MathOperation.div((mesWorkOrderDb.getReportedQty() - mesWorkOrderDb.getQty()),mesWorkOrderDb.getQty()); - if (rate > MathOperation.div(workCenter.getOrderRate(),100)) { - MesException.throwMesBusiException("请检查工单数量,工单号[%s],工单数量[%s]报工数量[%s],配置了超工单,但超过了比例[%s]!", mesWorkOrder.getWorkOrderNo(), mesWorkOrder.getQty(), mesWorkOrder.getReportedQty(), workCenter.getOrderRate()); + if (rate > MathOperation.div(mesWorkCenter.getOrderRate(),100)) { + MesException.throwMesBusiException("请检查工单数量,工单号[%s],工单数量[%s]报工数量[%s],配置了超工单,但超过了比例[%s]!", mesWorkOrder.getWorkOrderNo(), mesWorkOrder.getQty(), mesWorkOrder.getReportedQty(), mesWorkCenter.getOrderRate()); } mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue()); } else if (Objects.equals(mesWorkOrderDb.getReportedQty(), mesWorkOrderDb.getQty())) { @@ -921,6 +912,8 @@ public class MesWorkOrderService extends BaseMesService implements if (mesWorkOrderNew.getNum() <= 0) { MesException.throwMesBusiException("工单报工数量不能为0,不允许报工"); } + //查询产线信息 + MesWorkCenter workCenter = getMesWorkCenter(mesWorkOrder.getOrganizeCode(),mesWorkOrder.getWorkCenterCode()); //报工类型 //报工 if (MesExtEnumUtil.REPORT_TYPE.REPORT.getValue() == mesWorkOrderNew.getReportType()) { @@ -929,10 +922,6 @@ public class MesWorkOrderService extends BaseMesService implements double unCompleteQty = MathOperation.sub(mesWorkOrder.getQty(), mesWorkOrder.getReportedQty()); mesWorkOrder.setUnCompleteQty(unCompleteQty > 0 ? unCompleteQty : 0); if (mesWorkOrder.getReportedQty() > mesWorkOrder.getQty()) { - //查询产线信息 - DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesWorkOrder.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", ddlPackBean); - MesWorkCenter workCenter = mesWorkCenterRDao.getByProperty(ddlPackBean); // 以下则是超工单逻辑 // 如果产线中没有配置超工单，则直接阻断 if (!Objects.equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), workCenter.getIsCheckOrderQty())) { @@ -1285,6 +1274,15 @@ public class MesWorkOrderService extends BaseMesService implements return newMesProductOffLine; } + + private MesWorkCenter getMesWorkCenter(String organizeCode,String workCenterCode) { + MesWorkCenter mesWorkCenter = workCenterService.getWorkCenterDb(organizeCode, workCenterCode); + if (Objects.isNull(mesWorkCenter)) { + MesException.throwMesBusiException("产线【%s】不存在", workCenterCode); + } + return mesWorkCenter; + } + @Override public List sumMesWorkOrderQtyToSap(String organizeCode) { //查询汇总工单数量 From cab9779ef0cb68a67bbcb292263492bef8cdd21c Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 4 Sep 2024 13:37:12 +0800 Subject: [PATCH 08/14] =?UTF-8?q?42939=20=E4=BA=A7=E9=87=8F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=8A=A5=E8=A1=A8-=E4=BA=A7=E7=BA=BF=E3=80=81?= =?UTF-8?q?=E5=B7=A5=E4=BD=8D=20=E6=94=AF=E6=8C=81=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/base/MesProductionRecordServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordServiceImpl.java index f21ff96..7eadfe3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordServiceImpl.java @@ -155,7 +155,7 @@ public class MesProductionRecordServiceImpl extends BaseMesService Date: Wed, 4 Sep 2024 14:08:35 +0800 Subject: [PATCH 09/14] =?UTF-8?q?42941=20mes=5Fqms=5Fscrap=E8=BF=99?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5nc=5Fjudger=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=9C=80=E8=A6=81=E8=B5=8B=E6=9C=80=E7=BB=88?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E4=BA=BA=E6=88=96=E8=80=85=E8=BF=94=E5=B7=A5?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E4=BA=BA=E7=9A=84=E5=B7=A5=E5=8F=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/schedulejob/MesQmsScrapJob.java | 2 +- .../mes/apiservice/schedulejob/MesQmsSuspiciousJob.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsScrapJob.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsScrapJob.java index e48673c..f6d52bd 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsScrapJob.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsScrapJob.java @@ -85,7 +85,7 @@ public class MesQmsScrapJob extends BaseMesScheduleJob { for (MesPartInspection mesPartInspection : mesPartInspectionList) { mesPartInspection.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); - ConvertBean.serviceModelUpdate(mesPartInspection, MesExtConstWords.JOB); +// ConvertBean.serviceModelUpdate(mesPartInspection, MesExtConstWords.JOB); } partInspectionRepository.saveAll(mesPartInspectionList); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java index 9ef53e6..dee3c9f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java @@ -80,13 +80,13 @@ public class MesQmsSuspiciousJob extends BaseMesScheduleJob { // new SimpleDateFormat("yyyy-MM-dd").format(TimeTool.getDateBefore(new Date(), 1)) + " 00:00:00", // TimeTool.getToday() + " 00:00:00", "createDatetime", packBean, true); // 获取当前时间前1小时的时间 - LocalDateTime now = LocalDateTime.now(); - LocalDateTime oneHourAgo = now.minusHours(1); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - String formattedNow = now.format(formatter); - String formattedOneHourAgo = oneHourAgo.format(formatter); +// LocalDateTime now = LocalDateTime.now(); +// LocalDateTime oneHourAgo = now.minusHours(1); +// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); +// String formattedNow = now.format(formatter); +// String formattedOneHourAgo = oneHourAgo.format(formatter); +// DdlPreparedPack.timeBuilder(formattedOneHourAgo, formattedNow, "createDatetime", packBean, true); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "qmsSync", packBean); - DdlPreparedPack.timeBuilder(formattedOneHourAgo, formattedNow, "createDatetime", packBean, true); List mesPartInspectionList = partInspectionRepository.findByHqlWhere(packBean); if (!CollectionUtils.isEmpty(mesPartInspectionList)) { @@ -114,7 +114,7 @@ public class MesQmsSuspiciousJob extends BaseMesScheduleJob { for (MesPartInspection mesPartInspection : mesPartInspectionList) { mesPartInspection.setQmsSync(1); - ConvertBean.serviceModelUpdate(mesPartInspection, MesExtConstWords.JOB); +// ConvertBean.serviceModelUpdate(mesPartInspection, MesExtConstWords.JOB); } partInspectionRepository.saveAll(mesPartInspectionList); } From 2261f434534693d2508fa0db486466f87b12de0b Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 4 Sep 2024 14:59:55 +0800 Subject: [PATCH 10/14] =?UTF-8?q?42942=20=E5=B7=B2=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E3=80=81=E5=B7=B2=E5=AE=8C=E6=88=90=E7=9A=84=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=81=9A=E6=89=B9=E9=87=8F=E6=B1=87=E6=8A=A5?= =?UTF-8?q?=EF=BC=8C=E4=B8=94=E7=82=B9=E2=80=9D=E6=8A=A5=E5=B7=A5=E2=80=9C?= =?UTF-8?q?=E6=97=B6=E5=BC=BA=E5=88=B6=E8=A6=81=E6=B1=82=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E8=BF=87=E8=B4=A6=E6=97=A5=E6=9C=9F=E5=92=8C?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 727a9a1..d1c5ae7 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -893,7 +893,8 @@ public class MesWorkOrderService extends BaseMesService implements String sn = getStringList(mesWorkOrder); //保存数据 List mesProductOffLineList = new ArrayList<>(); - String nowTime = TimeTool.getNowTime(true); + String nowTime = StringUtil.isEmpty(mesWorkOrder.getDescription())?TimeTool.getNowTime(true):mesWorkOrder.getDescription(); + for (MesBom mesBom : mesBoms) { mesProductOffLineList.add(creatMesProductOffLine(mesWorkOrder, mesProductVersion, sn, mesBom, false,nowTime)); } From 9b782c9d1d1f27db95ef7a0f9f311283bde3e0da Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 4 Sep 2024 17:28:22 +0800 Subject: [PATCH 11/14] =?UTF-8?q?42959=20QMS=E5=8F=AF=E7=96=91=E5=93=81?= =?UTF-8?q?=E6=B1=87=E6=80=BBjob=20=E4=BC=9A=E6=8A=8A=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E5=8C=96=E6=A3=80=E9=AA=8C=E7=BB=88=E6=A3=80=E4=BA=BA=E5=92=8C?= =?UTF-8?q?=E7=BB=88=E6=A3=80=E6=97=B6=E9=97=B4=E8=A6=86=E7=9B=96=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java index dee3c9f..6ebec7a 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java @@ -113,7 +113,8 @@ public class MesQmsSuspiciousJob extends BaseMesScheduleJob { qmsSuspiciousService.doQmsSuspiciousByPartInspection(partInspectionList, organizeCode); for (MesPartInspection mesPartInspection : mesPartInspectionList) { - mesPartInspection.setQmsSync(1); + mesPartInspection.setQmsSync(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + //42959 QMS可疑品汇总job 会把电子化检验终检人和终检时间覆盖掉 // ConvertBean.serviceModelUpdate(mesPartInspection, MesExtConstWords.JOB); } partInspectionRepository.saveAll(mesPartInspectionList); From 560db850d867af16820e2fb64295de6cd49dd305 Mon Sep 17 00:00:00 2001 From: gsz Date: Thu, 5 Sep 2024 10:41:37 +0800 Subject: [PATCH 12/14] =?UTF-8?q?42937=20=E5=85=B3=E9=97=AD=E7=9A=84?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=8F=AF=E4=BB=A5=E5=81=9A=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index d1c5ae7..12d15d3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -873,7 +873,8 @@ public class MesWorkOrderService extends BaseMesService implements } else if (Objects.equals(mesWorkOrderDb.getReportedQty(), mesWorkOrderDb.getQty())) { mesWorkOrderDb.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue()); } else { - mesWorkOrderDb.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue()); + mesWorkOrderDb.setWorkOrderStatus(mesWorkOrder.getWorkOrderStatus()==MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()? + MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue():MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue()); } mesWorkOrderDb.setCompleteQty(mesWorkOrderDb.getReportedQty()); } else { From 9ccea904dc27ee9e082388df9d5a3a5dc39f0c9d Mon Sep 17 00:00:00 2001 From: gsz Date: Thu, 5 Sep 2024 11:04:53 +0800 Subject: [PATCH 13/14] =?UTF-8?q?42966=20=E8=AE=BE=E5=A4=87=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8-=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=8F=98=E9=87=8F=E5=90=8D=E7=A7=B0=E3=80=81=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=8F=98=E9=87=8FID=E5=8F=AF=E4=BB=A5=E5=A4=9A?= =?UTF-8?q?=E9=80=89=E6=9F=A5=E8=AF=A2=EF=BC=8C=E8=BE=93=E5=85=A5=E6=97=B6?= =?UTF-8?q?,=E7=94=A8=E9=80=97=E5=8F=B7=E9=9A=94=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/report/MesEquipmentLogDetailService.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java index 984eda0..6009bae 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java @@ -16,6 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import java.util.ArrayList; +import java.util.Arrays; import java.util.StringJoiner; @Service @@ -29,9 +30,17 @@ public class MesEquipmentLogDetailService extends BaseMesService Date: Thu, 5 Sep 2024 21:36:39 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E7=82=B9=E6=A3=80=E5=8D=95=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=A0=87=E8=AF=86=E6=9C=AA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/apiservice/aspect/MesRepositoryAspect.java | 2 +- .../serviceimpl/busi/MesSpotCheckOrderService.java | 26 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/aspect/MesRepositoryAspect.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/aspect/MesRepositoryAspect.java index 8985545..4ae6482 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/aspect/MesRepositoryAspect.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/aspect/MesRepositoryAspect.java @@ -125,6 +125,6 @@ public class MesRepositoryAspect { private void updateBeanSync(BaseBean bean) { bean.setSystemSyncStatus(CommonEnumUtil.FALSE); - bean.setModifyDatetime(TimeTool.getNowTime(true)); + bean.setSystemSyncDatetime(""); } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java index da4b873..a67a8d5 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java @@ -139,6 +139,8 @@ public class MesSpotCheckOrderService extends BaseMesService BeanUtils.copyProperties(equipmentSpotCheck, bean, "id"); bean.setSpotCheckOrderNo(orderNo); + bean.setSystemSyncStatus(CommonEnumUtil.FALSE); + bean.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(bean, AuthUtil.getSessionUser().getUserName()); bean = baseRDao.insert(bean); @@ -155,6 +157,8 @@ public class MesSpotCheckOrderService extends BaseMesService result.setSpotCheckItemId(k.getId()); result.setTaskItemName(k.getSpotCheckItemName()); result.setSpotCheckStandardValue(k.getStandardValue()); + result.setSystemSyncStatus(CommonEnumUtil.FALSE); + result.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(result, AuthUtil.getSessionUser().getUserName()); // ConvertBean.serviceModelInitialize(result, "LML"); spotCheckOrderResults.add(result); @@ -168,6 +172,8 @@ public class MesSpotCheckOrderService extends BaseMesService MesSpotCheckOrderPart spotCheckOrderPart = new MesSpotCheckOrderPart(); spotCheckOrderPart.setSpotCheckOrderId(finalBean.getId()); BeanUtils.copyProperties(k, spotCheckOrderPart, "id"); + spotCheckOrderPart.setSystemSyncStatus(CommonEnumUtil.FALSE); + spotCheckOrderPart.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(spotCheckOrderPart, AuthUtil.getSessionUser().getUserName()); // ConvertBean.serviceModelInitialize(spotCheckOrderPart, "LML"); spotCheckOrderPartList.add(spotCheckOrderPart); @@ -209,6 +215,8 @@ public class MesSpotCheckOrderService extends BaseMesService //软删点检单明细 oldOrderResultList.forEach(k -> { + k.setSystemSyncStatus(CommonEnumUtil.FALSE); + k.setSystemSyncDatetime(""); k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); }); @@ -222,6 +230,8 @@ public class MesSpotCheckOrderService extends BaseMesService //软删点检单零件号及条码 oldOrderPartList.forEach(k -> { k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + k.setSystemSyncStatus(CommonEnumUtil.FALSE); + k.setSystemSyncDatetime(""); ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); }); spotCheckOrderPartRepository.saveAll(oldOrderPartList); @@ -276,6 +286,8 @@ public class MesSpotCheckOrderService extends BaseMesService MesSpotCheckOrderResult result = new MesSpotCheckOrderResult(); BeanUtils.copyProperties(k, result, "id"); result.setPid(finalBean.getId()); + result.setSystemSyncStatus(CommonEnumUtil.FALSE); + result.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(result, AuthUtil.getSessionUser().getUserName()); spotCheckOrderResults.add(result); }); @@ -287,6 +299,8 @@ public class MesSpotCheckOrderService extends BaseMesService MesSpotCheckOrderPart spotCheckOrderPart = new MesSpotCheckOrderPart(); spotCheckOrderPart.setSpotCheckOrderId(finalBean.getId()); BeanUtils.copyProperties(k, spotCheckOrderPart, "id"); + spotCheckOrderPart.setSystemSyncStatus(CommonEnumUtil.FALSE); + spotCheckOrderPart.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(spotCheckOrderPart, AuthUtil.getSessionUser().getUserName()); spotCheckOrderPartList.add(spotCheckOrderPart); }); @@ -295,6 +309,8 @@ public class MesSpotCheckOrderService extends BaseMesService spotCheckOrderResultService.insertBatch(spotCheckOrderResults); + bean.setSystemSyncStatus(CommonEnumUtil.FALSE); + bean.setSystemSyncDatetime(""); ConvertBean.serviceModelUpdate(bean, AuthUtil.getSessionUser().getUserName()); baseRDao.update(bean); return originBean; @@ -323,6 +339,8 @@ public class MesSpotCheckOrderService extends BaseMesService List detailList = spotCheckOrderResultRepository.findByHqlWhere(packBean); detailList.forEach(k -> { k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + k.setSystemSyncStatus(CommonEnumUtil.FALSE); + k.setSystemSyncDatetime(""); ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); }); spotCheckOrderResultRepository.saveAll(detailList); @@ -336,6 +354,8 @@ public class MesSpotCheckOrderService extends BaseMesService if (CollectionUtils.isEmpty(oldOrderPartList)) { oldOrderPartList.forEach(k -> { k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + k.setSystemSyncStatus(CommonEnumUtil.FALSE); + k.setSystemSyncDatetime(""); ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); }); spotCheckOrderPartRepository.saveAll(oldOrderPartList); @@ -439,12 +459,16 @@ public class MesSpotCheckOrderService extends BaseMesService mesSpotCheckOrder.setStatus(MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.CREATE.getValue()); mesSpotCheckOrder.setSpotCheckId(spotCheck.getId()); mesSpotCheckOrder.setSpotCheckOrderNo(orderNo); + mesSpotCheckOrder.setSystemSyncStatus(CommonEnumUtil.FALSE); + mesSpotCheckOrder.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(mesSpotCheckOrder, userName); mesSpotCheckOrder = baseRDao.insert(mesSpotCheckOrder); //保存单据明细 saveMesSpotCheckOrderDetails(userName, detailMap, spotCheck.getId(), mesSpotCheckOrder); //保存单据零件 saveMesEquipmentSpotCheckPartList(userName, checkPartListMap, spotCheck.getId(), mesSpotCheckOrder.getId()); + spotCheck.setSystemSyncStatus(CommonEnumUtil.FALSE); + spotCheck.setSystemSyncDatetime(""); ConvertBean.serviceModelUpdate(spotCheck, userName); baseRDao.update(spotCheck); count++; @@ -523,6 +547,7 @@ public class MesSpotCheckOrderService extends BaseMesService spotCheckOrderPart.setSpotCheckOrderId(spotCheckOrderId); BeanUtils.copyProperties(k, spotCheckOrderPart, "id"); spotCheckOrderPart.setSystemSyncStatus(CommonEnumUtil.FALSE); + spotCheckOrderPart.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(spotCheckOrderPart, userName); spotCheckOrderPartList.add(spotCheckOrderPart); }); @@ -543,6 +568,7 @@ public class MesSpotCheckOrderService extends BaseMesService result.setTaskItemName(k.getSpotCheckItemName()); result.setSpotCheckStandardValue(k.getStandardValue()); result.setSystemSyncStatus(CommonEnumUtil.FALSE); + result.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(result, userName); spotCheckOrderResults.add(result); });