From 00d1830a1fb5463968e6961946b73c01ebfd669e Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 19 Nov 2024 14:20:33 +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

---
 .../controller/DailyPlanController.java       |  6 ++++
 .../production/dao/DailyPlanMapper.java       |  2 +-
 .../production/entity/HunlianData.java        | 17 +++++++++
 .../production/service/DailyPlanService.java  |  2 +-
 .../service/impl/DailyPlanServiceImpl.java    |  6 +++-
 .../mapper/production/DailyPlanMapper.xml     | 35 +++++++++++++++++++
 6 files changed, 65 insertions(+), 3 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 16244dd..86f7094 100644
--- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
+++ b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
@@ -826,6 +826,12 @@ public class DailyPlanController {
         PageUtils page  = dailyPlanService.liuhuaIssureAndReport(data);
         return R.ok().put("page", page);
     }
+
+    @PostMapping(value="/shopOrderScheduleIssureAndReport")
+    public R shopOrderScheduleIssureAndReport(@RequestBody HunlianData data) {
+        PageUtils page  = dailyPlanService.shopOrderScheduleIssureAndReport(data);
+        return R.ok().put("page", page);
+    }
     /**
      * @Description TODO
      * @Title getHunlianTaskIssure
diff --git a/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java b/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
index b541c83..098d856 100644
--- a/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
+++ b/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
@@ -738,7 +738,7 @@ public interface DailyPlanMapper {
     List<HunlianData> getHunlianTaskData(HunlianData inData);
     IPage<HunlianData> getHunlianTaskList(Page<HunlianData> page, @Param("query") HunlianData data);
     IPage<HunlianData> liuhuaIssureAndReport(Page<HunlianData> page, @Param("query") HunlianData data);
-
+    IPage<HunlianData> shopOrderScheduleIssureAndReport(Page<HunlianData> page, @Param("query") HunlianData data);
     IPage<ScheduleAbnormalReportData> scheduleAbnormalReport(Page<ScheduleAbnormalReportData> page, @Param("query") ScheduleAbnormalReportData data);
     /**
      * @Description 查混炼明细
diff --git a/src/main/java/com/heai/modules/production/entity/HunlianData.java b/src/main/java/com/heai/modules/production/entity/HunlianData.java
index 5ec0281..d12b6b9 100644
--- a/src/main/java/com/heai/modules/production/entity/HunlianData.java
+++ b/src/main/java/com/heai/modules/production/entity/HunlianData.java
@@ -38,6 +38,9 @@ public class HunlianData extends HunlianTaskHeaderData {
     private Double returnQty;
     private Double returnPercent;
     private Double realQty;
+    private String operationDesc;
+    private Double itemNo;
+
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date sScheduledDate;
@@ -261,5 +264,19 @@ public class HunlianData extends HunlianTaskHeaderData {
         this.realQty = realQty;
     }
 
+    public String getOperationDesc() {
+        return operationDesc;
+    }
+
+    public void setOperationDesc(String operationDesc) {
+        this.operationDesc = operationDesc;
+    }
 
+    public Double getItemNo() {
+        return itemNo;
+    }
+
+    public void setItemNo(Double itemNo) {
+        this.itemNo = itemNo;
+    }
 }
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 8eca516..6851930 100644
--- a/src/main/java/com/heai/modules/production/service/DailyPlanService.java
+++ b/src/main/java/com/heai/modules/production/service/DailyPlanService.java
@@ -605,7 +605,7 @@ public interface DailyPlanService  {
     PageUtils getHunlianTaskList(HunlianData inData);
     PageUtils liuhuaIssureAndReport(HunlianData inData);
 
-
+    PageUtils shopOrderScheduleIssureAndReport(HunlianData inData);
     PageUtils scheduleAbnormalReport(ScheduleAbnormalReportData inData);
     /**
      * @Description 查混炼明细
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 c93025b..cc7ad41 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
@@ -2101,7 +2101,11 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         IPage<HunlianData> resultList = this.dailyPlanMapper.liuhuaIssureAndReport(new Page<HunlianData>(data.getPage(), data.getLimit()), data);
         return new PageUtils(resultList);
     }
-
+    @Override
+    public PageUtils shopOrderScheduleIssureAndReport(HunlianData data){
+        IPage<HunlianData> resultList = this.dailyPlanMapper.shopOrderScheduleIssureAndReport(new Page<HunlianData>(data.getPage(), data.getLimit()), data);
+        return new PageUtils(resultList);
+    }
 
     @Override
     public PageUtils scheduleAbnormalReport(ScheduleAbnormalReportData data){
diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml
index da9fed3..0f00f8b 100644
--- a/src/main/resources/mapper/production/DailyPlanMapper.xml
+++ b/src/main/resources/mapper/production/DailyPlanMapper.xml
@@ -1325,6 +1325,40 @@
         </where>
         ORDER BY a.S_ScheduledDate desc
     </select>
+
+     <select id="shopOrderScheduleIssureAndReport" resultType="com.heai.modules.production.entity.HunlianData">
+     select a.SeqNo,a.operatorId , a.S_ScheduledDate,a.partNo,dbo.Get_Part_SpecDesc(a.Site,a.partNo) partDesc,
+    dbo.Get_OperatorDesc(a.Site,a.operatorId) operatorName,
+    Round( dbo.Get_scheduleIssure(a.Site,a.SeqNo),2) as qtyIssure,Round(a.QtyReported*dbo.Get_PartWeightFactorForReport(a.Site,a.partNo,null),2) as reportWeight,
+    Round(dbo.Get_scheduleIssure(a.Site,a.SeqNo) -a.QtyReported*dbo.Get_PartWeightFactorForReport(a.Site,a.partNo,null),2)  as qty,
+    dbo.Get_ScheduleissurePartNo(a.Site,a.SeqNo) issurePartNo ,dbo.Get_Part_SpecDesc(a.Site,dbo.Get_ScheduleissurePartNo(a.Site,a.SeqNo)) issurePartDesc
+    , case when isnull(a.QtyReported,0)>0 then   Round(dbo.Get_scheduleIssure(a.Site,a.SeqNo) -a.QtyReported*dbo.Get_PartWeightFactorForReport(a.Site,a.partNo,null) *1000/a.QtyReported,2)
+    else null end as realQty ,b.itemNo,b.OperationDesc
+    from SOScheduledRouting a left join SoRouting b on a.site=b.site and a.orderNo=b.OrderNo and a.itemNo=b.itemNo
+
+     <where>
+        and a.scheduleType='生产订单派工单' and a.itemNo=10
+        <if test="query.startDate != null ">
+            and a.S_ScheduledDate >= #{query.startDate}
+        </if>
+        <if test="query.endDate != null ">
+            and #{query.endDate} >= a.S_ScheduledDate
+        </if>
+         and dbo.Get_scheduleIssure(a.Site,a.SeqNo) is not null
+
+         <if test="query.partNo != null and query.partNo != ''">
+            AND a.partNo like  #{query.partNo}
+        </if>
+        <if test="query.sql != null and query.sql != ''">
+            AND ${query.sql}
+        </if>
+
+        <if test="query.seqNo != null ">
+            AND a.seqNo =  #{query.seqNo}
+        </if>
+        </where>
+        ORDER BY a.S_ScheduledDate desc
+    </select>
     <select id="scheduleAbnormalReport" resultType="com.heai.modules.production.entity.ScheduleAbnormalReportData">
        select 工厂编码 site,派工单号 seqNo,开工时间 startWorkDate,报工时间 reportDate,上道报工时间 lastItemReportDate,Round(开工间隔,1) startUseTime,
        Round(生产时间,1) workTime,Round(领料重量,1) issureWeight,Round([48小时报工重量],1) twoDayReport,convert (varchar(50),convert (int,完成率))+'%' approvePercent,备注 remark,
@@ -1494,6 +1528,7 @@
 
         from SOBOM a left join  TransDetail b on a.site=b.site and a.ComponentPartNo=b.PartNo and b.TransNo like 'SI%'
         and OrderRef3=convert(varchar(20),#{seqNo})  and (a.ComponentPartNo like 'RC%' or a.ComponentPartNo like 'SC%' or a.ComponentPartNo like 'VP%' )
+        where a.orderNo=#{orderNo} and a.site=#{site}
         group by a.ComponentPartNo
     </select>
  </mapper>
\ No newline at end of file