puxiao.liao
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

46746 PCN：在生产控制页面增加“替换装配件”按钮，参考返工作业的“替换装配件”功能

Browse Source
uat-temp-nht-202505090001-46746
jason 3 months ago
parent ebaebe449e
commit 5f88ad674a
3 changed files with 59 additions and 13 deletions
Show Stats Download Patch File Download Diff File

12
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java
Unescape Escape View File

@ -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);

58
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java
Unescape Escape View File

@ -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<String, Object> queryassemblyData(StationRequestBean reqBean, Map<String, Object> resultMap, Map<String, String> paramMap) {
private Map<String, Object> queryAssemblyData(StationRequestBean reqBean, Map<String, Object> resultMap, Map<String, String> 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<String, Object> doAssemblySnRepeatByScan(StationRequestBean reqBean, StationResultBean resultBean,
ButtonDynamicModel buttonDynamicModel, Map<String, Object> resultMap, Map<String, String> 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<MesProductionAssembly> mesProductionRecords = mesReworkTaskService.assemblyQuery(requestModel);
paramMap.put(MesPcnExtConstWords.ORGANIZE_CODE, reqBean.getOrganizeCode());
//根据配置查询生产队列工位推送信息
resultMap.put(MesPcnExtConstWords.DATA, mesProductionRecords);
return resultMap;
}
//装配件替换
private Map<String, Object> doAssemblySnRepeat(StationRequestBean reqBean, StationResultBean resultBean,
ButtonDynamicModel buttonDynamicModel, Map<String, Object> resultMap, Map<String, String> 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;

2
modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
Unescape Escape View File

@ -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";
// 序号

Write Preview
Loading…
Cancel
Save