点检校验设备id

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java

@@ -28,6 +28,7 @@ import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,6 +82,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
 
     @Autowired
     private IMesEquipmentExtService mesEquipmentExtService;
+    @Autowired
+    private MesEquipmentRepository mesEquipmentRepository;
 
     @Override
     public ListPager<MesSpotCheckOrder> querySpotCheckOrder(MesSpotCheckOrder spotCheckOrder, Pager pager) {
@@ -90,6 +93,19 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
         pager = PagerHelper.getPager(pager, spotCheckOrderRepository.findByHqlWhereCount(packBean));
 
         List<MesSpotCheckOrder> resultList = spotCheckOrderRepository.findByHqlWherePage(packBean, pager);
+        if (CollectionUtils.isEmpty(resultList)) {
+            return  new ListPager<>(resultList, pager);
+        }
+        List<String> equipmentlist = resultList.stream().map(MesSpotCheckOrder::getEquipCode).collect(Collectors.toList());
+
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(spotCheckOrder.getOrganizeCode());
+        DdlPreparedPack.getInPackList(equipmentlist, "equipmentCode", ddlPackBean);
+        List<MesEquipment> mesEquipments = mesEquipmentRepository.findByHqlWhere(ddlPackBean);
+        Map<String, List<MesEquipment>> map = mesEquipments.stream().collect(Collectors.groupingBy(MesEquipment::getEquipmentCode));
+
+        resultList.forEach(mesSpotCheckOrder -> {
+            mesSpotCheckOrder.setEquipId(map.get(mesSpotCheckOrder.getEquipCode()).get(0).getEquipId());
+        });
 
         return new ListPager<>(resultList, pager);
 
@@ -297,13 +313,14 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
         spotCheckOrderPartRepository.saveAll(model.getOrderPartList());
 
         Integer orderResult = MesExtEnumUtil.SPOT_CHECK_ORDER_RESULT_TYPE.OK.getValue();
+        // 点检单的结果
         for (MesSpotCheckOrderResult result : model.getOrderResultList()) {
 
             if (StringUtils.isEmpty(result.getSpotCheckRealValue())) {
                 throw new ImppBusiException(String.format("点检单明细未填写完成，请继续质检", result.getSpotCheckRealValue()));
             }
-
+            if (Objects.equals(result.getSpotCheckResult(), "NOK") && Objects.equals(MesExtEnumUtil.SPOT_CHECK_ORDER_RESULT_TYPE.OK.getValue(), orderResult)) {
-            if (result.getIsTolerance() == MesCommonConstant.TRUE_INTEGER && orderResult == MesExtEnumUtil.SPOT_CHECK_ORDER_RESULT_TYPE.OK.getValue()) {
+                // 如果有NOK的则不用管，全OK才是OK，否则就是NOK
                 orderResult = MesExtEnumUtil.SPOT_CHECK_ORDER_RESULT_TYPE.NOK.getValue();
             }
             result.setSpotCheckTime(TimeTool.getNowTime(true));
@@ -568,6 +585,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
         //查询点检明细
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(spotCheckOrder.getOrganizeCode());
         DdlPreparedPack.getNumEqualPack(spotCheckOrder.getId(), "pid", packBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"seqCode"}, packBean);
+
         List<MesSpotCheckOrderResult> orderResultList = spotCheckOrderResultRepository.findByHqlWhere(packBean);
 
         //查询点检零件