From 715222563ecbf5c3d3e282684466ca604fe124ac Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 13 May 2024 17:47:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8E=A5=E5=8F=A3+bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/system/api/RemoteOpenService.java  |   5 +
 .../op/system/api/domain/dto/WechartDTO.java  | 100 ++++++++++++++++++
 .../factory/RemoteOpenFallbackFactory.java    |   7 ++
 .../mapper/mes/MesReportWorkMapper.xml        |   2 +-
 .../op/open/controller/OpenController.java    |   6 ++
 .../java/com/op/open/service/OpenService.java |   3 +
 .../op/open/service/impl/OpenServiceImpl.java |  18 ++++
 .../service/impl/ProOrderServiceImpl.java     |   2 +-
 8 files changed, 141 insertions(+), 2 deletions(-)
 create mode 100644 op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/WechartDTO.java

diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java
index 74e0b1df..b08684dc 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java
@@ -4,10 +4,12 @@ import com.op.common.core.constant.ServiceNameConstants;
 import com.op.common.core.domain.R;
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.system.api.domain.DataSourcePropertyDTO;
+import com.op.system.api.domain.dto.WechartDTO;
 import com.op.system.api.factory.RemoteOpenFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,4 +45,7 @@ public interface RemoteOpenService {
 
     @PostMapping("/openInterface/removeDatasource")
     public R removeDatasource(@RequestBody DataSourcePropertyDTO dataSourceProperty);
+
+    @PostMapping("/openInterface/sendWeChartMessage")
+    public AjaxResult sendWeChartMessage(@RequestBody List<WechartDTO> wechartDTO);
 }
diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/WechartDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/WechartDTO.java
new file mode 100644
index 00000000..caaabe90
--- /dev/null
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/WechartDTO.java
@@ -0,0 +1,100 @@
+package com.op.system.api.domain.dto;
+
+import com.op.system.api.domain.quality.QcCheckTaskDTO;
+
+import java.util.Date;
+import java.util.List;
+
+public class WechartDTO {
+       private String factory;
+       private String ymd;
+       private String equCode;
+       private String equName;
+       private String productName;
+       private String productCode;
+       private String workorderCodeSap;
+       private Date createTime;
+       private String userId;
+       private String text;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getFactory() {
+            return factory;
+        }
+
+        public void setFactory(String factory) {
+            this.factory = factory;
+        }
+
+        public String getYmd() {
+            return ymd;
+        }
+
+        public void setYmd(String ymd) {
+            this.ymd = ymd;
+        }
+
+        public String getEquCode() {
+            return equCode;
+        }
+
+        public void setEquCode(String equCode) {
+            this.equCode = equCode;
+        }
+
+        public String getEquName() {
+            return equName;
+        }
+
+        public void setEquName(String equName) {
+            this.equName = equName;
+        }
+
+        public String getProductName() {
+            return productName;
+        }
+
+        public void setProductName(String productName) {
+            this.productName = productName;
+        }
+
+        public String getProductCode() {
+            return productCode;
+        }
+
+        public void setProductCode(String productCode) {
+            this.productCode = productCode;
+        }
+
+        public String getWorkorderCodeSap() {
+            return workorderCodeSap;
+        }
+
+        public void setWorkorderCodeSap(String workorderCodeSap) {
+            this.workorderCodeSap = workorderCodeSap;
+        }
+
+        public Date getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(Date createTime) {
+            this.createTime = createTime;
+        }
+
+}
diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java
index 443f8c9e..ec6d37d8 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java
@@ -4,6 +4,7 @@ import com.op.common.core.domain.R;
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.system.api.RemoteOpenService;
 import com.op.system.api.domain.DataSourcePropertyDTO;
+import com.op.system.api.domain.dto.WechartDTO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
 import java.util.Map;
 
 @Component
@@ -55,6 +57,11 @@ public class RemoteOpenFallbackFactory implements FallbackFactory<RemoteOpenServ
             public R removeDatasource(DataSourcePropertyDTO dataSourceProperty) {
                 return R.fail("open数据源删除失败:" + throwable.getMessage());
             }
+
+            @Override
+            public AjaxResult sendWeChartMessage(List<WechartDTO> wechartDTO) {
+                return AjaxResult.error("消息发送失败:" + throwable.getMessage());
+            }
         };
     }
 }
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
index b0b71ccc..b06517c6 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
@@ -723,7 +723,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="getReportRate" resultType="java.math.BigDecimal">
 		select report_rate from base_product
 		where product_code = #{productCode}
