Q管理点检

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())) {

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

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,6 +220,9 @@ public class BuFirstOrderService implements IBuFirstOrderService {
         }
 
         if (mesFirstOrderDetail.getManageType().equals(MesPcnExtEnumUtil.Q_MANAGE_MANAGE_TYPE.RESULT_TYPE.getValue()) && !StringUtils.isEmpty(mesFirstOrderDetail.getImportanceSafePartNo())){
+
+            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);
@@ -230,11 +234,8 @@ public class BuFirstOrderService implements IBuFirstOrderService {
                         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);
-                    }
+                        if (!StringUtils.isEmpty(data)) baseResultBean = JsonUtilTool.decode(data, BaseResultBean.class);
+                        else log.error("updateMesFirstOrderDetail --- HTTP[{}]调用主接口失败", requestUrl);
 
                         log.error("updateMesFirstOrderDetail --- Q管理校验物料时获取WMS数据[{}]", data);
 
@@ -250,15 +251,18 @@ public class BuFirstOrderService implements IBuFirstOrderService {
                     }
 
                     if ((wmsSnInfoModel == null) || (!wmsSnInfoModel.getPartNo().equals(mesFirstOrderDetail.getImportanceSafePartNo()))) {
-                    log.info("updateMesFirstOrderDetail --- 条码为空或条码的重要安全部品编码不一致");
+                        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");
                 }
             }
+        }
 
         //修改首检单明细数据
         mesFirstOrderDetail.setSpotCheckUser(userName);

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<MesProcessTorqueManageTaskDetail> torqueManageTaskDetailList = torqueManageTaskDetailRepository.findByHqlWherePage(packBean, pager);
         for (MesProcessTorqueManageTaskDetail mesProcessTorqueManageTaskDetail : torqueManageTaskDetailList) {
             if (!StringUtils.isEmpty(mesProcessTorqueManageTaskDetail.getTorqueSpecValue())) {

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