From 0b8efdbce56a9df6eb2ec48dbc75b433e8c14256 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 15 四月 2026 17:04:11 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 2c5d559..875a1cb 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -8869,14 +8869,14 @@
                 {
                     HSourceBill = HSourceBill.Split('-')[0];
                     //鍗庤垷鍋氭湯浠跺彂璧峰畨鐏殑鏃跺�� 浼犺繃鏉ョ殑鏄嚭绔欏崟鐨勫崟鎹彿
-                    sql = @"select a.HProcExchInterID 娴佽浆鍗′富鍐呯爜,a.HProcExchEntryID 娴佽浆鍗″瓙鍐呯爜,a.HProcExchBillNo 娴佽浆鍗″彿,a.HSourceID,b.HName 鐢熶骇璧勬簮, c.HNumber 鐗╂枡浠g爜, c.HName 鐗╂枡鍚嶇О, c.HModel 瑙勬牸鍨嬪彿, a.HPlanQty 璁″垝鏁伴噺
+                    sql = @"SELECT ISNULL(a.HProcExchInterID,0) 娴佽浆鍗′富鍐呯爜,ISNULL(a.HProcExchEntryID,0) 娴佽浆鍗″瓙鍐呯爜,ISNULL(a.HProcExchBillNo,'') 娴佽浆鍗″彿,ISNULL(a.HSourceID,0) HSourceID,ISNULL(b.HName,'') 鐢熶骇璧勬簮,ISNULL(c.HNumber,'') 鐗╂枡浠g爜,ISNULL(c.HName,'') 鐗╂枡鍚嶇О,ISNULL(c.HModel,'') 瑙勬牸鍨嬪彿,ISNULL(a.HPlanQty,0) 璁″垝鏁伴噺,ISNULL(a.HICMOInterID,0) HICMOInterID,ISNULL(a.HICMOEntryID,0) HICMOEntryID,ISNULL(a.HICMOBillNo,'') HICMOBillNo
                             from Sc_StationOutBillMain a  left  join Gy_Source b on a.HSourceID = b.HItemID  left  join Gy_Material c on a.HMaterID = c.HItemID  where a.HBillNo = '" + HSourceBill + "'";
                 }
                 else
                 {
                     //鎶ュ伐鍙颁紶杩囨潵鐨勬槸娴佽浆鍗$殑
-                    sql = "select a.HSourceBillNo 娴佽浆鍗″彿,a.HSourceBillType 娴佽浆鍗$被鍨�,a.HSourceInterID 娴佽浆鍗′富鍐呯爜,a.HSourceEntryID 娴佽浆鍗″瓙鍐呯爜,b.HNumber 鐗╂枡浠g爜,b.HName 鐗╂枡鍚嶇О,b.HModel 瑙勬牸鍨嬪彿,a.HDatePlanQty 璁″垝鏁伴噺,a.HSourceID,c.HName 鐢熶骇璧勬簮 from Sc_ICMOBillStatus_Tmp a " +
-                    "left join Gy_Material b on a.HMaterID=b.HItemID  left join Gy_Source c on a.HSourceID=c.HItemID where HSourceBillNo='" + HSourceBill + "' and a.HICMOStatus=1";
+                    sql = @"SELECT ISNULL(a.HSourceBillNo,'') 娴佽浆鍗″彿,ISNULL(a.HSourceBillType,'') 娴佽浆鍗$被鍨�,ISNULL(a.HSourceInterID,0) 娴佽浆鍗′富鍐呯爜,ISNULL(a.HSourceEntryID,0) 娴佽浆鍗″瓙鍐呯爜,ISNULL(b.HNumber,'') 鐗╂枡浠g爜,ISNULL(b.HName,'') 鐗╂枡鍚嶇О,ISNULL(b.HModel,'') 瑙勬牸鍨嬪彿,ISNULL(a.HDatePlanQty,0) 璁″垝鏁伴噺,ISNULL(a.HSourceID,0) HSourceID,ISNULL(c.HName,'') 鐢熶骇璧勬簮,ISNULL(a.HICMOInterID,0) HICMOInterID,ISNULL(a.HICMOEntryID,0) HICMOEntryID,ISNULL(a.HICMOBillNo,'') HICMOBillNo
+                           from Sc_ICMOBillStatus_Tmp a left join Gy_Material b on a.HMaterID=b.HItemID  left join Gy_Source c on a.HSourceID=c.HItemID where HSourceBillNo='" + HSourceBill + "' and a.HICMOStatus=1";
                 }
                  
                 ds = oCN.RunProcReturn(sql, "Sc_ICMOBillStatus_Tmp");

--
Gitblit v1.9.1