From 3bf8bf5d77a633e7541b4815d9a64aed9058654e Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Thu, 8 May 2025 15:20:45 +0800
Subject: [PATCH] 20250508

---
 .../controller/DailyPlanController.java       |  5 +
 .../service/ReworkRecordService.java          |  3 +
 .../service/impl/ReworkRecordServiceImpl.java |  6 ++
 .../mapper/production/DailyPlanMapper.xml     | 94 +++++++++++--------
 .../mapper/production/ReworkRecordMapper.xml  | 26 +++--
 .../mapper/taskmanage/TaskDatailDao.xml       | 14 +--
 6 files changed, 93 insertions(+), 55 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 3ceab27..66afab4 100644
--- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
+++ b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
@@ -1144,4 +1144,9 @@ public class DailyPlanController {
         reworkRecordService.cancelRework(reworkRecord);
         return R.ok("操作成功");
     }
+    @PostMapping("/operator")
+    public R queryOperator(@RequestBody ReworkRecord reworkRecord){
+        List<OperatorData> list = reworkRecordService.queryOperator(reworkRecord);
+        return R.ok().put("rows",list);
+    }
 }
diff --git a/src/main/java/com/heai/modules/production/service/ReworkRecordService.java b/src/main/java/com/heai/modules/production/service/ReworkRecordService.java
index 4462c97..c591367 100644
--- a/src/main/java/com/heai/modules/production/service/ReworkRecordService.java
+++ b/src/main/java/com/heai/modules/production/service/ReworkRecordService.java
@@ -1,6 +1,7 @@
 package com.heai.modules.production.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.heai.modules.production.entity.OperatorData;
 import com.heai.modules.production.entity.ReworkRecord;
 import com.heai.modules.production.entity.ReworkRecordData;
 
@@ -28,4 +29,6 @@ public interface ReworkRecordService extends IService<ReworkRecord> {
     void removeRework(ReworkRecord reworkRecord);
 
     void cancelRework(ReworkRecord reworkRecord);
+
+    List<OperatorData> queryOperator(ReworkRecord reworkRecord);
 }
diff --git a/src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java
index 4ce1c8c..43206a9 100644
--- a/src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java
@@ -20,6 +20,7 @@ import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -126,4 +127,9 @@ public class ReworkRecordServiceImpl extends ServiceImpl<ReworkRecordMapper,Rewo
         }
         baseMapper.cancelRework(reworkRecord);
     }
+
+    @Override
+    public List<OperatorData> queryOperator(ReworkRecord reworkRecord) {
+        return baseMapper.queryOperator(reworkRecord);
+    }
 }
diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml
index 8a574af..3a219e4 100644
--- a/src/main/resources/mapper/production/DailyPlanMapper.xml
+++ b/src/main/resources/mapper/production/DailyPlanMapper.xml
@@ -307,69 +307,87 @@
         a.PlanStartDate desc,s.itemNo
     </select>
     <select id="getShopOrderRoutingVPData" resultType="ShopOrderRoutingData">
-         select t.OrderNo as liuhuaOrderNo,t.site,SO.PartNo,dbo.Get_Part_SpecDesc(t.site,T.partno) as liuhuaPartDescSpec,t.partNo as liuhuaPartNo
-        ,Convert(decimal(10,2),isnull(h.OrderQty * d.QtyAssembly / (1 - d.ScraptFactor/100.0),0.0)) as QtyRequired
-        ,h.OrderDate as needDate
-        ,h.orderNo as liuhuaTaskNo
-        ,case when t.Status='已取消' then '已取消' else '' end as erpStatus
-        , so.OrderNo,s.workCenterNo,S.ItemNo,S.OperationDesc,isnull(ROUND(P.NetWeight/1000,5),1) weightFactor,
-        Round(isnull(ROUND(P.NetWeight/1000,5),1)*isnull(h.OrderQty * d.QtyAssembly / (1 - d.ScraptFactor/100.0),0.0),2) weight
-        , isnull(P.spec,'') +'/'+P.PartDescription as partDescription
-        ,s.OperationDesc,s.efficiency,so.RepairSOFlag,dbo.Get_E_OriginalOrderTypeDesc(t.site, t.OrderNo) orderTypeDesc
+        select t.OrderNo                                                                       as liuhuaOrderNo
+             , t.site
+             , SO.PartNo
+             , dbo.Get_Part_SpecDesc(t.site, T.partno)                                         as liuhuaPartDescSpec
+             , t.partNo                                                                        as liuhuaPartNo
+             , Convert(decimal (10, 2),
+                       isnull(h.OrderQty * d.QtyAssembly / (1 - d.ScraptFactor / 100.0), 0.0)) as QtyRequired
+             , h.OrderDate                                                                     as needDate
+             , h.orderNo                                                                       as liuhuaTaskNo
+             , case when t.Status = '已取消' then '已取消' else '' end                         as erpStatus
+             , so.OrderNo
+             , s.workCenterNo
+             , S.ItemNo
+             , S.OperationDesc
+             , isnull(ROUND(P.NetWeight / 1000, 5), 1)                                            weightFactor
+             , Round(isnull(ROUND(P.NetWeight / 1000, 5), 1) *
+                     isnull(h.OrderQty * d.QtyAssembly / (1 - d.ScraptFactor / 100.0), 0.0), 2)   weight
+             , isnull(P.spec, '') + '/' + P.PartDescription                                    as partDescription
+             , s.OperationDesc
+             , s.efficiency
+             , so.RepairSOFlag
+             , dbo.Get_E_OriginalOrderTypeDesc(t.site, t.OrderNo)                                 orderTypeDesc
 
         from SOTaskOrderHeader as h
