From 1ee3430ab9bf5858eb096799bff457fba1fa473e Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Fri, 22 Jul 2022 17:20:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=80=BB=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/broad/MTKController.java     | 4 +++-
 .../src/main/resources/mapper/system/BroadDataMapper.xml  | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MTKController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MTKController.java
index 94cffb8..46e0f49 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MTKController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MTKController.java
@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
@@ -18,7 +19,8 @@ import java.util.List;
  * @author wanghao
  * @date 2022/7/20  10:24
  */
-@Controller("/broad/mtk")
+@Controller()
+@RequestMapping("/broad/mtk")
 @ApiOperation("门体库")
 @ResponseBody
 public class MTKController {
diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
index 182632b..e96406a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@@ -599,8 +599,8 @@ from (
     </select>
 
     <select id="zz_selectInStoreOrderInfo" resultType="com.ruoyi.system.domain.OrderInfo">
-        select ippi.ORDER_NO as plan_code,
-               ippi.IN_QTY as actual_number,
+      select ippi.ORDER_NO as plan_code,
+                po.ACTUAL_QTY as actual_number,
                substr(ippi.MATERIAL_NAME,
                       case
                           when instr(ippi.MATERIAL_NAME, '/', 1, 1) = 0 then 0
@@ -608,11 +608,11 @@ from (
                           end,
                        length(ippi.MATERIAL_NAME)) as name,
                ORDER_QTY as plan_number ,
-               round( ippi.IN_QTY/ORDER_QTY *100,2) as  reat,
+               round(  po.ACTUAL_QTY/ORDER_QTY *100,2) as  reat,
                ippi.CREATION_DATE as day
         from IMOS_PR_PRODUCT_IN ippi
                  left join IMOS.IMOS_PR_ORDER po on ippi.ORDER_NO = po.ORDER_NO
-        where to_char(ippi.CREATION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
+        where to_char(ippi.CREATION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd') and ippi. DELETE_FLAG=0
     </select>
 
     <select id="zz_selectOneBadRateMb" resultType="com.ruoyi.system.domain.BoxOutput">