点检

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

@@ -74,7 +74,7 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
     public ListPager<MesSpotCheckOrder> querySpotCheckOrder(MesSpotCheckOrder spotCheckOrder, Pager pager) {
 
         DdlPackBean packBean = getDdlPackBean(spotCheckOrder);
-
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
         pager = PagerHelper.getPager(pager, spotCheckOrderRepository.findByHqlWhereCount(packBean));
 
         List<MesSpotCheckOrder> resultList = spotCheckOrderRepository.findByHqlWherePage(packBean, pager);
@@ -184,9 +184,10 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
                     result.setSpotCheckSetValue(value);
                     result.setSetValueRecordType(MesExtEnumUtil.SPOT_VALUE_RECORD_TYPE.EQUIPMENT_INPUT.getValue());
 
-                } else {
-                    result.setSetValueRecordType(MesExtEnumUtil.SPOT_VALUE_RECORD_TYPE.ARTIFICIAL_INPUT.getValue());
                 }
+//                else {
+//                    result.setSetValueRecordType(MesExtEnumUtil.SPOT_VALUE_RECORD_TYPE.ARTIFICIAL_INPUT.getValue());
+//                }
                 //获取实际值地址数据
                 if (realMap.containsKey(result.getRealEquipVariableId())) {
                     String value = realMap.get(result.getRealEquipVariableId()).get(0).getEquipVariableValue();