-        left join ShopOrder as t on  h.Site=t.Site and h.OrderRef1=t.OrderNo   ---硫化的订单t
-        left join ShopOrder as SO on t.site=SO.Site and t.orderNo=SO.Prelev_order_no and t.E_OriginalOrderType=SO.E_OriginalOrderType
-        and (SO.PartNo like 'VP%')  -----so是vp订单
-        left join SOBOM as d on  t.Site=D.Site and T.OrderNo=D.OrderNo and D.ComponentPartNo =SO.PartNo
-        LEFT JOIN SORouting S on S.site=SO.site and S.OrderNo=SO.OrderNo
-        left join user_work_center uwc on s.site=uwc.site and s.workCenterNo =uwc.WorkCenterNo and uwc.userId= 'admin'
-        left join part P on so.site=p.site and so.partNo=p.partNo
-
-        left join SOTask_VPSchedule SV on h.site=SV.site and h.OrderNo=SV.TaskOrderNo and s.itemNo=sv.itemNo and so.orderNo=SV.orderNo
-         <where>
+                 left join ShopOrder as t on h.Site = t.Site and h.OrderRef1 = t.OrderNo ---硫化的订单t
+                 left join ShopOrder as SO on t.site = SO.Site and t.orderNo = SO.Prelev_order_no and
+                                              t.E_OriginalOrderType = SO.E_OriginalOrderType
+            and (SO.PartNo like 'VP%') -----so是vp订单
+                 left join SOBOM as d on t.Site = D.Site and T.OrderNo = D.OrderNo and D.ComponentPartNo = SO.PartNo
+                 LEFT JOIN SORouting S on S.site = SO.site and S.OrderNo = SO.OrderNo
+                 left join user_work_center uwc
+                           on s.site = uwc.site and s.workCenterNo = uwc.WorkCenterNo and uwc.userId = 'admin'
+                 left join part P on so.site = p.site and so.partNo = p.partNo
+                 left join SOTask_VPSchedule SV
+                           on h.site = SV.site and h.OrderNo = SV.TaskOrderNo and s.itemNo = sv.itemNo and
+                              so.orderNo = SV.orderNo
+        <where>
             and uwc.WorkCenterNo is not null
-            and h.OrderRefType='生产订单'
-            and t.partNo like 'SP%'
-            and t.Status != '已关闭' and t.Status != '已计划'
+              and h.OrderRefType = '生产订单'
+              and t.partNo like 'SP%'
+              and t.Status != '已关闭' and t.Status != '已计划'
             and h.Status !='已取消' and so.PartNo is not null
 <!--            and isnull(SL.scheduledQty,0) =0-->
             and SV.site is null
-            <if test="startDate1 != null ">
-                AND h.orderDate >=   #{startDate1}
+            <if test="startDate1 != null">
+                AND h.orderDate >= #{startDate1}
             </if>
-            <if test="endDate1 != null ">
-                AND  #{endDate1} >=   h.orderDate
+            <if test="endDate1 != null">
+                AND #{endDate1} >= h.orderDate
             </if>
-           <if test="site != null and site != ''">
+            <if test="site != null and site != ''">
                 AND SO.site = #{site}
             </if>
             <if test="orderNo != null and orderNo != ''">
-                AND SO.OrderNo LIKE  #{orderNo}
+                AND SO.OrderNo LIKE #{orderNo}
             </if>
-                  <if test="partDescription != null and partDescription != ''">
-                AND isnull(P.spec,'') +'/'+P.PartDescription LIKE  #{partDescription}
+            <if test="partDescription != null and partDescription != ''">
+                AND isnull(P.spec, '') +'/'+P.PartDescription LIKE #{partDescription}
             </if>
             <if test="partNo != null and partNo != ''">
