Merge remote-tracking branch 'origin/master'

op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCloseOrderQuery.java

@@ -1,9 +1,20 @@
 package com.op.system.api.domain.sap;
 
 
+import java.util.List;
+
 public class SapCloseOrderQuery {
     private String leadOrder;
     private String order;
+    private List<String> orderCodes;
+
+    public List<String> getOrderCodes() {
+        return orderCodes;
+    }
+
+    public void setOrderCodes(List<String> orderCodes) {
+        this.orderCodes = orderCodes;
+    }
 
     public String getLeadOrder() {
         return leadOrder;

op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java

@@ -5,18 +5,14 @@ import com.op.common.core.utils.DateUtils;
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.device.domain.*;
 import com.op.device.mapper.*;
-import com.op.device.domain.EquOperationRecord;
 import com.op.device.domain.EquRepairWorkOrder;
-import com.op.device.domain.MesReportWork;
 import com.op.device.domain.vo.IEquFaultVO;
-import com.op.device.mapper.EquEquipmentMapper;
 import com.op.device.domain.vo.IEquipmentVO;
 import com.op.device.domain.vo.IRepairWorkOrderVO;
 import com.op.device.service.IDeviceInterfaceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -40,11 +36,15 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
     @DS("#header.poolName")
     public AjaxResult getRepairWorkOrder() {
         List<IRepairWorkOrderVO> workOrderVOList = deviceInterfaceMapper.selectEquRepairWorkOrderList();
-        for (IRepairWorkOrderVO orderVO : workOrderVOList) {
-            if (orderVO.getWorkHandle().equals("0")) {
-                orderVO.setWorkHandle("立即");
-            } else {
-                orderVO.setWorkHandle("计划");
+        if(workOrderVOList != null){
+            for (IRepairWorkOrderVO orderVO : workOrderVOList) {
+                if(orderVO.getWorkHandle() != null){
+                    if (orderVO.getWorkHandle().equals("0")) {
+                        orderVO.setWorkHandle("立即");
+                    }
+                }else {
+                    orderVO.setWorkHandle("计划");
+                }
             }
         }
         return success(workOrderVOList);
@@ -140,6 +140,11 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
         //查询所有设备（设备停用的除外）
         // CAST(SUM(CASE WHEN equipment_status = '1' or equipment_status = '3' THEN 1 Else 0 END)*100.00/COUNT(*) as decimal(18,2)) AS intactRate
         EquOperation equipmentIntactRate = deviceInterfaceMapper.getEquipmentIntactRate(equOperation);
+        Double totalEquipment = new Double(equipmentIntactRate.getTotalEquipment());
+        Double operationEquipment = new Double(equipmentIntactRate.getOperationEquipment());
+        Double intactRate = operationEquipment*100/totalEquipment;
+        String douStr = String.format("%.2f", intactRate);
+        equipmentIntactRate.setIntactRate(douStr);
         return success(equipmentIntactRate);
     }
 

op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml

@@ -13,11 +13,10 @@
                wo.work_plan_time     AS "workPlanTime",
                be.equipment_location AS "equipmentLocation"
         from equ_repair_work_order wo
-                 left join base_equipment be
-                           on wo.equipment_code = be.equipment_code
-                 left join equ_team et
-                           on wo.work_team = et.team_code
+        left join base_equipment be on wo.equipment_code = be.equipment_code
+        left join equ_team et on wo.work_team = et.team_code
         where wo.work_status = '0'
+		and wo.del_flag = '0'
     </select>
 
     <select id="selectEquipmentList" parameterType="EquOperation" resultType="com.op.device.domain.vo.IEquipmentVO">
@@ -76,7 +75,7 @@
         where dict_label = 'device_refresh_time'
     </select>
 
-    <!--设备稳定性 MTBF 每日-->
+    <!--设备稳定性 MTBF 年月日-->
     <select id="getMTBFList" parameterType="EquOperation" resultType="com.op.device.domain.EquOperation">
         select
         row_number() over (order by sum(
@@ -108,17 +107,7 @@
         SELECT
         SUM(CASE WHEN equipment_status = '1' or equipment_status = '3' THEN 1 Else 0 END) AS operationEquipment,
         SUM(CASE WHEN equipment_status = '0' or equipment_status = '2' THEN 1 Else 0 END) AS faultEquipment,
-        COUNT(*) AS totalEquipment,
-        (
-        SELECT COUNT(id)
-        FROM equ_operation
-        WHERE '4%' > failure_rate AND CONVERT(date, create_time) = CONVERT(date, GETDATE())
-        )*100 /
-        (
-        SELECT COUNT(id)
-        FROM equ_operation
-        WHERE CONVERT(date, create_time) = CONVERT(date, GETDATE())
-        ) AS intactRate
+        COUNT(*) AS totalEquipment
         FROM base_equipment
         WHERE  del_flag = '0' AND status = '1'
     </select>

op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml

@@ -192,6 +192,7 @@
 		FROM equ_check_item eci
 		left join equ_check_item_detail ecid on eci.item_code = ecid.parent_code
 		where eci.del_flag = '0'
+		order by eci.item_type_name desc
 	</select>
 
     <select id="selectWorkCenter" resultType="com.op.device.domain.WorkCenter">

op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java

@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -234,25 +235,18 @@ public class SapOrderServiceImpl implements SapOrderService {
 
             // 配置传入参数
             JCoParameterList jCoParameterList = func.getImportParameterList();
-            if (StringUtils.isEmpty(sapCloseOrderQuery.getLeadOrder())){
-                return R.fail("母订单号为空");
-            }
-            if (StringUtils.isEmpty(sapCloseOrderQuery.getOrder())){
-                return R.fail("子订单号为空");
-            }
-            //关闭母订单
-             jCoParameterList.setValue("P_AUFNR",sapCloseOrderQuery.getLeadOrder());
-             func.execute(dest);//执行调用函数
-//             JCoParameterList J= func.getExportParameterList();
-//             System.out.println(J);
-             String L_MSG1= func.getExportParameterList().getString("L_MSG");
-             Msg.append(sapCloseOrderQuery.getLeadOrder()+L_MSG1+";");
-
-             //关闭子订单
-            jCoParameterList.setValue("P_AUFNR",sapCloseOrderQuery.getOrder());
-            func.execute(dest);//执行调用函数
-            String L_MSG2= func.getExportParameterList().getString("L_MSG");
-            Msg.append(sapCloseOrderQuery.getOrder()+L_MSG2);
+            if (CollectionUtils.isEmpty(sapCloseOrderQuery.getOrderCodes())){
+                return R.fail("订单集合为空");
+            }
+
+            //关闭订单
+             for(String orderCode:sapCloseOrderQuery.getOrderCodes()){
+                jCoParameterList.setValue("P_AUFNR",orderCode);
+                func.execute(dest);//执行调用函数
+                String L_MSG1= func.getExportParameterList().getString("L_MSG");
+                Msg.append(orderCode+"-"+L_MSG1+";");
+             }
+
             log.info("订单关闭结果"+Msg.toString());
             return R.ok(null,Msg.toString());
         }catch (Exception e){