From 3a81376e608ff9534398ac292d45fd050244b420 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 10 Apr 2025 15:45:16 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctionDataSaveBeforeControlOrderStepService.java | 96 ++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java new file mode 100644 index 0000000..77d8ae4 --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java @@ -0,0 +1,96 @@ +package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step; + +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService; +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService; +import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step.method.MesWorkOrderCheckCompleteQtyStepService; +import cn.estsh.i3plus.ext.mes.pcn.pojo.context.*; +import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; +import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService; +import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.IStepService; +import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; +import cn.estsh.i3plus.pojo.mes.model.StationResultBean; +import cn.estsh.i3plus.pojo.mes.model.StepResult; +import cn.estsh.impp.framework.boot.util.SpringContextsUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; + +import java.util.List; +import java.util.Map; +import java.util.StringJoiner; +import java.util.stream.Collectors; + +/** + * @Description : 控制加工单数量后保存加工结果工步 + * @Author : wangjie + **/ +@Slf4j +@Service("mesProductionDataSaveBeforeControlOrderStepService") +public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStepService { + + @Autowired + private IMesProductionProcessContextStepService productionProcessContextStepService; + + @Autowired + private IMesProductionDispatchContextStepService productionDispatchContextStepService; + + @Autowired + private MesWorkOrderCheckCompleteQtyStepService workOrderCheckCompleteQtyStepService; + + @Override + public StepResult execute(StationRequestBean reqBean) { + + StationResultBean resultBean = new StationResultBean(); + + StepResult stepResult = StepResult.getSuccessComplete(); + + //获取上下文信息: 处理加工不可用规则 + MesProductionProcessContext productionProcessContext = productionProcessContextStepService.dispatchProdRuleIgnoreCfgContext(reqBean); + + //配置错误 抛出异常 + if (!productionProcessContext.getSuccess()) stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage()); + + //存储生产过程上下文对象 + productionProcessContextStepService.dispatchProductionProcessContext(reqBean, productionProcessContext); + + //获取上下文产品加工规则数据信息集合 + List prodRuleContextList = productionDispatchContextStepService.getProdRuleDataContext(reqBean); + //获取上下文产出条码数据信息集合 + List productionPsOutContextList = productionDispatchContextStepService.getProductionPsOutContext(reqBean); + if (CollectionUtils.isEmpty(prodRuleContextList) || CollectionUtils.isEmpty(productionPsOutContextList)) stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "当前不存在非排序加工规则数据,请重置工序!"); + + Map prMap = CollectionUtils.isEmpty(prodRuleContextList) ? null : prodRuleContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getForeignKey()))).collect(Collectors.toMap(MesProdRuleContext::getForeignKey, o -> o)); + + synchronized (new StringJoiner(MesPcnExtConstWords.COLON).add(reqBean.getOrganizeCode()).add(reqBean.getWorkCenterCode()).add(MesPcnExtConstWords.WORK_ORDER_COMPLETE_CONTEXT).toString().intern()) { + + productionPsOutContextList.stream().filter(o -> null != o).forEach(o -> + checkProductionRecordIsReport(reqBean, workCenter, scanMonitorContext, mouldNo, prodRuleContextList, productionProcessContext, o, prMap, cellEquipContext, CollectionUtils.isEmpty(psiMap) ? null : psiMap.get(o.getForeignKey())) + ); + + //验证加工单完成数量 + workOrderCheckCompleteQtyStepService.dispatchWorkOrderCompleteQtyContext( + reqBean, resultBean, stepResult, productionProcessContext, productionPartContextList, productionPsInContextList); + + //匹配失败需要清除本次扫描/读取信息 + if (!stepResult.isCompleted() && workOrderCheckCompleteQtyStepService.doBusiCheckToDelete(reqBean, stepResult, productionPartContextList, productionPsInContextList)) + return stepResult.nextTriggerEvent(MesPcnExtConstWords.NEXT_TRIGGER_EVENT_PART_NO); + + //非排序线 保存加工结果工步 execute 方法 使用的是 新事务 + stepResult = ((IStepService) SpringContextsUtil.getBean("mesProductionDataSaveStepService")).execute(reqBean); + + //保存加工结果事务提交之后, 保存工单计数 + if (stepResult.isCompleted() && !StringUtils.isEmpty(stepResult.getStepAfterState())) { + IStepService stepService = ((IStepService) SpringContextsUtil.getBean(stepResult.getStepAfterState())); + stepResult.stepAfterState(null); + stepService.executeStepAfterExecute(reqBean, stepResult); + } + + } + + return stepResult; + + } + +} From cfdcbe30b1ca77f810ca92768b4a146207f7d632 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 10 Apr 2025 16:50:04 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctionDataSaveBeforeControlOrderStepService.java | 53 +++++++++++++++++++--- 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java index 77d8ae4..c31cba8 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java @@ -2,15 +2,22 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService; +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionRecordService; import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step.method.MesWorkOrderCheckCompleteQtyStepService; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.*; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService; import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.IStepService; +import cn.estsh.i3plus.mes.pcn.util.StringUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesProductionRecord; import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; import cn.estsh.i3plus.pojo.mes.model.StationResultBean; import cn.estsh.i3plus.pojo.mes.model.StepResult; +import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.impp.framework.boot.util.SpringContextsUtil; +import com.alibaba.fastjson.JSONObject; +import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -19,6 +26,7 @@ import org.springframework.util.StringUtils; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.StringJoiner; import java.util.stream.Collectors; @@ -39,6 +47,9 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep @Autowired private MesWorkOrderCheckCompleteQtyStepService workOrderCheckCompleteQtyStepService; + @Autowired + private IMesProductionRecordService productionRecordService; + @Override public StepResult execute(StationRequestBean reqBean) { @@ -57,17 +68,20 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep //获取上下文产品加工规则数据信息集合 List prodRuleContextList = productionDispatchContextStepService.getProdRuleDataContext(reqBean); + Map prMap = CollectionUtils.isEmpty(prodRuleContextList) ? null : prodRuleContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getForeignKey()))).collect(Collectors.toMap(MesProdRuleContext::getForeignKey, o -> o)); //获取上下文产出条码数据信息集合 List productionPsOutContextList = productionDispatchContextStepService.getProductionPsOutContext(reqBean); - if (CollectionUtils.isEmpty(prodRuleContextList) || CollectionUtils.isEmpty(productionPsOutContextList)) stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "当前不存在非排序加工规则数据,请重置工序!"); - - Map prMap = CollectionUtils.isEmpty(prodRuleContextList) ? null : prodRuleContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getForeignKey()))).collect(Collectors.toMap(MesProdRuleContext::getForeignKey, o -> o)); + if (CollectionUtils.isEmpty(prMap) || CollectionUtils.isEmpty(productionPsOutContextList)) stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "当前不存在非排序加工规则数据,请重置工序!"); + //获取进料主条码数据信息 + List productionPsInContextList = productionDispatchContextStepService.getProductionPsInContext(reqBean); + Map psiMap = CollectionUtils.isEmpty(productionPsInContextList) ? null : productionPsInContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getForeignKey()))).collect(Collectors.toMap(MesProductionPsInContext::getForeignKey, o -> o)); synchronized (new StringJoiner(MesPcnExtConstWords.COLON).add(reqBean.getOrganizeCode()).add(reqBean.getWorkCenterCode()).add(MesPcnExtConstWords.WORK_ORDER_COMPLETE_CONTEXT).toString().intern()) { - productionPsOutContextList.stream().filter(o -> null != o).forEach(o -> - checkProductionRecordIsReport(reqBean, workCenter, scanMonitorContext, mouldNo, prodRuleContextList, productionProcessContext, o, prMap, cellEquipContext, CollectionUtils.isEmpty(psiMap) ? null : psiMap.get(o.getForeignKey())) - ); + //验证是否需要汇报 + productionPsOutContextList.stream().filter(o -> null != o).forEach(o -> checkProductionRecordIsReport(reqBean, o, prMap.get(o.getForeignKey()), CollectionUtils.isEmpty(psiMap) ? null : psiMap.get(o.getForeignKey()))); + + //验证加工单完成数量 workOrderCheckCompleteQtyStepService.dispatchWorkOrderCompleteQtyContext( @@ -93,4 +107,31 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep } + private void checkProductionRecordIsReport(StationRequestBean reqBean, MesProductionPsOutContext productionPsOutContext, MesProdRuleContext prodRuleContext, MesProductionPsInContext productionPsInContext) { + Integer reportType = (null != prodRuleContext && !StringUtils.isEmpty(prodRuleContext.getReportType()) && prodRuleContext.getReportType().compareTo(MesPcnExtConstWords.ZERO) != 0) ? prodRuleContext.getReportType() : MesExtEnumUtil.NOSORT_REPORT_TYPE.NO_REPORT.getValue(); + Integer reportStatus = reportType.compareTo(MesExtEnumUtil.NOSORT_REPORT_TYPE.NO_REPORT.getValue()) != 0 ? MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue() : MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue(); + if (reportStatus.compareTo(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue()) == 0 && isSamePart(productionPsInContext, productionPsOutContext) && + checkPsIsReported(reqBean.getOrganizeCode(), productionPsOutContext.getProductSn(), productionPsOutContext.getPartNo())) reportStatus = MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue(); + if (reportStatus.compareTo(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue()) == 0) productionPsOutContext.setIsCalcCompleteQty(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + log.info("工厂{}生产线{}工位{}:FSM STATE DISPATCHER --- DO STEP --- {} EXEC --- MesProductionPsOutContext:{}", + reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), StringUtil.toLowerCaseFirst(this.getClass().getSimpleName()), JSONObject.toJSONString(productionPsOutContext)); + } + + //加工规则中进料零件与产出零件是否一致 + private Boolean isSamePart(MesProductionPsInContext productionPsInContext, MesProductionPsOutContext productionPsOutContext) { + if (null == productionPsInContext) return false; + if (StringUtils.isEmpty(productionPsInContext.getPartNo())) return false; + if (null == productionPsOutContext) return false; + if (!productionPsInContext.getPartNo().equals(productionPsOutContext.getPartNo())) return false; + return true; + } + + //验证是否存在产出零件条码+零件编码已经汇报的场景 + private Boolean checkPsIsReported(String organizeCode, String productSn, String partNo) { + List productionRecordList = productionRecordService.findProductionRecordList(organizeCode, productSn, partNo); + if (CollectionUtils.isEmpty(productionRecordList)) return false; + Optional optional = productionRecordList.stream().filter(o -> (null != o && o.getReportStatus().compareTo(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue()) != 0)).findFirst(); + return (null != optional && optional.isPresent()) ? true : false; + } + } From 9ba8c0622da7a32e11d64303af8a063cb0196473 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 10 Apr 2025 17:03:35 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../step/MesProductionDataSaveBeforeControlOrderStepService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java index c31cba8..3e9c3db 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java @@ -81,6 +81,9 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep //验证是否需要汇报 productionPsOutContextList.stream().filter(o -> null != o).forEach(o -> checkProductionRecordIsReport(reqBean, o, prMap.get(o.getForeignKey()), CollectionUtils.isEmpty(psiMap) ? null : psiMap.get(o.getForeignKey()))); + Map> reportPsMap = productionPsOutContextList.stream().filter(o -> (null != o && o.getIsCalcCompleteQty().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) == 0)).collect(Collectors.groupingBy(MesProductionPsOutContext::getPartNo)); + + if () //验证加工单完成数量 From 59d75d5ae3232d463e921f5e9a5770476804ed09 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 10 Apr 2025 19:15:04 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctionDataSaveBeforeControlOrderStepService.java | 24 ++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java index 3e9c3db..683def7 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java @@ -3,8 +3,10 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionRecordService; -import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step.method.MesWorkOrderCheckCompleteQtyStepService; -import cn.estsh.i3plus.ext.mes.pcn.pojo.context.*; +import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProdRuleContext; +import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext; +import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsInContext; +import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService; import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.IStepService; @@ -17,7 +19,6 @@ import cn.estsh.i3plus.pojo.mes.model.StepResult; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.impp.framework.boot.util.SpringContextsUtil; import com.alibaba.fastjson.JSONObject; -import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -45,9 +46,6 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep private IMesProductionDispatchContextStepService productionDispatchContextStepService; @Autowired - private MesWorkOrderCheckCompleteQtyStepService workOrderCheckCompleteQtyStepService; - - @Autowired private IMesProductionRecordService productionRecordService; @Override @@ -55,8 +53,6 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep StationResultBean resultBean = new StationResultBean(); - StepResult stepResult = StepResult.getSuccessComplete(); - //获取上下文信息: 处理加工不可用规则 MesProductionProcessContext productionProcessContext = productionProcessContextStepService.dispatchProdRuleIgnoreCfgContext(reqBean); @@ -76,6 +72,7 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep List productionPsInContextList = productionDispatchContextStepService.getProductionPsInContext(reqBean); Map psiMap = CollectionUtils.isEmpty(productionPsInContextList) ? null : productionPsInContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getForeignKey()))).collect(Collectors.toMap(MesProductionPsInContext::getForeignKey, o -> o)); + Loop: synchronized (new StringJoiner(MesPcnExtConstWords.COLON).add(reqBean.getOrganizeCode()).add(reqBean.getWorkCenterCode()).add(MesPcnExtConstWords.WORK_ORDER_COMPLETE_CONTEXT).toString().intern()) { //验证是否需要汇报 @@ -83,12 +80,12 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep Map> reportPsMap = productionPsOutContextList.stream().filter(o -> (null != o && o.getIsCalcCompleteQty().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) == 0)).collect(Collectors.groupingBy(MesProductionPsOutContext::getPartNo)); - if () + if (CollectionUtils.isEmpty(reportPsMap)) break Loop; + + + - //验证加工单完成数量 - workOrderCheckCompleteQtyStepService.dispatchWorkOrderCompleteQtyContext( - reqBean, resultBean, stepResult, productionProcessContext, productionPartContextList, productionPsInContextList); //匹配失败需要清除本次扫描/读取信息 if (!stepResult.isCompleted() && workOrderCheckCompleteQtyStepService.doBusiCheckToDelete(reqBean, stepResult, productionPartContextList, productionPsInContextList)) @@ -106,7 +103,8 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep } - return stepResult; + //非排序线 保存加工结果工步 execute 方法 使用的是 新事务 + return ((IStepService) SpringContextsUtil.getBean("mesProductionDataSaveStepService")).execute(reqBean); } From 14e5f7ef2f3fa41661b483e1d4a44ee48afd13df Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 11 Apr 2025 00:45:03 +0800 Subject: [PATCH 05/10] =?UTF-8?q?l=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/api/busi/IMesWorkOrderExtService.java | 3 +++ .../serviceimpl/busi/MesWorkOrderExtService.java | 18 ++++++++++++++++++ ...roductionDataSaveBeforeControlOrderStepService.java | 6 ++++++ .../ext/mes/pcn/pojo/util/MesPcnExtConstWords.java | 2 ++ 4 files changed, 29 insertions(+) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkOrderExtService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkOrderExtService.java index 2b4dd9e..a1bbd3a 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkOrderExtService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkOrderExtService.java @@ -63,4 +63,7 @@ public interface IMesWorkOrderExtService { @ApiOperation(value = "根据工单更新工单状态") void updateMesWorkOrderOrderStatusShippingByWorkOrderNo(String organizeCode, List workOrderNoList,String userName); + @ApiOperation(value = "控制工单数量查询") + Map getControlOrderQtyMap(String organizeCode, String workCenterCode, String startTime, String endTime, List partNoList); + } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java index 15d0e4e..5f996bd 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java @@ -267,4 +267,22 @@ public class MesWorkOrderExtService implements IMesWorkOrderExtService { return produceSn; } + @Override + public Map getControlOrderQtyMap(String organizeCode, String workCenterCode, String startTime, String endTime, List partNoList) { + if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(workCenterCode) || + StringUtils.isEmpty(startTime) || StringUtils.isEmpty(endTime) || CollectionUtils.isEmpty(partNoList)) return null; + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.timeBuilder(startTime, endTime, MesPcnExtConstWords.PLAN_START_TIME, packBean, false); + DdlPreparedPack.getStringEqualPack(workCenterCode, MesPcnExtConstWords.WORK_CENTER_CODE, packBean); + if (partNoList.size() == 1) DdlPreparedPack.getStringEqualPack(partNoList.get(0), MesPcnExtConstWords.PART_NO, packBean); + else DdlPreparedPack.getInPackList(partNoList, MesPcnExtConstWords.PART_NO, packBean); + List workOrderList = workOrderRepository.findByHqlWhere(packBean); + workOrderList = CollectionUtils.isEmpty(workOrderList) ? null : + workOrderList.stream().filter(o -> (null != o + && o.getWorkOrderStatus().compareTo(MesExtEnumUtil.ORDER_STATUS.CREATE.getValue()) != 0 + && !o.getOrderFlag().equals(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue()))).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(workOrderList)) return null; + + } + } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java index 683def7..9a4e5c7 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionRecordService; +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderExtService; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProdRuleContext; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext; import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsInContext; @@ -13,6 +14,7 @@ import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.IStepService; import cn.estsh.i3plus.mes.pcn.util.StringUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesProductionRecord; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; import cn.estsh.i3plus.pojo.mes.model.StationResultBean; import cn.estsh.i3plus.pojo.mes.model.StepResult; @@ -48,6 +50,9 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep @Autowired private IMesProductionRecordService productionRecordService; + @Autowired + private IMesWorkOrderExtService workOrderExtService; + @Override public StepResult execute(StationRequestBean reqBean) { @@ -82,6 +87,7 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep if (CollectionUtils.isEmpty(reportPsMap)) break Loop; + List workOrderList = workOrderExtService.getWorkOrderList() diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java index 9db31ee..29d55e0 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java @@ -381,6 +381,8 @@ public class MesPcnExtConstWords { public static final String PAGE_SIZE = "pageSize"; //枚举代码 public static final String ENUM_CODE = "enumCode"; + //计划开始时间 + public static final String PLAN_START_TIME = "planStartTime"; //BaseBean字段不包含工厂, 用于对象复制剔除属性BeanUtils.copyProperties(Object source, Object target, String... ignoreProperties) From bb93d155e3eb8d155489d5a3e3719402689a4b46 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 11 Apr 2025 20:26:01 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E9=87=8F=20=E6=96=B0=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/api/base/IMesShiftService.java | 3 + .../IMesProductionDispatchContextStepService.java | 12 -- .../mes/pcn/api/busi/IMesWorkOrderExtService.java | 5 +- .../serviceimpl/base/MesShiftServiceImpl.java | 104 +++++++++++++---- .../serviceimpl/busi/MesWorkOrderExtService.java | 43 +++++-- ...ctionDataSaveBeforeControlOrderStepService.java | 123 ++++++++++++++++++--- .../MesProductionDispatchContextStepService.java | 27 ----- .../ext/mes/pcn/pojo/util/MesPcnExtConstWords.java | 2 + 8 files changed, 235 insertions(+), 84 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesShiftService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesShiftService.java index f8293a2..d4bd438 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesShiftService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesShiftService.java @@ -27,4 +27,7 @@ public interface IMesShiftService { @ApiOperation(value = "获取当前班次时间日期") Map getShiftTimeMap(MesProdShiftRecord record); + @ApiOperation(value = "根据当前时间计算实际整天班次的时间") + Map calcAllDayShiftTimeMapByCurTime(String organizeCode, String workCenterCode); + } diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionDispatchContextStepService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionDispatchContextStepService.java index b959656..f13ecce 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionDispatchContextStepService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionDispatchContextStepService.java @@ -55,18 +55,6 @@ public interface IMesProductionDispatchContextStepService { @ApiOperation(value = "删除上下文发送允许加工指令执行结果") void removeSendProcessCmdContext(StationRequestBean reqBean); - @ApiOperation(value = "获取上下文产出零件号") - List getProductionPartNoContext(StationRequestBean reqBean); - - @ApiOperation(value = "验证上下文产出零件号是否存在") - Boolean checkProductionPartNoIsExistContext(StationRequestBean reqBean); - - @ApiOperation(value = "保存上下文产出零件号", notes = "[JSON]List") - Boolean dispatchProductionPartNoContext(StationRequestBean reqBean, List productionPartNoList); - - @ApiOperation(value = "删除上下文产出零件号") - void removeProductionPartNoContext(StationRequestBean reqBean); - @ApiOperation(value = "获取上下文头道模具号") MesEquipVariableCollectContext getFirstMouldNoContext(StationRequestBean reqBean); diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkOrderExtService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkOrderExtService.java index a1bbd3a..98a7bfa 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkOrderExtService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkOrderExtService.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; import io.swagger.annotations.ApiOperation; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -64,6 +65,8 @@ public interface IMesWorkOrderExtService { void updateMesWorkOrderOrderStatusShippingByWorkOrderNo(String organizeCode, List workOrderNoList,String userName); @ApiOperation(value = "控制工单数量查询") - Map getControlOrderQtyMap(String organizeCode, String workCenterCode, String startTime, String endTime, List partNoList); + Map getControlOrderQtyMap(String organizeCode, String workCenterCode, List partNoList, String startTime, String endTime); + @ApiOperation(value = "完成工单数量查询") + Map getCompleteOrderQtyMap(String organizeCode, String workCenterCode, List partNoList, String lotNo); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesShiftServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesShiftServiceImpl.java index adae0cf..835ecf3 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesShiftServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesShiftServiceImpl.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesShiftService; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; -import cn.estsh.i3plus.mes.pcn.util.DateUtil; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; @@ -13,17 +13,17 @@ import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesProdShiftRecord; import cn.estsh.i3plus.pojo.mes.bean.MesShift; import cn.estsh.i3plus.pojo.mes.repository.MesShiftRepository; -import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; /** @@ -55,31 +55,49 @@ public class MesShiftServiceImpl implements IMesShiftService { @Override public List queryMesShift(String organizeCode, String workCenterCode) { + if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(workCenterCode)) return null; DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(workCenterCode, "workCenterCode", packBean); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{MesPcnExtConstWords.SHIFT_CODE}, packBean); return mesShiftRepository.findByHqlWhere(packBean); } @Override public Map getShiftTimeMap(MesProdShiftRecord record) { + if (StringUtils.isEmpty(record.getStartTime())) return null; List shiftList = queryMesShift(record.getOrganizeCode(), record.getWorkCenterCode()); - if (CollectionUtils.isEmpty(shiftList)) { - return null; - } + if (CollectionUtils.isEmpty(shiftList)) return null; Optional shiftOptional = shiftList.stream().filter(t -> t.getShiftCode().equals(record.getShiftCode())).findFirst(); - if (!shiftOptional.isPresent()) { - return null; - } - if (StringUtils.isEmpty(shiftOptional.get().getStartTime()) || StringUtils.isEmpty(shiftOptional.get().getEndTime()) || StringUtils.isEmpty(record.getStartTime())) { - return null; + if (null == shiftOptional || !shiftOptional.isPresent()) return null; + if (StringUtils.isEmpty(shiftOptional.get().getStartTime()) || StringUtils.isEmpty(shiftOptional.get().getEndTime())) return null; + if (StringUtils.isEmpty(shiftList.get(0).getStartTime())) return null; + + //当天 + String today = TimeTool.getToday(); + //当天早班的开始时间 + String todayStartTime = today + MesPcnExtConstWords.ONE_SPACE + shiftList.get(0).getStartTime(); + //实际开班时间 比 当天早班的开始时间 小的情况下, 代表的是前一天的班次 + if (record.getStartTime().compareTo(todayStartTime) < 0) { + String yesterday = calcDay(today, -1); + return calcShiftTime(shiftOptional.get().getStartTime(), shiftOptional.get().getEndTime(), yesterday); + } else { + //当天的班次 + return calcShiftTime(shiftOptional.get().getStartTime(), shiftOptional.get().getEndTime(), today); } - String startData = TimeTool.parseStringFormat(record.getStartTime(), DateUtil.BASE_FORMAT, DateUtil.SHORT_FORMAT); - //白班 - String startTime = startData + " " + shiftOptional.get().getStartTime(); - String endTime = startData + " " + shiftOptional.get().getEndTime(); - //晚班 - if (MesExtEnumUtil.SHIFT_CODE.SHIFT_CODE_20.getValue().equals(record.getShiftCode())) { - endTime = TimeTool.getToday(DateUtil.addDays(record.getStartTime(), 1)) + " " + shiftOptional.get().getEndTime(); + } + + //计算的实际班次开始与结束的时间 + private Map calcShiftTime(String shiftStartTime, String shiftEndTime, String calcDay) { + //待计算的实际班次开始与结束的时间 + String startTime, endTime; + if (shiftStartTime.compareTo(shiftEndTime) < 0) { + //不跨天 + startTime = calcDay + MesPcnExtConstWords.ONE_SPACE + shiftStartTime; + endTime = calcDay + MesPcnExtConstWords.ONE_SPACE + shiftEndTime; + } else { + //跨天 + startTime = calcDay + MesPcnExtConstWords.ONE_SPACE + shiftStartTime; + endTime = calcDay(calcDay, 1) + MesPcnExtConstWords.ONE_SPACE + shiftEndTime; } Map shiftTimeMap = new HashMap<>(2); shiftTimeMap.put(MesPcnExtConstWords.START_TIME, startTime); @@ -87,4 +105,46 @@ public class MesShiftServiceImpl implements IMesShiftService { return shiftTimeMap; } + //计算天数 + private String calcDay(String day, int amount) { + try { + DateFormat sdf = new SimpleDateFormat(MesPcnExtConstWords.DATE_FORMAT_SEPARATOR); + return TimeTool.timeCalc(sdf.parse(day), Calendar.DATE, amount, MesPcnExtConstWords.DATE_FORMAT_SEPARATOR); + } catch (ParseException e) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("时间计算失败") + .build(); + } + } + + //根据当前时间计算实际整天班次的时间 + @Override + public Map calcAllDayShiftTimeMapByCurTime(String organizeCode, String workCenterCode) { + //根据生产线查询关联的班次集合, 根据班次代码正序 + List shiftList = queryMesShift(organizeCode, workCenterCode); + if (CollectionUtils.isEmpty(shiftList)) return null; + if (StringUtils.isEmpty(shiftList.get(0).getStartTime()) || StringUtils.isEmpty(shiftList.get(shiftList.size() - 1).getEndTime())) return null; + + //当天 + String today = TimeTool.getToday(); + //当天早班的开始时间 + String todayStartTime = today + MesPcnExtConstWords.ONE_SPACE + shiftList.get(0).getStartTime(); + + //当前时间 比 当天早班的开始时间 小的情况下, 代表的是前一天的班次 + Map shiftTimeMap; + if (TimeTool.getNowTime(true).compareTo(todayStartTime) < 0) { + String yesterday = calcDay(today, -1); + shiftTimeMap = calcShiftTime(shiftList.get(0).getStartTime(), shiftList.get(shiftList.size() - 1).getEndTime(), yesterday); + shiftTimeMap.put(MesPcnExtConstWords.LOT_NO, yesterday); + } else { + //当天的班次 + shiftTimeMap = calcShiftTime(shiftList.get(0).getStartTime(), shiftList.get(shiftList.size() - 1).getEndTime(), today); + shiftTimeMap.put(MesPcnExtConstWords.LOT_NO, today); + } + + return shiftTimeMap; + } + } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java index 5f996bd..f05b04f 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java @@ -5,15 +5,14 @@ import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProduceSnExtService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderExtService; import cn.estsh.i3plus.ext.mes.pcn.apiservice.aspect.MonitorLog; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; +import cn.estsh.i3plus.platform.common.tool.MathOperation; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.BaseBean; 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.mes.bean.MesProduceSn; -import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import cn.estsh.i3plus.pojo.mes.bean.*; +import cn.estsh.i3plus.pojo.mes.repository.MesWorkOrderControlQtyRecordRepository; import cn.estsh.i3plus.pojo.mes.repository.MesWorkOrderRepository; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.hutool.core.date.DateUtil; @@ -40,6 +39,9 @@ public class MesWorkOrderExtService implements IMesWorkOrderExtService { @Autowired private IMesCustomerSnTransformService customerSnTransformService; + @Autowired + private MesWorkOrderControlQtyRecordRepository workOrderControlQtyRecordRepository; + //根据生产工单号集合 查询生产工单数据 @Override public List getWorkOrderList(String organizeCode, List workOrderNoList) { @@ -268,7 +270,7 @@ public class MesWorkOrderExtService implements IMesWorkOrderExtService { } @Override - public Map getControlOrderQtyMap(String organizeCode, String workCenterCode, String startTime, String endTime, List partNoList) { + public Map getControlOrderQtyMap(String organizeCode, String workCenterCode, List partNoList, String startTime, String endTime) { if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(workCenterCode) || StringUtils.isEmpty(startTime) || StringUtils.isEmpty(endTime) || CollectionUtils.isEmpty(partNoList)) return null; DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); @@ -278,11 +280,36 @@ public class MesWorkOrderExtService implements IMesWorkOrderExtService { else DdlPreparedPack.getInPackList(partNoList, MesPcnExtConstWords.PART_NO, packBean); List workOrderList = workOrderRepository.findByHqlWhere(packBean); workOrderList = CollectionUtils.isEmpty(workOrderList) ? null : - workOrderList.stream().filter(o -> (null != o - && o.getWorkOrderStatus().compareTo(MesExtEnumUtil.ORDER_STATUS.CREATE.getValue()) != 0 - && !o.getOrderFlag().equals(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue()))).collect(Collectors.toList()); + workOrderList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getPartNo()) && !StringUtils.isEmpty(o.getWorkOrderStatus()) && !StringUtils.isEmpty(o.getOrderFlag()) + && o.getWorkOrderStatus().compareTo(MesExtEnumUtil.ORDER_STATUS.CREATE.getValue()) != 0 && !o.getOrderFlag().equals(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue()))).collect(Collectors.toList()); if (CollectionUtils.isEmpty(workOrderList)) return null; + Map> workOrderMap = workOrderList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesWorkOrder::getPartNo)); + + Map controlOrderQtyMap = new HashMap<>(); + Double qty; + for (Map.Entry> entry : workOrderMap.entrySet()) { + if (null == entry) continue; + qty = new Double(MesPcnExtConstWords.ZERO); + for (MesWorkOrder workOrder : entry.getValue()) { + if (null == workOrder) continue; + qty = MathOperation.add(qty, workOrder.getWorkOrderStatus().compareTo(MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()) >= 0 ? workOrder.getCompleteQty() : workOrder.getQty()); + } + controlOrderQtyMap.put(entry.getKey(), qty); + } + return controlOrderQtyMap; + } + @Override + public Map getCompleteOrderQtyMap(String organizeCode, String workCenterCode, List partNoList, String lotNo) { + if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(workCenterCode) || StringUtils.isEmpty(lotNo) || CollectionUtils.isEmpty(partNoList)) return null; + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(lotNo, MesPcnExtConstWords.LOT_NO, packBean); + DdlPreparedPack.getStringEqualPack(workCenterCode, MesPcnExtConstWords.WORK_CENTER_CODE, packBean); + if (partNoList.size() == 1) DdlPreparedPack.getStringEqualPack(partNoList.get(0), MesPcnExtConstWords.PART_NO, packBean); + else DdlPreparedPack.getInPackList(partNoList, MesPcnExtConstWords.PART_NO, packBean); + List workOrderControlQtyRecordList = workOrderControlQtyRecordRepository.findByHqlWhere(packBean); + return CollectionUtils.isEmpty(workOrderControlQtyRecordList) ? null : + workOrderControlQtyRecordList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesWorkOrderControlQtyRecord::getPartNo, Collectors.summingDouble(MesWorkOrderControlQtyRecord::getQty))); } } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java index 9a4e5c7..afea123 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java @@ -1,23 +1,24 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step; +import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesShiftService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionRecordService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderExtService; -import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProdRuleContext; -import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext; -import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsInContext; -import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext; +import cn.estsh.i3plus.ext.mes.pcn.pojo.context.*; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService; import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.IStepService; import cn.estsh.i3plus.mes.pcn.util.StringUtil; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.platform.common.tool.MathOperation; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesProductionRecord; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderControlQtyRecord; import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; import cn.estsh.i3plus.pojo.mes.model.StationResultBean; import cn.estsh.i3plus.pojo.mes.model.StepResult; +import cn.estsh.i3plus.pojo.mes.repository.MesWorkOrderControlQtyRecordRepository; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.impp.framework.boot.util.SpringContextsUtil; import com.alibaba.fastjson.JSONObject; @@ -27,10 +28,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.StringJoiner; +import java.util.*; import java.util.stream.Collectors; /** @@ -51,11 +49,19 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep private IMesProductionRecordService productionRecordService; @Autowired + private IMesShiftService shiftService; + + @Autowired private IMesWorkOrderExtService workOrderExtService; + @Autowired + private MesWorkOrderControlQtyRecordRepository workOrderControlQtyRecordRepository; + @Override public StepResult execute(StationRequestBean reqBean) { + StepResult stepResult = StepResult.getSuccessComplete(); + StationResultBean resultBean = new StationResultBean(); //获取上下文信息: 处理加工不可用规则 @@ -76,6 +82,11 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep //获取进料主条码数据信息 List productionPsInContextList = productionDispatchContextStepService.getProductionPsInContext(reqBean); Map psiMap = CollectionUtils.isEmpty(productionPsInContextList) ? null : productionPsInContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getForeignKey()))).collect(Collectors.toMap(MesProductionPsInContext::getForeignKey, o -> o)); + //获取上下文产出零件信息 + List productionPartContextList = productionDispatchContextStepService.getProductionPartContext(reqBean); + + //当前不能生产的零件号 + List unProductionPartNoList = null; Loop: synchronized (new StringJoiner(MesPcnExtConstWords.COLON).add(reqBean.getOrganizeCode()).add(reqBean.getWorkCenterCode()).add(MesPcnExtConstWords.WORK_ORDER_COMPLETE_CONTEXT).toString().intern()) { @@ -87,15 +98,34 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep if (CollectionUtils.isEmpty(reportPsMap)) break Loop; - List workOrderList = workOrderExtService.getWorkOrderList() + //需要汇报的零件号 + List partNoList = new ArrayList<>(reportPsMap.keySet()); + //根据当前时间计算实际整天班次的时间 + Map shiftTimeMap = shiftService.calcAllDayShiftTimeMapByCurTime(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode()); + //控制工单数量查询 + Map controlOrderQtyMap = workOrderExtService.getControlOrderQtyMap(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), + partNoList, shiftTimeMap.get(MesPcnExtConstWords.START_TIME), shiftTimeMap.get(MesPcnExtConstWords.END_TIME)); + //存在工单的零件号 + List existOrderPartNoList = CollectionUtils.isEmpty(controlOrderQtyMap) ? null : new ArrayList<>(controlOrderQtyMap.keySet()); + //查询存在工单的零件号对应的完成工单数量 + Map completeOrderQtyMap = workOrderExtService.getCompleteOrderQtyMap( + reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), existOrderPartNoList, shiftTimeMap.get(MesPcnExtConstWords.LOT_NO)); - //匹配失败需要清除本次扫描/读取信息 - if (!stepResult.isCompleted() && workOrderCheckCompleteQtyStepService.doBusiCheckToDelete(reqBean, stepResult, productionPartContextList, productionPsInContextList)) - return stepResult.nextTriggerEvent(MesPcnExtConstWords.NEXT_TRIGGER_EVENT_PART_NO); + Double planQty, completeQty; + for (Map.Entry> entry : reportPsMap.entrySet()) { + if (null == entry) continue; + planQty = (!CollectionUtils.isEmpty(controlOrderQtyMap) && controlOrderQtyMap.containsKey(entry.getKey())) ? controlOrderQtyMap.get(entry.getKey()) : new Double(MesPcnExtConstWords.ZERO); + completeQty = (!CollectionUtils.isEmpty(completeOrderQtyMap) && completeOrderQtyMap.containsKey(entry.getKey())) ? completeOrderQtyMap.get(entry.getKey()) : new Double(MesPcnExtConstWords.ZERO); + if (MathOperation.compareTo(MathOperation.add(completeQty, new Double(entry.getValue().size())), planQty) <= 0) continue; + if (CollectionUtils.isEmpty(unProductionPartNoList)) unProductionPartNoList = new ArrayList<>(); + unProductionPartNoList.add(entry.getKey()); + } + + if (!CollectionUtils.isEmpty(unProductionPartNoList)) break Loop; //非排序线 保存加工结果工步 execute 方法 使用的是 新事务 stepResult = ((IStepService) SpringContextsUtil.getBean("mesProductionDataSaveStepService")).execute(reqBean); @@ -107,10 +137,38 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep stepService.executeStepAfterExecute(reqBean, stepResult); } + if (stepResult.isCompleted()) insertWorkOrderControlQtyRecord(reqBean, reportPsMap, shiftTimeMap.get(MesPcnExtConstWords.LOT_NO)); + + return stepResult; + } //非排序线 保存加工结果工步 execute 方法 使用的是 新事务 - return ((IStepService) SpringContextsUtil.getBean("mesProductionDataSaveStepService")).execute(reqBean); + if (CollectionUtils.isEmpty(unProductionPartNoList)) + return ((IStepService) SpringContextsUtil.getBean("mesProductionDataSaveStepService")).execute(reqBean); + + stepNonCompleteAndSendMsg(reqBean, resultBean.writeDbLog(), stepResult, String.format("控制加工单数量验证零件号%s当前无法继续生产!", unProductionPartNoList.toString())); + + stepResult.nextTriggerEvent(MesPcnExtConstWords.NEXT_TRIGGER_EVENT_ASSEMBLY); + if (!CollectionUtils.isEmpty(productionPsInContextList)) { + productionDispatchContextStepService.removeProductionPsInContext(reqBean); + stepResult.nextTriggerEvent(MesPcnExtConstWords.NEXT_TRIGGER_EVENT_PRODUCT_SN); + } + if (!CollectionUtils.isEmpty(productionPartContextList)) { + productionDispatchContextStepService.removeProductionPartContext(reqBean); + productionProcessContextStepService.removeFunctionChooseCavityOrderContext(reqBean); + productionProcessContextStepService.removeFunctionChooseCavityPartContext(reqBean); + stepResult.nextTriggerEvent(MesPcnExtConstWords.NEXT_TRIGGER_EVENT_PART_NO); + } + + productionDispatchContextStepService.removeProdRuleDataContext(reqBean); + if (productionDispatchContextStepService.checkFirstMouldNoIsExistContext(reqBean)) { + //存在头道模具号场景下 必须抛出异常 因为头道模具号的接口逻辑会配置非常变值,也就是每次返回回去都会拿到头道模具号 就会出现死循环线程 + productionDispatchContextStepService.removeFirstMouldNoContext(reqBean); + foundExThrowNoShowMsg(); + } + + return stepResult; } @@ -141,4 +199,41 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep return (null != optional && optional.isPresent()) ? true : false; } + private void insertWorkOrderControlQtyRecord(StationRequestBean reqBean, Map> reportPsMap, String lotNo) { + if (CollectionUtils.isEmpty(reportPsMap)) return; + + //获取上下文产品加工规则数据信息集合 + List prodRuleContextList = productionDispatchContextStepService.getProdRuleDataContext(reqBean); + //加工规则根据数据关联键分组 + Map prodRuleContextMap = CollectionUtils.isEmpty(prodRuleContextList) ? null : + prodRuleContextList.stream().filter(o -> null != o).collect(Collectors.toMap(MesProdRuleContext::getForeignKey, o -> o)); + + //获取上下文工位扫描监控信息 + MesScanMonitorContext scanMonitorContext = productionProcessContextStepService.getScanMonitorContext(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), reqBean.getWorkCellCode()); + + for (Map.Entry> entry : reportPsMap.entrySet()) { + if (null == entry) continue; + for (MesProductionPsOutContext productionPsOutContext : entry.getValue()) { + if (null == productionPsOutContext) continue; + MesWorkOrderControlQtyRecord workOrderControlQtyRecord = new MesWorkOrderControlQtyRecord(); + workOrderControlQtyRecord.setOrganizeCode(reqBean.getOrganizeCode()); + workOrderControlQtyRecord.setWorkCenterCode(reqBean.getWorkCenterCode()); + workOrderControlQtyRecord.setWorkCellCode(reqBean.getWorkCellCode()); + workOrderControlQtyRecord.setProductSn(productionPsOutContext.getProductSn()); + workOrderControlQtyRecord.setQty(productionPsOutContext.getQty()); + workOrderControlQtyRecord.setPartNo(productionPsOutContext.getPartNo()); + workOrderControlQtyRecord.setLotNo(lotNo); + workOrderControlQtyRecord.setShiftCode(productionPsOutContext.getShiftCode()); + workOrderControlQtyRecord.setShiftGroup(productionPsOutContext.getShiftGroup()); + workOrderControlQtyRecord.setPid(productionPsOutContext.getId()); + if (null != scanMonitorContext) workOrderControlQtyRecord.setMouldRecordId(scanMonitorContext.getMouldRecordId()); + if (!CollectionUtils.isEmpty(prodRuleContextMap) && prodRuleContextMap.containsKey(productionPsOutContext.getForeignKey())) { + workOrderControlQtyRecord.setProductionRecordId(prodRuleContextMap.get(productionPsOutContext.getForeignKey()).getProductionRecordId()); + } + ConvertBean.serviceModelInitialize(workOrderControlQtyRecord, reqBean.getUserInfo()); + workOrderControlQtyRecordRepository.insert(workOrderControlQtyRecord); + } + } + } + } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionDispatchContextStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionDispatchContextStepService.java index 4541dee..1c18b48 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionDispatchContextStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionDispatchContextStepService.java @@ -125,33 +125,6 @@ public class MesProductionDispatchContextStepService extends BaseStepService imp removeFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.SEND_PROCESS_CMD_CONTEXT); } - //获取上下文产出零件号 - @Override - public List getProductionPartNoContext(StationRequestBean reqBean) { - String productionPartNoJson = getFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.FIRST_MOULD_NO_CONTEXT); - return !StringUtils.isEmpty(productionPartNoJson) ? JSONObject.parseArray(productionPartNoJson, MesEquipVariableCollectContext.class) : null; - } - - //验证上下文产出零件号是否存在 - @Override - public Boolean checkProductionPartNoIsExistContext(StationRequestBean reqBean) { - String firstMouldNo = getFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.FIRST_MOULD_NO_CONTEXT); - return !StringUtils.isEmpty(firstMouldNo) ? true : false; - } - - //保存上下文产出零件号 [JSON]List - @Override - public Boolean dispatchProductionPartNoContext(StationRequestBean reqBean, List productionPartNoList) { - if (CollectionUtils.isEmpty(productionPartNoList)) return false; - return dispatchFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.FIRST_MOULD_NO_CONTEXT, JSONObject.toJSONString(productionPartNoList)); - } - - //删除上下文产出零件号 - @Override - public void removeProductionPartNoContext(StationRequestBean reqBean) { - removeFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.FIRST_MOULD_NO_CONTEXT); - } - //获取上下文头道模具号 @Override public MesEquipVariableCollectContext getFirstMouldNoContext(StationRequestBean reqBean) { diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java index 29d55e0..fc0d89a 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java @@ -568,6 +568,8 @@ public class MesPcnExtConstWords { public static final Integer FIVE_HUNDRED = 500; // 中括号 public static final String SQUARE_BRACKETS = "[]"; + //空格 + public static final String ONE_SPACE = " "; // & public static final String AND = "&"; // 空 From ea0d8b01881ba5b5244a368c0ea781b2230fe4ba Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 12 Apr 2025 15:06:06 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=2046281=20PCN-=E6=8C=89=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E7=BB=9F=E8=AE=A1=E4=BA=A7=E9=87=8F=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/api/base/IMesProdShiftRecordService.java | 3 + .../ext/mes/pcn/api/base/IMesShiftService.java | 6 + .../base/MesProdShiftRecordServiceImpl.java | 11 +- .../serviceimpl/base/MesShiftServiceImpl.java | 31 +++- .../MesFunctionProductionPartSheetService.java | 190 +++++++++++++++++++++ .../pojo/model/MesProductionPartSheetModel.java | 34 ++++ 6 files changed, 271 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionProductionPartSheetService.java create mode 100644 modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesProductionPartSheetModel.java diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesProdShiftRecordService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesProdShiftRecordService.java index efcb687..b1514fc 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesProdShiftRecordService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesProdShiftRecordService.java @@ -35,6 +35,9 @@ public interface IMesProdShiftRecordService { @ApiOperation(value = "查询最新的开班记录") MesProdShiftRecord getProdShiftRecordOpenStatus(String organizeCode, String workCenterCode); + @ApiOperation(value = "查询最新的开班记录") + MesProdShiftRecord getProdShiftRecordCdtDesc(String organizeCode, String workCenterCode); + @ApiOperation(value = "封装展示组件班组班次内容") List getProdShiftData(MesProdShiftRecord record); diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesShiftService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesShiftService.java index d4bd438..fff1ff3 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesShiftService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesShiftService.java @@ -30,4 +30,10 @@ public interface IMesShiftService { @ApiOperation(value = "根据当前时间计算实际整天班次的时间") Map calcAllDayShiftTimeMapByCurTime(String organizeCode, String workCenterCode); + @ApiOperation(value = "根据当前时间计算当前班次的时间") + Map calcCurShiftTimeMapByCurTime(String organizeCode, String workCenterCode); + + @ApiOperation(value = "计算天数") + String calcDay(String day, int amount); + } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java index 523c2c0..7200fee 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java @@ -225,12 +225,17 @@ public class MesProdShiftRecordServiceImpl implements IMesProdShiftRecordService @Override public MesProdShiftRecord getProdShiftRecordOpenStatus(String organizeCode, String workCenterCode) { + MesProdShiftRecord prodShiftRecord = getProdShiftRecordCdtDesc(organizeCode, workCenterCode); + if (prodShiftRecord != null && !StringUtils.isEmpty(prodShiftRecord.getWorkStatus()) && prodShiftRecord.getWorkStatus().compareTo(MesExtEnumUtil.WORK_STATUS.START.getValue()) == 0) return prodShiftRecord; + return null; + } + + @Override + public MesProdShiftRecord getProdShiftRecordCdtDesc(String organizeCode, String workCenterCode) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(workCenterCode, "workCenterCode", packBean); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{MesPcnExtConstWords.CREATE_DATE_TIME}, packBean); - MesProdShiftRecord prodShiftRecord = mesProdShiftRecordRDao.getByProperty(packBean); - if (prodShiftRecord != null && !StringUtils.isEmpty(prodShiftRecord.getWorkStatus()) && prodShiftRecord.getWorkStatus().compareTo(MesExtEnumUtil.WORK_STATUS.START.getValue()) == 0) return prodShiftRecord; - return null; + return mesProdShiftRecordRDao.getByProperty(packBean); } //封装展示组件班组班次内容 diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesShiftServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesShiftServiceImpl.java index 835ecf3..1f31947 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesShiftServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesShiftServiceImpl.java @@ -106,7 +106,8 @@ public class MesShiftServiceImpl implements IMesShiftService { } //计算天数 - private String calcDay(String day, int amount) { + @Override + public String calcDay(String day, int amount) { try { DateFormat sdf = new SimpleDateFormat(MesPcnExtConstWords.DATE_FORMAT_SEPARATOR); return TimeTool.timeCalc(sdf.parse(day), Calendar.DATE, amount, MesPcnExtConstWords.DATE_FORMAT_SEPARATOR); @@ -147,4 +148,32 @@ public class MesShiftServiceImpl implements IMesShiftService { return shiftTimeMap; } + //根据当前时间计算当前班次的时间 + @Override + public Map calcCurShiftTimeMapByCurTime(String organizeCode, String workCenterCode) { + //根据生产线查询关联的班次集合, 根据班次代码正序 + List shiftList = queryMesShift(organizeCode, workCenterCode); + if (CollectionUtils.isEmpty(shiftList)) return null; + + String nowTime = TimeTool.getNowTime(true); + String today = nowTime.substring(0, 10); + String time = nowTime.substring(11); + + Optional shiftOptional = shiftList.stream().filter(o -> (null != o + && !StringUtils.isEmpty(o.getStartTime()) && !StringUtils.isEmpty(o.getEndTime()) && o.getStartTime().compareTo(time) <= 0 && o.getEndTime().compareTo(time) >= 0)).findFirst(); + if (null == shiftOptional || !shiftOptional.isPresent()) return null; + + //当天早班的开始时间 + String todayStartTime = today + MesPcnExtConstWords.ONE_SPACE + shiftList.get(0).getStartTime(); + //实际开班时间 比 当天早班的开始时间 小的情况下, 代表的是前一天的班次 + if (nowTime.compareTo(todayStartTime) < 0) { + String yesterday = calcDay(today, -1); + return calcShiftTime(shiftOptional.get().getStartTime(), shiftOptional.get().getEndTime(), yesterday); + } else { + //当天的班次 + return calcShiftTime(shiftOptional.get().getStartTime(), shiftOptional.get().getEndTime(), today); + } + + } + } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionProductionPartSheetService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionProductionPartSheetService.java new file mode 100644 index 0000000..daeea12 --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionProductionPartSheetService.java @@ -0,0 +1,190 @@ +package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.station.function; + +import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesProdShiftRecordService; +import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesShiftService; +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionCustomContextStepService; +import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProductionPartSheetModel; +import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; +import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseSwsService; +import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.function.IFsmModuleFunctionService; +import cn.estsh.i3plus.platform.common.tool.TimeTool; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesProductionRecord; +import cn.estsh.i3plus.pojo.mes.model.ButtonDynamicModel; +import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; +import cn.estsh.i3plus.pojo.mes.model.StationResultBean; +import cn.estsh.i3plus.pojo.mes.repository.MesProductionRecordRepository; +import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; +import com.alibaba.fastjson.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; + +import java.text.ParseException; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @Description : 工位参数按钮事件接口实现【加工零件统计Sheet页】 + **/ +@Service +public class MesFunctionProductionPartSheetService extends BaseSwsService implements IFsmModuleFunctionService { + + @Autowired + private IMesProductionCustomContextStepService productionCustomContextStepService; + + @Autowired + private IMesShiftService shiftService; + + @Autowired + private IMesProdShiftRecordService prodShiftRecordService; + + @Autowired + private MesProductionRecordRepository productionRecordRepository; + + @Override + public Object doCustomApiDispatch(StationRequestBean reqBean, StationResultBean resultBean, ButtonDynamicModel buttonDynamicModel) { + + //页面渲染数据集 + Map resultMap = new HashMap<>(); + + //验证参数 + Map paramMap = null; + try { + paramMap = StringUtils.isEmpty(buttonDynamicModel.getFunctionValue()) ? null : JSONObject.parseObject(buttonDynamicModel.getFunctionValue(), Map.class); + } catch (Exception e) { + } + + String startTime = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.START_TIME)) ? paramMap.get(MesPcnExtConstWords.START_TIME) : null; + String endTime = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.END_TIME)) ? paramMap.get(MesPcnExtConstWords.END_TIME) : null; + if (StringUtils.isEmpty(startTime) || StringUtils.isEmpty(endTime)) { + //根据当前时间计算当前班次的时间 + Map shiftTimeMap = shiftService.calcCurShiftTimeMapByCurTime(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode()); + if (!CollectionUtils.isEmpty(shiftTimeMap)) { + startTime = shiftTimeMap.get(MesPcnExtConstWords.START_TIME); + endTime = shiftTimeMap.get(MesPcnExtConstWords.END_TIME); + } else { + String today = TimeTool.getToday(); + startTime = today + MesPcnExtConstWords.DATE_FORMAT_APPEND_0; + endTime = shiftService.calcDay(today, 1) + MesPcnExtConstWords.DATE_FORMAT_APPEND_0; + } + //返回客户端作为默认条件 + resultMap.put(MesPcnExtConstWords.START_TIME, startTime); + resultMap.put(MesPcnExtConstWords.END_TIME, endTime); + } + + Boolean checkTime; + try { + checkTime = TimeTool.getSecoundsBetweenTime(1, startTime, endTime) <= 86400; + } catch (ParseException e) { + checkTime = false; + } + + if (!checkTime) return packResultMap(resultMap, "时间查询条件限制一天!"); + + //返回客户端作为查询条件 + Map reportStatusMap = new HashMap<>(); + reportStatusMap.put(REPORT_STATUS.REPORT.getValue(), REPORT_STATUS.REPORT.getDescription()); + reportStatusMap.put(REPORT_STATUS.UN_REPORT.getValue(), REPORT_STATUS.UN_REPORT.getDescription()); + resultMap.put(MesPcnExtConstWords.REPORT_STATUS, reportStatusMap); + + String partNo = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.PART_NO)) ? paramMap.get(MesPcnExtConstWords.PART_NO) : null; + + //查询加工记录数据 + DdlPackBean packBean = DdlPackBean.getDdlPackBean(reqBean.getOrganizeCode()); + DdlPreparedPack.timeBuilder(startTime, endTime, MesPcnExtConstWords.COMPLETE_DATE_TIME, packBean, false); + DdlPreparedPack.getStringEqualPack(reqBean.getWorkCenterCode(), MesPcnExtConstWords.WORK_CENTER_CODE, packBean); + DdlPreparedPack.getStringEqualPack(reqBean.getWorkCellCode(), MesPcnExtConstWords.WORK_CELL_CODE, packBean); + DdlPreparedPack.getStringEqualPack(partNo, MesPcnExtConstWords.PART_NO, packBean); + List productionRecordList = productionRecordRepository.findByHqlWhere(packBean); + if (CollectionUtils.isEmpty(productionRecordList)) return resultMap; + + Integer reportStatus = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.REPORT_STATUS)) ? Integer.valueOf(paramMap.get(MesPcnExtConstWords.REPORT_STATUS)) : null; + + //搜集需要汇报的加工记录 + List productionRecordList2Report = (StringUtils.isEmpty(reportStatus) || reportStatus.compareTo(REPORT_STATUS.REPORT.getValue()) == 0) + ? productionRecordList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getPartNo()) && o.getReportStatus().compareTo(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue()) != 0)).collect(Collectors.toList()) : null; + + //搜集无需汇报的加工记录 + List productionRecordList2NoReport = (StringUtils.isEmpty(reportStatus) || reportStatus.compareTo(REPORT_STATUS.UN_REPORT.getValue()) == 0) + ? productionRecordList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getPartNo()) && o.getReportStatus().compareTo(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_30.getValue()) == 0)).collect(Collectors.toList()) : null; + + List resultList = new ArrayList<>(); + if (!CollectionUtils.isEmpty(productionRecordList2Report)) backResultList(resultList, productionRecordList2Report, REPORT_STATUS.REPORT); + if (!CollectionUtils.isEmpty(productionRecordList2NoReport)) backResultList(resultList, productionRecordList2NoReport, REPORT_STATUS.UN_REPORT); + + if (!CollectionUtils.isEmpty(resultList)) { + resultList = resultList.stream().filter(o -> null != o).sorted(Comparator.comparing(MesProductionPartSheetModel::getPartNo).thenComparing(MesProductionPartSheetModel::getReportSatus)).collect(Collectors.toList()); + resultMap.put(MesPcnExtConstWords.DATA, resultList); + } + + return resultMap; + + } + + private void backResultList(List resultList, List productionRecordList, REPORT_STATUS reportStatus) { + Map> prMap = productionRecordList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesProductionRecord::getPartNo)); + for (Map.Entry> entry : prMap.entrySet()) { + if (null == entry) continue; + MesProductionRecord item = entry.getValue().get(0); + MesProductionPartSheetModel result = new MesProductionPartSheetModel(); + result.setWorkCenterCode(item.getWorkCenterCode()); + result.setWorkCellCode(item.getWorkCellCode()); + result.setPartNo(item.getPartNo()); + result.setPartName(item.getPartName()); + result.setQty(new Double(entry.getValue().size())); + result.setReportSatus(reportStatus.getValue()); + result.setReportSatusName(reportStatus.getDescription()); + resultList.add(result); + } + } + + //返回提示信息 + private Map packResultMap(Map resultMap, String message) { + resultMap.put(MesPcnExtConstWords.MESSAGE, message); + return resultMap; + } + + //业务操作 + enum REPORT_STATUS { + + REPORT(20, "需要汇报"), + + UN_REPORT(30, "无需汇报"); + + private int value; + + private String description; + + REPORT_STATUS(int value, String description) { + + this.value = value; + + this.description = description; + + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + if (StringUtils.isEmpty(val)) return null; + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (val == values()[i].value) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + +} diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesProductionPartSheetModel.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesProductionPartSheetModel.java new file mode 100644 index 0000000..e399d8d --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesProductionPartSheetModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.ext.mes.pcn.pojo.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesProductionPartSheetModel implements Serializable { + + private static final long serialVersionUID = -1692026621022774956L; + + @ApiParam("生产线代码") + private String workCenterCode; + + @ApiParam("工位代码") + private String workCellCode; + + @ApiParam("零件号") + private String partNo; + + @ApiParam("零件名称") + private String partName; + + @ApiParam("加工数量") + private Double qty; + + @ApiParam("汇报状态(reportSatus!=30[需要汇报],reportSatus=30[无需汇报])") + private Integer reportSatus; + + @ApiParam("汇报状态") + private String reportSatusName; + +} From d0909faaed79ad8a0de95887bcf938284e127270 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 12 Apr 2025 15:11:10 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=2046281=20PCN-=E6=8C=89=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E7=BB=9F=E8=AE=A1=E4=BA=A7=E9=87=8F=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/MesFunctionProductionPartSheetService.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionProductionPartSheetService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionProductionPartSheetService.java index daeea12..e2e035e 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionProductionPartSheetService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionProductionPartSheetService.java @@ -57,6 +57,12 @@ public class MesFunctionProductionPartSheetService extends BaseSwsService implem } catch (Exception e) { } + //返回客户端作为查询条件 + Map reportStatusMap = new HashMap<>(); + reportStatusMap.put(REPORT_STATUS.REPORT.getValue(), REPORT_STATUS.REPORT.getDescription()); + reportStatusMap.put(REPORT_STATUS.UN_REPORT.getValue(), REPORT_STATUS.UN_REPORT.getDescription()); + resultMap.put(MesPcnExtConstWords.REPORT_STATUS, reportStatusMap); + String startTime = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.START_TIME)) ? paramMap.get(MesPcnExtConstWords.START_TIME) : null; String endTime = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.END_TIME)) ? paramMap.get(MesPcnExtConstWords.END_TIME) : null; if (StringUtils.isEmpty(startTime) || StringUtils.isEmpty(endTime)) { @@ -73,6 +79,9 @@ public class MesFunctionProductionPartSheetService extends BaseSwsService implem //返回客户端作为默认条件 resultMap.put(MesPcnExtConstWords.START_TIME, startTime); resultMap.put(MesPcnExtConstWords.END_TIME, endTime); + + //客户端默认开窗时不查询数据 + return resultMap; } Boolean checkTime; @@ -84,12 +93,6 @@ public class MesFunctionProductionPartSheetService extends BaseSwsService implem if (!checkTime) return packResultMap(resultMap, "时间查询条件限制一天!"); - //返回客户端作为查询条件 - Map reportStatusMap = new HashMap<>(); - reportStatusMap.put(REPORT_STATUS.REPORT.getValue(), REPORT_STATUS.REPORT.getDescription()); - reportStatusMap.put(REPORT_STATUS.UN_REPORT.getValue(), REPORT_STATUS.UN_REPORT.getDescription()); - resultMap.put(MesPcnExtConstWords.REPORT_STATUS, reportStatusMap); - String partNo = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.PART_NO)) ? paramMap.get(MesPcnExtConstWords.PART_NO) : null; //查询加工记录数据 From 06f83b65f8813466fa4978271057ce03737f3698 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 13 Apr 2025 18:15:30 +0800 Subject: [PATCH 09/10] test --- .../serviceimpl/step/MesShippingRfidSeresFindStepService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesShippingRfidSeresFindStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesShippingRfidSeresFindStepService.java index 2e5ceee..3c30ce0 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesShippingRfidSeresFindStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesShippingRfidSeresFindStepService.java @@ -101,7 +101,7 @@ public class MesShippingRfidSeresFindStepService extends BaseStepService { } // public static void main(String[] args) { -// String rfid = "01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567"; +// String rfid = "227S187103LM8F7J3B4SC028108002000466426#LRHA62726CC55####20##2##31122#66241H1H2########4###66###################################"; // System.out.println(rfid.length()); // System.out.println(rfid); // System.out.println(rfid.substring(0, 96) + "##################326312JSG1DJ05" + rfid.substring(128)); From e74aaa03af9f7ce63fbe2ec3dad37ef731a5f6c5 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 14 Apr 2025 14:19:23 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java | 4 ++-- .../step/MesProductionDataSaveBeforeControlOrderStepService.java | 4 ++-- 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/MesWorkOrderExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java index f05b04f..1dc1df1 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java @@ -283,7 +283,7 @@ public class MesWorkOrderExtService implements IMesWorkOrderExtService { workOrderList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getPartNo()) && !StringUtils.isEmpty(o.getWorkOrderStatus()) && !StringUtils.isEmpty(o.getOrderFlag()) && o.getWorkOrderStatus().compareTo(MesExtEnumUtil.ORDER_STATUS.CREATE.getValue()) != 0 && !o.getOrderFlag().equals(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue()))).collect(Collectors.toList()); if (CollectionUtils.isEmpty(workOrderList)) return null; - Map> workOrderMap = workOrderList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesWorkOrder::getPartNo)); + Map> workOrderMap = workOrderList.stream().filter(o -> null != o).collect(Collectors.groupingBy(o -> o.getPartNo().toUpperCase())); Map controlOrderQtyMap = new HashMap<>(); Double qty; @@ -309,7 +309,7 @@ public class MesWorkOrderExtService implements IMesWorkOrderExtService { else DdlPreparedPack.getInPackList(partNoList, MesPcnExtConstWords.PART_NO, packBean); List workOrderControlQtyRecordList = workOrderControlQtyRecordRepository.findByHqlWhere(packBean); return CollectionUtils.isEmpty(workOrderControlQtyRecordList) ? null : - workOrderControlQtyRecordList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesWorkOrderControlQtyRecord::getPartNo, Collectors.summingDouble(MesWorkOrderControlQtyRecord::getQty))); + workOrderControlQtyRecordList.stream().filter(o -> null != o).collect(Collectors.groupingBy(o -> o.getPartNo().toUpperCase(), Collectors.summingDouble(MesWorkOrderControlQtyRecord::getQty))); } } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java index afea123..fa7730b 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java @@ -94,7 +94,7 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep //验证是否需要汇报 productionPsOutContextList.stream().filter(o -> null != o).forEach(o -> checkProductionRecordIsReport(reqBean, o, prMap.get(o.getForeignKey()), CollectionUtils.isEmpty(psiMap) ? null : psiMap.get(o.getForeignKey()))); - Map> reportPsMap = productionPsOutContextList.stream().filter(o -> (null != o && o.getIsCalcCompleteQty().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) == 0)).collect(Collectors.groupingBy(MesProductionPsOutContext::getPartNo)); + Map> reportPsMap = productionPsOutContextList.stream().filter(o -> (null != o && o.getIsCalcCompleteQty().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) == 0)).collect(Collectors.groupingBy(o -> o.getPartNo().toUpperCase())); if (CollectionUtils.isEmpty(reportPsMap)) break Loop; @@ -187,7 +187,7 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep if (null == productionPsInContext) return false; if (StringUtils.isEmpty(productionPsInContext.getPartNo())) return false; if (null == productionPsOutContext) return false; - if (!productionPsInContext.getPartNo().equals(productionPsOutContext.getPartNo())) return false; + if (!productionPsInContext.getPartNo().toUpperCase().equals(productionPsOutContext.getPartNo().toUpperCase())) return false; return true; }