-		  and del_flag = '0'
+		  and del_flag = '0' and report_rate !='.00'
 	</select>
 	<select id="getLineProData" resultType="com.op.mes.domain.MesReportWork">
 		select * from(
diff --git a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
index 305a6c3f..bab4d908 100644
--- a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
+++ b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
@@ -11,10 +11,12 @@ import com.op.open.service.OpenService;
 import com.op.system.api.domain.DataSourcePropertyDTO;
 import com.op.system.api.domain.device.EquRepairOrderDTO;
 import com.op.system.api.domain.dto.WCSDTO;
+import com.op.system.api.domain.dto.WechartDTO;
 import com.op.system.api.domain.quality.QcCheckTaskProduceDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Map;
 import com.op.common.core.utils.bean.BeanUtils;
 /**
@@ -205,4 +207,8 @@ public class OpenController extends BaseController {
         return R.ok();
     }
 
+    @PostMapping("/sendWeChartMessage")
+    public AjaxResult sendWeChartMessage(@RequestBody List<WechartDTO> wechartDTO) {
+        return openService.sendWeChartMessage(wechartDTO);
+    }
 }
diff --git a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java
index fc1b6dcb..53a5a1b6 100644
--- a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java
+++ b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java
@@ -4,6 +4,7 @@ import com.op.common.core.domain.R;
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.system.api.domain.device.EquRepairOrderDTO;
 import com.op.system.api.domain.dto.WCSDTO;
+import com.op.system.api.domain.dto.WechartDTO;
 import com.op.system.api.domain.mes.MesReportWorkDTO;
 import com.op.system.api.domain.quality.QcCheckTaskDTO;
 import com.op.system.api.domain.quality.QcCheckTaskProduceDTO;
@@ -38,4 +39,6 @@ public interface OpenService {
     AjaxResult GetHrDeptInfo();
 
     AjaxResult GetHrPostInfo();
+
+    AjaxResult sendWeChartMessage(List<WechartDTO> wechartDTO);
 }
diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
index 645599f9..29811b5b 100644
--- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
+++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
@@ -1,5 +1,6 @@
 package com.op.open.service.impl;
 
+import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
@@ -16,6 +17,7 @@ import com.op.system.api.domain.device.DeviceRepairOrder;
 import com.op.system.api.domain.device.EquRepairOrderDTO;
 import com.op.system.api.domain.dto.WCSDTO;
 import com.op.system.api.domain.dto.WCSDataDTO;
+import com.op.system.api.domain.dto.WechartDTO;
 import com.op.system.api.domain.mes.ProRfidProcessDetail;
 import com.op.system.api.domain.quality.*;
 import org.apache.commons.lang.StringUtils;
@@ -60,6 +62,9 @@ public class OpenServiceImpl implements OpenService {
     @Value("${HR.url_post}")
     private String url_post;
 
+    @Value("${WeChart.url}")
+    private String weChartUrl;
+
     @Autowired
     private OpenMapper openMapper;
 
@@ -501,6 +506,17 @@ public class OpenServiceImpl implements OpenService {
         }
     }
 
+    @Override
+    public AjaxResult sendWeChartMessage(List<WechartDTO> dtos) {
+        try {
+            String result = HttpUtils.sendPost(weChartUrl, JSON.toJSONString(dtos));
+            return success(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return error(e.getMessage());
+        }
+    }
+
 
     protected Boolean oneMinHas(Date lastData){
         if(lastData != null){
@@ -522,6 +538,8 @@ public class OpenServiceImpl implements OpenService {
         return false;
     }
 
+
+
     public static void main(String args[]){
         // 创建两个日期时间对象
         LocalDateTime dateTime1 = LocalDateTime.of(2024, 4, 18, 9, 33); // 2023年1月1日 10:30
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
index 26201d52..1a2bfe57 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
@@ -1101,7 +1101,7 @@ public class ProOrderServiceImpl implements IProOrderService {
 
         List<ProOrderWorkorder> checkOrders = proOrderWorkorderMapper.getOrderByOrders(orderIds);
         if(!CollectionUtils.isEmpty(checkOrders)){
-            if(checkOrders.get(0).equals("o0")){
+            if(checkOrders.get(0).getStatus().equals("o0")){
                 //未拆分，直接关闭订单
                 List<String> allOrderIds = new ArrayList<>();
                 for(ProOrderWorkorder order:checkOrders){