diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/OrderJobDao.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/OrderJobDao.java index 73a4a9c..c8fdcb3 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/OrderJobDao.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/OrderJobDao.java @@ -164,8 +164,10 @@ public class OrderJobDao implements IOrderJobDao { hql.append("SELECT new "+ MesOrderJobModel.class.getName()+"(") .append("moj.id,moj.taskType,moj.orderType,moj.orderNo,moj.workCenterCode,moj.shiftCode,moj.workOrderNo,") .append("moj.orderStatus,moj.orderDate,moj.generateTime,moj.complateTime,") - .append("moj.organizeCode,moj.isValid,moj.isDeleted,moj.createUser,moj.createDatetime,moj.modifyUser,moj.modifyDatetime)") + .append("moj.organizeCode,moj.isValid,moj.isDeleted,moj.createUser,moj.createDatetime,moj.modifyUser,moj.modifyDatetime, mwoe.partNo, mwoe.partNameRdd)") .append(" FROM MesOrderJob AS moj ") + .append(" LEFT JOIN MesWorkOrderExt mwoe ") + .append(" ON moj.workOrderNo=mwoe.orderNo ") .append(" WHERE moj.organizeCode = :organizeCode ") .append(" AND moj.isValid = :isValid AND moj.isDeleted = :isDeleted"); if (!StringUtils.isEmpty(orderJob.getOrderStatus())) { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/FirstOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/FirstOrderService.java index 2649fc0..53db80f 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/FirstOrderService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/FirstOrderService.java @@ -237,6 +237,7 @@ public class FirstOrderService implements IFirstOrderService { } DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(orderNo, "orderNo", packBean); + packBean.setOrderByStr(" order by processCode "); return mesFirstOrderDetailRDao.findByHqlWhere(packBean); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/bu/BuFirstOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/bu/BuFirstOrderService.java index 19d717c..a818d3d 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/bu/BuFirstOrderService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/bu/BuFirstOrderService.java @@ -161,6 +161,7 @@ public class BuFirstOrderService implements IBuFirstOrderService { } DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(orderNo, "orderNo", packBean); + packBean.setOrderByStr(" order by processCode "); return mesFirstOrderDetailRDao.findByHqlWhere(packBean); } @@ -219,44 +220,47 @@ public class BuFirstOrderService implements IBuFirstOrderService { } if (mesFirstOrderDetail.getManageType().equals(MesPcnExtEnumUtil.Q_MANAGE_MANAGE_TYPE.RESULT_TYPE.getValue()) && !StringUtils.isEmpty(mesFirstOrderDetail.getImportanceSafePartNo())){ - if (!mesFirstOrderDetail.getImportanceSafePartNo().equals(mesFirstOrderDetail.getResultValue())) { - - String requestUrl = pcnHttpService.getRequestUrl(mesFirstOrderDetail.getOrganizeCode(), MesPcnExtConstWords.FIND_PART_NO); - Map params = new HashMap<>(); - params.put(MesPcnExtConstWords.SN, mesFirstOrderDetail.getResultValue()); - params.put(MesPcnExtConstWords.ORGANIZE_CODE, mesFirstOrderDetail.getOrganizeCode()); - WmsSnInfoModel wmsSnInfoModel = null; - try { - String data = PcnHttpUtil.doGet(requestUrl, params); - BaseResultBean baseResultBean = null; - - if (!StringUtils.isEmpty(data)) { - baseResultBean = JsonUtilTool.decode(data, BaseResultBean.class); - } else { - log.error("updateMesFirstOrderDetail --- HTTP[{}]调用主接口失败", requestUrl); - } - log.error("updateMesFirstOrderDetail --- Q管理校验物料时获取WMS数据[{}]", data); - - if (null != baseResultBean && baseResultBean.success) { - LinkedHashMap resultObject = (LinkedHashMap) baseResultBean.getResultObject(); - wmsSnInfoModel= JsonUtilTool.decode(JSONObject.toJSONString(resultObject), WmsSnInfoModel.class); - } - if (wmsSnInfoModel == null) { - log.error("updateMesFirstOrderDetail --- Q管理校验物料时获取WMS数据失败 HTTP[{}]调用主接口 无法获取此条码信息", requestUrl); + if (StringUtils.isEmpty(mesFirstOrderDetail.getCheckValue())) mesFirstOrderDetail.setCheckResult("20"); + else { + if (!mesFirstOrderDetail.getImportanceSafePartNo().equals(mesFirstOrderDetail.getResultValue())) { + + String requestUrl = pcnHttpService.getRequestUrl(mesFirstOrderDetail.getOrganizeCode(), MesPcnExtConstWords.FIND_PART_NO); + Map params = new HashMap<>(); + params.put(MesPcnExtConstWords.SN, mesFirstOrderDetail.getResultValue()); + params.put(MesPcnExtConstWords.ORGANIZE_CODE, mesFirstOrderDetail.getOrganizeCode()); + WmsSnInfoModel wmsSnInfoModel = null; + try { + String data = PcnHttpUtil.doGet(requestUrl, params); + BaseResultBean baseResultBean = null; + + if (!StringUtils.isEmpty(data)) baseResultBean = JsonUtilTool.decode(data, BaseResultBean.class); + else log.error("updateMesFirstOrderDetail --- HTTP[{}]调用主接口失败", requestUrl); + + log.error("updateMesFirstOrderDetail --- Q管理校验物料时获取WMS数据[{}]", data); + + if (null != baseResultBean && baseResultBean.success) { + LinkedHashMap resultObject = (LinkedHashMap) baseResultBean.getResultObject(); + wmsSnInfoModel= JsonUtilTool.decode(JSONObject.toJSONString(resultObject), WmsSnInfoModel.class); + } + if (wmsSnInfoModel == null) { + log.error("updateMesFirstOrderDetail --- Q管理校验物料时获取WMS数据失败 HTTP[{}]调用主接口 无法获取此条码信息", requestUrl); + } + } catch (UnsupportedEncodingException e) { + log.error("updateMesFirstOrderDetail --- Q管理校验物料时获取WMS数据失败 HTTP[{}]调用主接口失败", requestUrl); } - } catch (UnsupportedEncodingException e) { - log.error("updateMesFirstOrderDetail --- Q管理校验物料时获取WMS数据失败 HTTP[{}]调用主接口失败", requestUrl); - } - if ((wmsSnInfoModel == null) || (!wmsSnInfoModel.getPartNo().equals(mesFirstOrderDetail.getImportanceSafePartNo()))) { - log.info("updateMesFirstOrderDetail --- 条码为空或条码的重要安全部品编码不一致"); - mesFirstOrderDetail.setCheckResult("20"); + if ((wmsSnInfoModel == null) || (!wmsSnInfoModel.getPartNo().equals(mesFirstOrderDetail.getImportanceSafePartNo()))) { + log.info("updateMesFirstOrderDetail --- 条码为空或点检项目维护重要安全部品:{}与箱条码的重要安全部品编码{}不一致", mesFirstOrderDetail.getImportanceSafePartNo(), wmsSnInfoModel == null ? "" : wmsSnInfoModel.getPartNo()); + mesFirstOrderDetail.setCheckResult("20"); + if (wmsSnInfoModel != null) mesFirstOrderDetail.setResultValue(wmsSnInfoModel.getPartNo()); + } else { + mesFirstOrderDetail.setCheckResult("10"); + mesFirstOrderDetail.setResultValue(wmsSnInfoModel.getPartNo()); + } } else { mesFirstOrderDetail.setCheckResult("10"); } - } else { - mesFirstOrderDetail.setCheckResult("10"); } } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java index 01f099d..b0d9981 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java @@ -52,6 +52,7 @@ public class TorqueManageCheckDetailService implements ITorqueManageCheckService DdlPreparedPack.getStringEqualPack(personCheckDetail.getWorkCenterCode(), MesPcnExtConstWords.WORK_CENTER_CODE, packBean); DdlPreparedPack.getStringEqualPack(personCheckDetail.getWorkCellCode(), MesPcnExtConstWords.WORK_CELL_CODE, packBean); pager = PagerHelper.getPager(pager, torqueManageTaskDetailRepository.findByHqlWhereCount(packBean)); + packBean.setOrderByStr(" order by processCode "); List torqueManageTaskDetailList = torqueManageTaskDetailRepository.findByHqlWherePage(packBean, pager); for (MesProcessTorqueManageTaskDetail mesProcessTorqueManageTaskDetail : torqueManageTaskDetailList) { if (!StringUtils.isEmpty(mesProcessTorqueManageTaskDetail.getTorqueSpecValue())) { diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesOrderJobModel.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesOrderJobModel.java index 9d56d71..df161e5 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesOrderJobModel.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesOrderJobModel.java @@ -132,7 +132,7 @@ public class MesOrderJobModel implements Serializable { this.serialNumber = serialNumber; } - public MesOrderJobModel(Long id, Integer taskType, Integer orderType, String orderNo, String workCenterCode, String shiftCode, String workOrderNo, Integer orderStatus, String orderDate, String generateTime, String complateTime, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesOrderJobModel(Long id, Integer taskType, Integer orderType, String orderNo, String workCenterCode, String shiftCode, String workOrderNo, Integer orderStatus, String orderDate, String generateTime, String complateTime, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String partNo, String partNameRdd) { this.id = id; this.taskType = taskType; this.orderType = orderType; @@ -151,5 +151,7 @@ public class MesOrderJobModel implements Serializable { this.createDatetime = createDatetime; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; + this.partNo = partNo; + this.partNameRdd = partNameRdd; } }