From eb136095889a1e51db7ddde825284d58d9f46c21 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 8 Sep 2023 10:11:34 +0800
Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../production/controller/DailyPlanController.java        | 2 +-
 .../heai/modules/production/service/DailyPlanService.java | 2 +-
 .../production/service/impl/DailyPlanServiceImpl.java     | 4 +---
 .../resources/mapper/production/SoScheduledListMapper.xml | 8 ++++----
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
index d436184..09fb9a4 100644
--- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
+++ b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
@@ -55,7 +55,7 @@ public class DailyPlanController {
      */
    @PostMapping("/getSchedulingSize")
     public R getSchedulingSize(@RequestBody DailyPlanInData dailyPlanInData){
-       double schedulingSize=dailyPlanService.getSchedulingSize(dailyPlanInData.getOrderNo());
+       double schedulingSize=dailyPlanService.getSchedulingSize(dailyPlanInData);
        return R.ok().put("schedulingSize",schedulingSize);
    }
     /**
diff --git a/src/main/java/com/heai/modules/production/service/DailyPlanService.java b/src/main/java/com/heai/modules/production/service/DailyPlanService.java
index 0d3246a..2e14dfa 100644
--- a/src/main/java/com/heai/modules/production/service/DailyPlanService.java
+++ b/src/main/java/com/heai/modules/production/service/DailyPlanService.java
@@ -32,7 +32,7 @@ public interface DailyPlanService  {
      * @return double
      * @throw
      */
-    double getSchedulingSize(String orderNo);
+    double getSchedulingSize(DailyPlanInData dailyPlanInData);
     /**
      * @Description 保存日计划
      * @Title savePlan
diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
index 17ef64e..8b3dfff 100644
--- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
@@ -52,9 +52,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
     }
 
     @Override
-    public double getSchedulingSize(String orderNo){
-        DailyPlanInData dailyPlanInData=new DailyPlanInData();
-        dailyPlanInData.setOrderNo(orderNo);
+    public double getSchedulingSize(DailyPlanInData dailyPlanInData){
         List<SoScheduledListData> list =soScheduledListMapper.getSoscheduledListData(dailyPlanInData);
         if(list.size()>0) {
             return soScheduledListMapper.getSchedulingSize(dailyPlanInData);
diff --git a/src/main/resources/mapper/production/SoScheduledListMapper.xml b/src/main/resources/mapper/production/SoScheduledListMapper.xml
index cdff3ac..08e82c9 100644
--- a/src/main/resources/mapper/production/SoScheduledListMapper.xml
+++ b/src/main/resources/mapper/production/SoScheduledListMapper.xml
@@ -5,10 +5,10 @@
         select round(isnull(scheduling_size,0),3) from so_scheduled_list
         <where>
             <if test="site != null and site != ''">
-                site=#{site}
+               and  site=#{site}
             </if>
             <if test="orderNo != null and orderNo != ''">
-                order_no=#{orderNo}
+              and  order_no=#{orderNo}
             </if>
         </where>
     </select>
@@ -16,10 +16,10 @@
         select id,order_no,round(scheduling_size,3),site,part_no from so_scheduled_list
         <where>
              <if test="site != null and site != ''">
-                site=#{site}
+              and  site=#{site}
             </if>
             <if test="orderNo != null and orderNo != ''">
-                order_no=#{orderNo}
+               and order_no=#{orderNo}
             </if>
         </where>
     </select>