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