From 8d82a45e05562700b01ec1c1a617ba641a122f7a Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 28 Feb 2024 10:56:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=9A=E5=B1=82=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/domain/sap/SapCloseOrderQuery.java | 11 +++++++ .../sap/service/impl/SapOrderServiceImpl.java | 32 ++++++++----------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCloseOrderQuery.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCloseOrderQuery.java index 11066d7b..eae142ac 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCloseOrderQuery.java +++ b/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 orderCodes; + + public List getOrderCodes() { + return orderCodes; + } + + public void setOrderCodes(List orderCodes) { + this.orderCodes = orderCodes; + } public String getLeadOrder() { return leadOrder; diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java index b407fbdb..4feec40d 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java +++ b/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.ArrayList; import java.util.HashMap; @@ -230,25 +231,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){ From 7f2628410a8478c838e17b7644c6fddb647b8fba Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 28 Feb 2024 11:06:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?2024-2-28=20=E8=AE=BE=E5=A4=87=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=20=E8=AE=BE=E5=A4=87=E5=AE=8C=E5=A5=BD=E7=8E=87?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceInterfaceServiceImpl.java | 5 +++++ .../mapper/device/DeviceInterfaceMapper.xml | 14 ++------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java index ff917fbc..f4078898 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java @@ -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); } diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml index 781de59d..e79b6ece 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml @@ -76,7 +76,7 @@ where dict_label = 'device_refresh_time' - + From 09b59c4d30416006b50999cbfe6ac1dd64912319 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 28 Feb 2024 13:24:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?2024-2-28=20=E8=AE=BE=E5=A4=87=E6=A8=A1?= =?UTF-8?q?=E5=9D=97-=E7=9C=8B=E6=9D=BF-=E7=BB=B4=E4=BF=AE=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=88=A4=E7=A9=BA=E5=A4=84=E7=90=86+=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=B3=BB=E7=BB=9F=E6=B1=87=E6=80=BB=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceInterfaceServiceImpl.java | 14 +++++++++----- .../resources/mapper/device/EquCheckItemMapper.xml | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java index f4078898..7a323b58 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java @@ -40,11 +40,15 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { @DS("#header.poolName") public AjaxResult getRepairWorkOrder() { List 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); diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml index 6166a07a..f6bed226 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml +++ b/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