From 96949649be9af0c267063e9d66c2151237bf5ca9 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 27 Oct 2022 10:10:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=E6=8E=92=E4=BA=A7?=
 =?UTF-8?q?=20=20=E6=97=A5=E8=AE=A1=E5=88=92=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../production/service/DailyPlanService.java     |  1 +
 .../service/impl/PalletServiceImpl.java          |  6 ++++++
 src/main/resources/mapper/base/BoardDao.xml      | 16 ++++++++--------
 .../mapper/production/DailyPlanMapper.xml        |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/letian/modules/production/service/DailyPlanService.java b/src/main/java/com/letian/modules/production/service/DailyPlanService.java
index cc08391..cf48db4 100644
--- a/src/main/java/com/letian/modules/production/service/DailyPlanService.java
+++ b/src/main/java/com/letian/modules/production/service/DailyPlanService.java
@@ -3,6 +3,7 @@ package com.letian.modules.production.service;
 import com.letian.modules.base.entity.*;
 import com.letian.modules.product.entity.PartCheckData;
 import com.letian.modules.production.entity.*;
+import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.text.ParseException;
diff --git a/src/main/java/com/letian/modules/production/service/impl/PalletServiceImpl.java b/src/main/java/com/letian/modules/production/service/impl/PalletServiceImpl.java
index da34447..eeeaffd 100644
--- a/src/main/java/com/letian/modules/production/service/impl/PalletServiceImpl.java
+++ b/src/main/java/com/letian/modules/production/service/impl/PalletServiceImpl.java
@@ -103,6 +103,9 @@ public class PalletServiceImpl implements PalletService {
     }
     @Override
     public  List<PalletFillDetailData> getPalletFillDetailData(PalletFillDetailData inData){
+        if("".equals(inData.getPalletNo())||inData.getPalletNo()==null){
+            return new ArrayList<>();
+        }
         return palletMapper.getPalletFillDetailData(inData);
     }
 
@@ -428,6 +431,9 @@ public class PalletServiceImpl implements PalletService {
         // }
         // return palletMapper.getPalletFillDetailPartData(inData);
         //前面已经判断状态
+        if("".equals(inData.getPalletNo())||inData.getPalletNo()==null){
+            return new ArrayList<>();
+        }
         return palletMapper.getPalletFillDetailWithPartData(inData);
     }
     @Override
diff --git a/src/main/resources/mapper/base/BoardDao.xml b/src/main/resources/mapper/base/BoardDao.xml
index 0482650..495a224 100644
--- a/src/main/resources/mapper/base/BoardDao.xml
+++ b/src/main/resources/mapper/base/BoardDao.xml
@@ -52,14 +52,14 @@
     </select>
 
      <select id="getScheduleListData" resultType="com.letian.modules.base.entity.ScheduleListBoardData">
-     SELECT SR.S_ResourceID as resourceId,WR.ResourceDesc,SO.PartNo,dbo.Get_PartDesc(SR.site,SO.partNo) as partDesc,
-    Round(SUM(SR.QtyRequired),0) as QtyRequired,Round(SUM(SR.QtyApprove),0) as QtyApprove,Round(SUM(SR.QtyReported),0) as QtyReported
-    FROM SOScheduledRouting SR
-    LEFT JOIN WorkCenterResource WR on SR.Site=WR.Site and WR.ResourceID=SR.S_ResourceID
-    LEFT JOIN ShopOrder SO on SR.OrderNo=SO.OrderNo and SR.Site=SO.Site
-    where SR.S_ScheduledDate=#{date}
-    GROUP BY SR.S_ResourceID,SO.PartNo,dbo.Get_PartDesc(SR.site,SO.partNo),WR.ResourceDesc
-    ORDER BY SR.S_ResourceID
+        SELECT SR.S_ResourceID as resourceId,WR.ResourceDesc,SO.PartNo,dbo.Get_PartDesc(SR.site,SO.partNo) as partDesc,
+        Round(SUM(SR.QtyRequired),0) as QtyRequired,Round(SUM(SR.QtyApprove),0) as QtyApprove,Round(SUM(SR.QtyReported),0) as QtyReported
+        FROM SOScheduledRouting SR
+        LEFT JOIN WorkCenterResource WR on SR.Site=WR.Site and WR.ResourceID=SR.S_ResourceID
+        LEFT JOIN ShopOrder SO on SR.OrderNo=SO.OrderNo and SR.Site=SO.Site
+        where SR.S_ScheduledDate=#{date}
+        GROUP BY SR.S_ResourceID,SO.PartNo,dbo.Get_PartDesc(SR.site,SO.partNo),WR.ResourceDesc
+        ORDER BY SR.S_ResourceID
 
     </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 01480f6..59fa23d 100644
--- a/src/main/resources/mapper/production/DailyPlanMapper.xml
+++ b/src/main/resources/mapper/production/DailyPlanMapper.xml
@@ -269,7 +269,7 @@
 
      <!--查询-待生产工单-->
     <select id="getProduceScheduleData" parameterType="SearchScheduleDataNew" resultType="ScheduleDataNew">
-        Select  T.Site site, T.OrderNo orderNo, T.ItemNo itemNo, D.OperationDesc itemDesc, D.PartNo partNo, P.PartDescription partDesc, P.Spec spec,
+        Select  T.Site site, T.OrderNo orderNo, T.ItemNo itemNo, D.OperationDesc itemDesc, D.PartNo partNo, isnull(P.PartDescription,'')+'/'+isnull(P.Spec,'') partDesc, P.Spec spec,
         T.SeqNo seqNo, T.QtyRequired qtyRequired, T.QtyReported qtyReported, T.QtyApprove qtyApprove, ROUND(T.TimeRequired, 3) timeRequired,
         T.TimeReported timeReported, T.PlanStartTime planStartTime, T.PlanFinishTime planFinishTime, T.BarcodeID barcodeId, T.Remark remark,
         T.Crewsize crewSize, T.ClosedFlag closedFlag, T.QtyScrapt qtyScrapt, T.OutWorkFlag outWorkFlag, T.S_ScheduledDate scheduledDate,