Merge remote-tracking branch 'origin/master'

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 {

ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java

@@ -286,6 +286,7 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/img/**", "anon");
         filterChainDefinitionMap.put("/ajax/**", "anon");
         filterChainDefinitionMap.put("/js/**", "anon");
+        filterChainDefinitionMap.put("/profile/**", "anon");
         filterChainDefinitionMap.put("/ruoyi/**", "anon");
         filterChainDefinitionMap.put("/broad/**", "anon");
         filterChainDefinitionMap.put("/swagger-ui/**", "anon");

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">