-                AND SO.PartNo LIKE  #{partNo}
+                AND SO.PartNo LIKE #{partNo}
             </if>
             <if test="itemNo != null and itemNo != ''">
                 and S.ItemNo = #{itemNo}
             </if>
-              <if test="partDescription != null and partDescription != ''">
-                and P.Spec+'/'+isnull(P.PartDescription,'') like #{partDescription}
+            <if test="partDescription != null and partDescription != ''">
+                and P.Spec+'/'+isnull(P.PartDescription
+                  , '') like #{partDescription}
             </if>
-                <if test="liuhuaTaskNo != null and liuhuaTaskNo != ''">
+            <if test="liuhuaTaskNo != null and liuhuaTaskNo != ''">
                 and h.orderNo like #{liuhuaTaskNo}
             </if>
-                <if test="liuhuaPartNo != null and liuhuaPartNo != ''">
+            <if test="liuhuaPartNo != null and liuhuaPartNo != ''">
                 and t.partNo like #{liuhuaPartNo}
             </if>
-                <if test="liuhuaPartDescSpec != null and liuhuaPartDescSpec != ''">
-                and dbo.Get_Part_SpecDesc(t.site,T.partno) like #{liuhuaPartDescSpec}
+            <if test="liuhuaPartDescSpec != null and liuhuaPartDescSpec != ''">
+                and dbo.Get_Part_SpecDesc(t.site
+                  , T.partno) like #{liuhuaPartDescSpec}
             </if>
         </where>
-        order by   case when dbo.Get_E_OriginalOrderTypeDesc(t.site, t.OrderNo) in ('变更订单','加急订单')  then 1 else 2 end , h.OrderDate ,so.partNo,s.itemNo
+        order by case when dbo.Get_E_OriginalOrderTypeDesc(t.site, t.OrderNo) in ('变更订单', '加急订单') then 1 else 2 end , h.OrderDate ,so.partNo,s.itemNo
     </select>
 <update id="updateSOTaskCombineTime">
     update SOTaskOrderHeader set CombineTime = GetDate() where site=#{site} and orderNo=#{orderNo}
diff --git a/src/main/resources/mapper/production/ReworkRecordMapper.xml b/src/main/resources/mapper/production/ReworkRecordMapper.xml
index dcf1888..44bfc85 100644
--- a/src/main/resources/mapper/production/ReworkRecordMapper.xml
+++ b/src/main/resources/mapper/production/ReworkRecordMapper.xml
@@ -147,17 +147,23 @@
 
     <select id="queryOperator" resultType="com.heai.modules.production.entity.OperatorData">
         select site,
-                     operatorid,
-                     operatorname,
-                     active,
-                     department,
-                     createddate,
-                     passwords,
-                     lineleader,
-                     tv_id
+               operatorid,
+               operatorname,
+               active,
+               department,
+               createddate,
+               passwords,
+               lineleader,
+               tv_id
         from Operator
-        where site = #{site}
-          and OperatorID = #{operatorId}
+        <where>
+            <if test="site != null and site != ''">
+               and site = #{site}
+            </if>
+            <if test="operatorId != null and operatorId != ''">
+                and OperatorID = #{operatorId}
+            </if>
+        </where>
     </select>
 
     <update id="cancelRework">
diff --git a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
index 0717841..159a723 100644
--- a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
+++ b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
@@ -229,14 +229,14 @@
                 </if>
                 <if test="params.summaryType != null and params.summaryType >= 3">
                     T.BatchNo,
-                    max(T.LatestOutDate) as LatestOutDate,
-                    max(T.LatestInDate) as LatestInDate,
-                    max(T.ActiveDate) as ActiveDate,
-                    min(T.ManufactureDate) as ManufactureDate,
-                    max(T.ExpiredDate) as ExpiredDate,
-                    max(T.DemandPartnerType) as DemandPartnerType,
-                    max(T.DemandPartnerName) as DemandPartnerName,
                 </if>
+                max(T.LatestOutDate) as LatestOutDate,
+                max(T.LatestInDate) as LatestInDate,
+                max(T.ActiveDate) as ActiveDate,
+                min(T.ManufactureDate) as ManufactureDate,
+                max(T.ExpiredDate) as ExpiredDate,
+                max(T.DemandPartnerType) as DemandPartnerType,
+                max(T.DemandPartnerName) as DemandPartnerName,
                 min(T.FirstInDate) as FirstInDate,
                 sum(Round(T.QtyOnHand, 3)) as QtyOnHand
         from InventoryStock as T,