From ebaebe449ed8423fd94fd407407fe0de37e310be Mon Sep 17 00:00:00 2001 From: jason Date: Fri, 9 May 2025 16:22:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?46746=20PCN=EF=BC=9A=E5=9C=A8=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=8E=A7=E5=88=B6=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E2=80=9C=E6=9B=BF=E6=8D=A2=E8=A3=85=E9=85=8D=E4=BB=B6=E2=80=9D?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E5=8F=82=E8=80=83=E8=BF=94=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E2=80=9C=E6=9B=BF=E6=8D=A2=E8=A3=85?= =?UTF-8?q?=E9=85=8D=E4=BB=B6=E2=80=9D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MesFunctionAssemblyReplaceService.java | 158 +++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java new file mode 100644 index 0000000..688824e --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java @@ -0,0 +1,158 @@ +package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.station.function; + +import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesReworkTaskService; +import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesReworkTaskRequestModel; +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.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesProductionAssembly; +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.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.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Description : 工位参数按钮事件接口实现【装配件替换】 + **/ +@Service +public class MesFunctionAssemblyReplaceService extends BaseSwsService implements IFsmModuleFunctionService { + @Autowired + private IMesReworkTaskService mesReworkTaskService; + + @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) { + } + if (CollectionUtils.isEmpty(paramMap) || StringUtils.isEmpty(MesFunctionQueueOrderPushService.BUSI_TYPE.valueOfDescription(paramMap.get(MesPcnExtConstWords.BUSI_TYPE)))) { + resultMap.put(MesPcnExtConstWords.DATA_TYPE, MesPcnEnumUtil.STATION_DATA_TYPE.EXP_TEXT.getValue()); + return packResultMap(reqBean, resultBean, resultMap, String.format("[%s]参数异常!", buttonDynamicModel.getButtonName())); + } + + //查询 + if (MesFunctionAssemblyReplaceService.BUSI_TYPE.ONE.value.equals(paramMap.get(MesPcnExtConstWords.BUSI_TYPE))) return queryassemblyData(reqBean, resultMap, paramMap); + + this.sendMessage(reqBean, new StationResultBean().writeDbLog(MesPcnEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.PICK.getValue()), + String.format("[%s]%s: %s", buttonDynamicModel.getButtonName(), MesFunctionQueueOrderPushService.BUSI_TYPE.valueOfDescription(paramMap.get(MesPcnExtConstWords.BUSI_TYPE)), JSONObject.toJSONString(paramMap)), + MesPcnEnumUtil.STATION_BUSI_TYPE.RUNNING_INFO, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT); + + resultBean.writeDbLog(MesPcnEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.PICK.getValue()); + resultMap.put(MesPcnExtConstWords.DATA_TYPE, MesPcnEnumUtil.STATION_DATA_TYPE.EXP_TEXT.getValue()); + + //执行装配件替换 + if (MesFunctionAssemblyReplaceService.BUSI_TYPE.TWO.value.equals(paramMap.get(MesPcnExtConstWords.BUSI_TYPE))) doAssemblySnRepeatByScan(reqBean, resultBean, buttonDynamicModel, resultMap, paramMap); + + if (!resultMap.containsKey(MesPcnExtConstWords.MESSAGE)) { + resultMap.put(MesPcnExtConstWords.DATA_TYPE, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT.getValue()); + resultMap.put(MesPcnExtConstWords.MESSAGE, String.format("[%s]%s成功!", buttonDynamicModel.getButtonName(), MesFunctionQueueOrderPushService.BUSI_TYPE.valueOfDescription(paramMap.get(MesPcnExtConstWords.BUSI_TYPE)))); + } + + return resultMap; + } + + //查询 + private Map queryassemblyData(StationRequestBean reqBean, Map resultMap, Map paramMap) { + final String organizeCode = reqBean.getOrganizeCode(); + final String custSn = paramMap.get(MesPcnExtConstWords.CUST_SN); + + MesReworkTaskRequestModel requestModel = new MesReworkTaskRequestModel(); + requestModel.setOrganizeCode(organizeCode); + requestModel.setCustSn(custSn); + requestModel.setIsOrigSn(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + requestModel.setAssemblyPartStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue()); + List mesProductionRecords = mesReworkTaskService.assemblyQuery(requestModel); + paramMap.put(MesPcnExtConstWords.ORGANIZE_CODE, reqBean.getOrganizeCode()); + //根据配置查询生产队列工位推送信息 + resultMap.put(MesPcnExtConstWords.DATA, mesProductionRecords); + return resultMap; + } + + //执行装配件替换 + private Map doAssemblySnRepeatByScan(StationRequestBean reqBean, StationResultBean resultBean, + ButtonDynamicModel buttonDynamicModel, Map resultMap, Map paramMap) { + final String organizeCode = reqBean.getOrganizeCode(); + final String username = reqBean.getUserInfo(); + final String custSn = paramMap.get(MesPcnExtConstWords.CUST_SN); + final String sn = paramMap.get(MesPcnExtConstWords.SN); + + if (StringUtils.isEmpty(custSn)) { + return packResultMap(reqBean, resultBean, resultMap, String.format("[%s]执行装配件替换:客户条码不能为空!", buttonDynamicModel.getButtonName())); + } + if (StringUtils.isEmpty(sn)) { + return packResultMap(reqBean, resultBean, resultMap, String.format("[%s]执行装配件替换:替换条码不能为空!", buttonDynamicModel.getButtonName())); + } + + MesReworkTaskRequestModel requestModel = new MesReworkTaskRequestModel(); + requestModel.setUserName(username); + requestModel.setOrganizeCode(organizeCode); + requestModel.setCustSn(custSn); + requestModel.setIsOrigSn(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + requestModel.setAssemblyPartStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue()); + mesReworkTaskService.doAssemblySnRepeatByScan(requestModel); + return resultMap; + + } + + //返回提示信息 + private Map packResultMap(StationRequestBean reqBean, StationResultBean resultBean, Map resultMap, String message) { + this.sendMessage(reqBean, resultBean, message, MesPcnEnumUtil.STATION_BUSI_TYPE.RUNNING_INFO, MesPcnEnumUtil.STATION_DATA_TYPE.EXP_TEXT); + resultMap.put(MesPcnExtConstWords.MESSAGE, message); + return resultMap; + } + + //业务操作 + enum BUSI_TYPE { + ONE("1", "查询装配件"), + TWO("2", "执行装配件替换"); + + private String value; + + private String description; + + BUSI_TYPE(String value, String description) { + + this.value = value; + + this.description = description; + + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + if (StringUtils.isEmpty(val)) return null; + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (val.equals(values()[i].value)) { + tmp = values()[i].description; + } + } + return tmp; + } + + } +} From 5f88ad674a04932f9d1015729f42a52003c8f5d1 Mon Sep 17 00:00:00 2001 From: jason Date: Fri, 9 May 2025 18:12:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?46746=20PCN=EF=BC=9A=E5=9C=A8=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=8E=A7=E5=88=B6=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E2=80=9C=E6=9B=BF=E6=8D=A2=E8=A3=85=E9=85=8D=E4=BB=B6=E2=80=9D?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E5=8F=82=E8=80=83=E8=BF=94=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E2=80=9C=E6=9B=BF=E6=8D=A2=E8=A3=85?= =?UTF-8?q?=E9=85=8D=E4=BB=B6=E2=80=9D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/MesReworkTaskServiceImpl.java | 12 +++-- .../MesFunctionAssemblyReplaceService.java | 58 ++++++++++++++++++---- .../ext/mes/pcn/pojo/util/MesPcnExtConstWords.java | 2 + 3 files changed, 59 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java index 2c09905..ba4a9ab 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java @@ -608,8 +608,10 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { /** * 需要更新NC标记后进入的表明细状态为已处理 */ - for (String detailId : requestModel.getDetailIds().split(",")) { - reworkRecord(Long.parseLong(detailId),requestModel.getUserName(),requestModel.getOrganizeCode()); + if (!StringUtils.isEmpty(requestModel.getDetailIds())) { + for (String detailId : requestModel.getDetailIds().split(",")) { + reworkRecord(Long.parseLong(detailId),requestModel.getUserName(),requestModel.getOrganizeCode()); + } } } @@ -747,8 +749,10 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { /** * 需要更新NC标记后进入的表明细状态为已处理 */ - for (String detailId : requestModel.getDetailIds().split(",")) { - reworkRecord(Long.parseLong(detailId),requestModel.getUserName(),requestModel.getOrganizeCode()); + if (!StringUtils.isEmpty(requestModel.getDetailIds())) { + for (String detailId : requestModel.getDetailIds().split(",")) { + reworkRecord(Long.parseLong(detailId),requestModel.getUserName(),requestModel.getOrganizeCode()); + } } } catch (Exception e) { log.error("替换条码异常", e); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java index 688824e..1e64817 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java @@ -42,34 +42,37 @@ public class MesFunctionAssemblyReplaceService extends BaseSwsService implements paramMap = StringUtils.isEmpty(buttonDynamicModel.getFunctionValue()) ? null : JSONObject.parseObject(buttonDynamicModel.getFunctionValue(), Map.class); } catch (Exception e) { } - if (CollectionUtils.isEmpty(paramMap) || StringUtils.isEmpty(MesFunctionQueueOrderPushService.BUSI_TYPE.valueOfDescription(paramMap.get(MesPcnExtConstWords.BUSI_TYPE)))) { + if (CollectionUtils.isEmpty(paramMap) || StringUtils.isEmpty(MesFunctionAssemblyReplaceService.BUSI_TYPE.valueOfDescription(String.valueOf(paramMap.get(MesPcnExtConstWords.BUSI_TYPE))))) { resultMap.put(MesPcnExtConstWords.DATA_TYPE, MesPcnEnumUtil.STATION_DATA_TYPE.EXP_TEXT.getValue()); return packResultMap(reqBean, resultBean, resultMap, String.format("[%s]参数异常!", buttonDynamicModel.getButtonName())); } + final String busiType = String.valueOf(paramMap.get(MesPcnExtConstWords.BUSI_TYPE)); //查询 - if (MesFunctionAssemblyReplaceService.BUSI_TYPE.ONE.value.equals(paramMap.get(MesPcnExtConstWords.BUSI_TYPE))) return queryassemblyData(reqBean, resultMap, paramMap); + if (MesFunctionAssemblyReplaceService.BUSI_TYPE.ONE.value.equals(busiType)) return queryAssemblyData(reqBean, resultMap, paramMap); this.sendMessage(reqBean, new StationResultBean().writeDbLog(MesPcnEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.PICK.getValue()), - String.format("[%s]%s: %s", buttonDynamicModel.getButtonName(), MesFunctionQueueOrderPushService.BUSI_TYPE.valueOfDescription(paramMap.get(MesPcnExtConstWords.BUSI_TYPE)), JSONObject.toJSONString(paramMap)), + String.format("[%s]%s: %s", buttonDynamicModel.getButtonName(), MesFunctionAssemblyReplaceService.BUSI_TYPE.valueOfDescription(busiType), JSONObject.toJSONString(paramMap)), MesPcnEnumUtil.STATION_BUSI_TYPE.RUNNING_INFO, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT); resultBean.writeDbLog(MesPcnEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.PICK.getValue()); resultMap.put(MesPcnExtConstWords.DATA_TYPE, MesPcnEnumUtil.STATION_DATA_TYPE.EXP_TEXT.getValue()); - //执行装配件替换 - if (MesFunctionAssemblyReplaceService.BUSI_TYPE.TWO.value.equals(paramMap.get(MesPcnExtConstWords.BUSI_TYPE))) doAssemblySnRepeatByScan(reqBean, resultBean, buttonDynamicModel, resultMap, paramMap); + //扫描条码替换装配件 + if (MesFunctionAssemblyReplaceService.BUSI_TYPE.TWO.value.equals(busiType)) doAssemblySnRepeatByScan(reqBean, resultBean, buttonDynamicModel, resultMap, paramMap); + //装配件替换 + else if (MesFunctionAssemblyReplaceService.BUSI_TYPE.THREE.value.equals(busiType)) doAssemblySnRepeat(reqBean, resultBean, buttonDynamicModel, resultMap, paramMap); if (!resultMap.containsKey(MesPcnExtConstWords.MESSAGE)) { resultMap.put(MesPcnExtConstWords.DATA_TYPE, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT.getValue()); - resultMap.put(MesPcnExtConstWords.MESSAGE, String.format("[%s]%s成功!", buttonDynamicModel.getButtonName(), MesFunctionQueueOrderPushService.BUSI_TYPE.valueOfDescription(paramMap.get(MesPcnExtConstWords.BUSI_TYPE)))); + resultMap.put(MesPcnExtConstWords.MESSAGE, String.format("[%s]%s成功!", buttonDynamicModel.getButtonName(), MesFunctionAssemblyReplaceService.BUSI_TYPE.valueOfDescription(busiType))); } return resultMap; } //查询 - private Map queryassemblyData(StationRequestBean reqBean, Map resultMap, Map paramMap) { + private Map queryAssemblyData(StationRequestBean reqBean, Map resultMap, Map paramMap) { final String organizeCode = reqBean.getOrganizeCode(); final String custSn = paramMap.get(MesPcnExtConstWords.CUST_SN); @@ -85,7 +88,7 @@ public class MesFunctionAssemblyReplaceService extends BaseSwsService implements return resultMap; } - //执行装配件替换 + //扫描条码替换装配件 private Map doAssemblySnRepeatByScan(StationRequestBean reqBean, StationResultBean resultBean, ButtonDynamicModel buttonDynamicModel, Map resultMap, Map paramMap) { final String organizeCode = reqBean.getOrganizeCode(); @@ -104,11 +107,47 @@ public class MesFunctionAssemblyReplaceService extends BaseSwsService implements requestModel.setUserName(username); requestModel.setOrganizeCode(organizeCode); requestModel.setCustSn(custSn); + requestModel.setSn(sn); requestModel.setIsOrigSn(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); requestModel.setAssemblyPartStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue()); mesReworkTaskService.doAssemblySnRepeatByScan(requestModel); + + List mesProductionRecords = mesReworkTaskService.assemblyQuery(requestModel); + paramMap.put(MesPcnExtConstWords.ORGANIZE_CODE, reqBean.getOrganizeCode()); + //根据配置查询生产队列工位推送信息 + resultMap.put(MesPcnExtConstWords.DATA, mesProductionRecords); return resultMap; + } + + //装配件替换 + private Map doAssemblySnRepeat(StationRequestBean reqBean, StationResultBean resultBean, + ButtonDynamicModel buttonDynamicModel, Map resultMap, Map paramMap) { + final String organizeCode = reqBean.getOrganizeCode(); + final String username = reqBean.getUserInfo(); + final String custSn = paramMap.get(MesPcnExtConstWords.CUST_SN); + final String sn = paramMap.get(MesPcnExtConstWords.SN); + final String assemblyIds = paramMap.get(MesPcnExtConstWords.ASSEMBLY_IDS); + + if (StringUtils.isEmpty(custSn)) { + return packResultMap(reqBean, resultBean, resultMap, String.format("[%s]执行装配件替换:客户条码不能为空!", buttonDynamicModel.getButtonName())); + } + if (StringUtils.isEmpty(sn)) { + return packResultMap(reqBean, resultBean, resultMap, String.format("[%s]执行装配件替换:替换条码不能为空!", buttonDynamicModel.getButtonName())); + } + if (StringUtils.isEmpty(assemblyIds)) { + return packResultMap(reqBean, resultBean, resultMap, String.format("[%s]执行装配件替换:替换装配件id不能为空!", buttonDynamicModel.getButtonName())); + } + MesReworkTaskRequestModel requestModel = new MesReworkTaskRequestModel(); + requestModel.setUserName(username); + requestModel.setOrganizeCode(organizeCode); + requestModel.setCustSn(custSn); + requestModel.setSn(sn); + requestModel.setAssemblyIds(assemblyIds); + requestModel.setIsOrigSn(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + requestModel.setAssemblyPartStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue()); + mesReworkTaskService.doAssemblySnRepeat(requestModel); + return resultMap; } //返回提示信息 @@ -121,7 +160,8 @@ public class MesFunctionAssemblyReplaceService extends BaseSwsService implements //业务操作 enum BUSI_TYPE { ONE("1", "查询装配件"), - TWO("2", "执行装配件替换"); + TWO("2", "扫描条码替换装配件"), + THREE("3", "装配件替换"); private String value; 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 d97e1e8..5c87fca 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 @@ -166,6 +166,8 @@ public class MesPcnExtConstWords { public static final String ASSEMBLY_PART_NAME = "assemblyPartName"; // 装配件条码 public static final String ASSEMBLY_SN = "assemblySn"; + // 装配件条码对象ID集合，多个逗号分割 + public static final String ASSEMBLY_IDS = "assemblyIds"; // 装备序号 public static final String ROUTE_SEQ = "routeSeq"; // 序号 From edb53d338454cf5712757c1d6d6670c8edf6ab16 Mon Sep 17 00:00:00 2001 From: jason Date: Mon, 12 May 2025 11:20:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E8=A3=85=E9=85=8D=E4=BB=B6=E5=90=8E=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/station/function/MesFunctionAssemblyReplaceService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java index 1e64817..126cb11 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java @@ -80,7 +80,6 @@ public class MesFunctionAssemblyReplaceService extends BaseSwsService implements requestModel.setOrganizeCode(organizeCode); requestModel.setCustSn(custSn); requestModel.setIsOrigSn(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); - requestModel.setAssemblyPartStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue()); List mesProductionRecords = mesReworkTaskService.assemblyQuery(requestModel); paramMap.put(MesPcnExtConstWords.ORGANIZE_CODE, reqBean.getOrganizeCode()); //根据配置查询生产队列工位推送信息 From 4fb98f07a6809295feb48facc704ab3e04f99a7d Mon Sep 17 00:00:00 2001 From: jason Date: Mon, 12 May 2025 18:14:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E8=A3=85=E9=85=8D=E4=BB=B6=E5=90=8E=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/station/function/MesFunctionAssemblyReplaceService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java index 126cb11..56724cd 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java @@ -111,6 +111,7 @@ public class MesFunctionAssemblyReplaceService extends BaseSwsService implements requestModel.setAssemblyPartStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue()); mesReworkTaskService.doAssemblySnRepeatByScan(requestModel); + requestModel.setAssemblyPartStatus(null); List mesProductionRecords = mesReworkTaskService.assemblyQuery(requestModel); paramMap.put(MesPcnExtConstWords.ORGANIZE_CODE, reqBean.getOrganizeCode()); //根据配置查询生产队列工位推送信息