From 33e13939cf78bde46c2c1be83d6d509b2c074c1a Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 27 Nov 2024 12:09:32 +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

---
 .../app/service/impl/FunctionServiceImpl.java | 10 +--
 .../heai/modules/board/dao/BoardMapper.java   | 10 +++
 .../board/service/impl/BoardServiceImpl.java  | 21 +++++-
 .../service/impl/DailyPlanServiceImpl.java    |  1 +
 .../resources/mapper/board/BoardMapper.xml    | 74 +++++++++++++++++++
 5 files changed, 107 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java b/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java
index 42b6616..88b4d52 100644
--- a/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java
+++ b/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java
@@ -357,10 +357,10 @@ public class FunctionServiceImpl implements FunctionService {
         if(inList.size()==0){
             throw new RuntimeException("没有退库记录明细！");
         }
-        Integer seqNo=Integer.parseInt(inList.get(0).getOrderRef3());
-        //流转单不判断
-        List<SOScheduledRoutingOutData> checkCirculation =dailyPlanMapper.checkCirculation(seqNo);
-        if(checkCirculation.size()==0){
+        // Integer seqNo=Integer.parseInt(inList.get(0).getOrderRef3());
+        //流转单不判断----删除
+        // List<SOScheduledRoutingOutData> checkCirculation =dailyPlanMapper.checkCirculation(seqNo);
+        // if(checkCirculation.size()==0){
             for (int i = 0; i < inList.size(); i++) {
                 TransDetailData getNowIssure=dailyPlanMapper.getNowIssure(inList.get(0).getOrderRef3(),inList.get(i).getPartNo());
                 if(getNowIssure !=null){
@@ -369,7 +369,7 @@ public class FunctionServiceImpl implements FunctionService {
                     }
                 }
             }
-        }
+        // }
 
 
 
diff --git a/src/main/java/com/heai/modules/board/dao/BoardMapper.java b/src/main/java/com/heai/modules/board/dao/BoardMapper.java
index 61617b8..2999d82 100644
--- a/src/main/java/com/heai/modules/board/dao/BoardMapper.java
+++ b/src/main/java/com/heai/modules/board/dao/BoardMapper.java
@@ -162,6 +162,16 @@ public interface BoardMapper {
      * @throw
      */
     List<PackagePrintData> getPackagePrintData(String ip);
+    /**
+     * @Description 打印进料袋装标签
+     * @Title getJLPackagePrintData
+      * @param ip
+     * @author rq
+     * @date 2024/11/27 10:51
+     * @return List<PackagePrintData>
+     * @throw
+     */
+    List<PackagePrintData> getJLPackagePrintData(String ip);
     List<PackagePrintData> getPackagePrintDataList(@Param("seqNo") Integer seqNo, @Param("number") BigDecimal number);
     /**
      * @Description TODO
diff --git a/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java b/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java
index 38d3478..b2b19d8 100644
--- a/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java
+++ b/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java
@@ -472,18 +472,31 @@ public class BoardServiceImpl implements BoardService {
 
     @Override
     public List<PackagePrintData> getPackagePrintData(String ip){
+
+        List<PackagePrintData> result= new ArrayList<>();
+
         List<PrintInfoData> checkPrintData=boardMapper.checkPrintData(ip,"产品标签");
         if(checkPrintData.size()>0) {
-            List<PackagePrintData> result = boardMapper.getPackagePrintData(ip);
+            result = boardMapper.getPackagePrintData(ip);
             if (result.size() > 0) {
                 for (int i = 0; i < result.size(); i++) {
                     boardMapper.updatePrintFlag(result.get(i).getId(), "Y");
                 }
             }
-            return result;
-        }else {
-            return new ArrayList<>();
+
         }
+        List<PrintInfoData> checkJLPrintData=boardMapper.checkPrintData(ip,"进料产品标签");
+        if(checkJLPrintData.size()>0) {
+            List<PackagePrintData> resultJL = boardMapper.getJLPackagePrintData(ip);
+            if (resultJL.size() > 0) {
+                for (int i = 0; i < resultJL.size(); i++) {
+                    result.add(resultJL.get(i));
+                    boardMapper.updatePrintFlag(resultJL.get(i).getId(), "Y");
+                }
+            }
+
+        }
+        return result;
     }
     @Override
     public List<OutBoxPrintData> getOutBoxPrintData(String ip){
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 cc7ad41..5284e78 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
@@ -1638,6 +1638,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         saveData.setsShiftNo(inData.getsShiftNo());
         saveData.setOperatorId(inData.getOperatorId());
         saveData.setJobType(inData.getJobType());
+        saveData.setMatIssueflag("N");
         dailyPlanMapper.closeOldSchedule(inData.getSite(),inData.getSeqNo(),nextSeqNo,inData.getCirculationQty());
         dailyPlanMapper.saveCirculationSchedule(saveData);
     }
diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml
index ea0adcb..b0a6db7 100644
--- a/src/main/resources/mapper/board/BoardMapper.xml
+++ b/src/main/resources/mapper/board/BoardMapper.xml
@@ -304,6 +304,80 @@
                         AND   pi.status='N' and  pi.LabelType like '产品标签%'  AND  ComputerName=#{ip}
         </select>
 
+         <select id="getJLPackagePrintData" resultType="com.heai.modules.production.entity.PackagePrintData">
+          Select
+
+            T.Site,
+
+            T.ReceiptNo+'-'+Convert(Varchar(4),T.ItemNo) as TransNo,
+
+            T.InspectItemNo as ItemNo,
+
+            PD.PartNo,dbo.Get_PartDesc(T.Site,PD.PartNo) as PartDesc,
+
+            dbo.Get_Part_Spec(T.Site,PD.PartNo) as PartSpec,
+
+            dbo.Get_Part_UMID(T.Site,PD.PartNo) as umid ,
+
+            T.InspectItemNo as SeqNo,
+
+            T.Remark,'' as OrderRef4,
+
+            Convert(Datetime,Convert(Integer,Convert(Float,T.InspectDate))) as ReceiveDate,
+
+            '' as SiteName,
+
+            PD.OrderNo as BatchNo,
+
+            T.Inspector as Inspector,
+
+            s.Address_E as siteAdress ,
+
+            'Phone:'+s.PhoneNo+'   Email:'+s.Email as sitePhone,
+
+            convert(varchar(100),isnull(V.TextValue,'')) as bilNote,
+
+            pi.id,
+
+            pi.printQty,
+
+            pi.UnitQty,
+
+            SUBSTRING(LabelType, 5, 10) code,
+
+            pi.KeyInfo_Str1 as keyInfoStr1,
+
+            pi.KeyInfo_Str2 as keyInfoStr2
+
+          from POInspect as T
+
+          left join print_info pi on pi.Site=T.site and pi.status!='Y' and pi.orderRef1=T.ReceiptNo and pi.orderRef2=CONVERT(VARCHAR(10),T.ItemNo )
+
+                        and  pi.orderRef3=CONVERT(VARCHAR(10),T.InspectItemNo)
+
+                        ,POReceiptDetail as PD
+
+         ,Part as P
+
+
+
+          Left Join PartSubPropertiesValue as V
+
+          On P.Site=V.Site and P.PartNo=V.PartNo and P.CodeNo=V.CodeNo and V.SubCodeSeqNo=1 and V.RecordType='P' and V.PropertiesItemNo='BILNOTE'
+
+          ,Site as S
+
+
+
+          Where T.Site=S.SiteID and T.Site=PD.Site and T.ReceiptNo=PD.ReceiptNo and T.ItemNo=PD.ItemNo
+
+          and PD.Site=P.Site and PD.PartNo=P.PartNo
+
+                        AND   pi.status='N' and  pi.LabelType like '进料产品标签%'
+
+                         AND  ComputerName=#{ip}
+         </select>
+
         <select id="getSopAddress" resultType="com.heai.modules.production.entity.TvSopBaseData">
             select tv_id,work_station,now_seqNo,now_operator,PartNo,RevNo,ItemNo,Site,colourFlag from tv_sop_base where tv_id=#{tvId}
         </select>