From fcec899a8c6e77ffc8604444496fbfab67381a1c Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 8 May 2023 10:13:13 +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

---
 .../heai/modules/production/dao/AbnormalMapper.java   | 11 +++++++++++
 .../heai/modules/production/entity/SfdcCancel.java    |  3 ++-
 .../production/service/impl/DailyPlanServiceImpl.java |  6 +++---
 .../resources/mapper/production/AbnormalMapper.xml    |  6 +++++-
 .../resources/mapper/production/DailyPlanMapper.xml   |  4 ++--
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/heai/modules/production/dao/AbnormalMapper.java b/src/main/java/com/heai/modules/production/dao/AbnormalMapper.java
index 7c96fc7..65c86c1 100644
--- a/src/main/java/com/heai/modules/production/dao/AbnormalMapper.java
+++ b/src/main/java/com/heai/modules/production/dao/AbnormalMapper.java
@@ -83,4 +83,15 @@ public interface AbnormalMapper {
      * @throw
      */
     List<TaskDetailEntity> getAbnormalUsers(TaskDto taskDto);
+    
+    /**
+     * @Description TODO
+     * @Title getUserSite 
+      * @param userId 
+     * @author rq
+     * @date 2023/4/27 14:01
+     * @return String
+     * @throw
+     */
+    String getUserSite(String userId);
 }
diff --git a/src/main/java/com/heai/modules/production/entity/SfdcCancel.java b/src/main/java/com/heai/modules/production/entity/SfdcCancel.java
index 2011999..b98b555 100644
--- a/src/main/java/com/heai/modules/production/entity/SfdcCancel.java
+++ b/src/main/java/com/heai/modules/production/entity/SfdcCancel.java
@@ -16,6 +16,8 @@ public class SfdcCancel {
     private String operationDesc;
     private Integer seqNo;
     private String partNo;
+    private String partSpec;
+    private String partDesc;
     private String workCenterNo;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -41,7 +43,6 @@ public class SfdcCancel {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date statisticDate;
     private String reverseflag;
-    private String partDesc;
     private Double reportWeight;
     private Double approveWeight;
     private Double moldQty;
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 6a2d511..3e5293b 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
@@ -1076,15 +1076,15 @@ public class DailyPlanServiceImpl implements DailyPlanService {
             Date date=DateUtil.getDateToDate(new Date(),"yyyy-MM-dd");
             // TaskDto taskDto=abnormalMapper.getOriginator();
             TaskDto taskDto=new TaskDto();
-            taskDto.setSite(inData.getSite());
+            taskDto.setSite(abnormalMapper.getUserSite(inData.getFeedbackBy()));
             taskDto.setCreatedBy(inData.getFeedbackBy());
             taskDto.setCustomer(inData.getSeqNo().toString());
             taskDto.setProject("异常反馈");
             taskDto.setFinalStatus("未完成");
             taskDto.setRequiredCompletionDate(date);
             taskDto.setStatus("未受理");
-            taskDto.setTaskDescription(inData.getAbnormalRemark());
-            taskDto.setTaskHeader(abList.get(0).getAbnormalDesc());
+            taskDto.setTaskDescription( inData.getAbnormalRemark());
+            taskDto.setTaskHeader(checkUserSeqNo.get(0).getPartSpec()+" "+abList.get(0).getAbnormalDesc());
             taskDto.setTaskInitiator(taskDto.getCreatedBy());
             taskDto.setTaskStartDate(date);
             List<TaskDetailEntity> taskDetails=abnormalMapper.getAbnormalUsers(taskDto);
diff --git a/src/main/resources/mapper/production/AbnormalMapper.xml b/src/main/resources/mapper/production/AbnormalMapper.xml
index 941a2f3..f8b1a56 100644
--- a/src/main/resources/mapper/production/AbnormalMapper.xml
+++ b/src/main/resources/mapper/production/AbnormalMapper.xml
@@ -79,6 +79,10 @@
         select a.site,a.userId AS responsiblePerson,b.department,#{createdBy} as  CreatedBy,GetDate() as createdDate,'未完成' as finalStatus
         ,'未受理' as status
         FROM AbnormalUser a left join [Users] b on a.userId=b.userID and  a.site=b.site
-         WHERE a.userId!=#{createdBy} and  b.department is not  null
+         WHERE a.userId!=#{createdBy} and  b.department is not  null and a.site=#{site}
+    </select>
+
+    <select id="getUserSite" resultType="String">
+        select site from sys_user where username=#{userId}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml
index c7556d0..9d4039a 100644
--- a/src/main/resources/mapper/production/DailyPlanMapper.xml
+++ b/src/main/resources/mapper/production/DailyPlanMapper.xml
@@ -504,7 +504,7 @@
         order by S_ScheduledDate
     </select>
     <select id="checkUserSeqNo" resultType="SOScheduledRoutingOutData">
-        select seqNo ,CancelReportFlag,a.mat_issueflag,a.site,a.OrderNo,a.ItemNo,a.QtyRequired,a.S_WorkCenterNo,a.operatorId,a.partNo from SOScheduledRouting a
+        select seqNo ,CancelReportFlag,a.mat_issueflag,a.site,a.OrderNo,a.ItemNo,a.QtyRequired,a.S_WorkCenterNo,a.operatorId,a.partNo,dbo.Get_Part_Spec(a.site,a.partNo) PartSpec from SOScheduledRouting a
           left join user_work_center uwc on a.site=uwc.site and a.S_WorkCenterNo =uwc.WorkCenterNo and uwc.userId=#{userId}
           where seqNo=#{seqNo} and uwc.WorkCenterNo is not null
     </select>
@@ -867,7 +867,7 @@
      <select id="getSfdcList" resultType="com.heai.modules.production.entity.SfdcCancel">
             select a.site,a.OrderNo,a.ItemNo ,a.SeqNo,a.WorkCenterNo,a.ReportDate,a.OperatorID,a.ReportQty,a.ApproveQty,a.ReportedManfTime,a.StatisticDate,
         a.AssJobSeqNo,a.Scheduled_ResourceId  ResourceID,b.S_ShiftNo ShiftNo,b.partNo,dbo.Get_ItemDesc(a.site,a.OrderNo,a.ItemNo) operation_desc,c.OperatorName,b.S_ShiftNo ShiftDesc,e.ResourceDesc,Reverseflag
-        ,a.reportWeight,a.approveWeight,a.moldQty,a.stopTime
+        ,a.reportWeight,a.approveWeight,a.moldQty,a.stopTime,dbo.Get_Part_Spec(a.site,b.partNo) partSpec,dbo.Get_PartDesc(a.site,b.partNo) PartDesc
         from sfdc a LEFT JOIN SOScheduledRouting b on a.Site=b.Site and a.AssJobSeqNo=b.SeqNo
         left join Operator c on a.site=c.site and a.OperatorID=c.OperatorID
         left join WorkCenterResource e on a.Site=e.Site and a.Scheduled_ResourceId =e.ResourceID and a.WorkCenterNo=e.WorkCenterNo