From c9abc7da1c764607e21f3e5ccf80de939a01f311 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 20 四月 2026 13:10:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 47b67a5..875a1cb 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -1007,6 +1007,33 @@
}
#endregion
+ #region 寮傚父鍙嶉鏍规嵁璁惧ID鑾峰彇鏁版嵁
+ [Route("Sc_MESTransFerWorkBill/Get_TransFerBillListByHEquipID")]
+ [HttpGet]
+ public ApiResult<DataSet> Get_TransFerBillListByHEquipID(string HEquipID, string sWhere)
+ {
+ if (string.IsNullOrEmpty(HEquipID))
+ return new ApiResult<DataSet> { code = -1, msg = "璁惧涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = string.Format($@"
+ select c.HNumber 璀︽姤浠ｇ爜,CONVERT(VARCHAR(255), ABS(DATEDIFF(HOUR, a.HMakeDate, a.HUpdateDate))) + '灏忔椂' 鎸佺画鏃堕棿,a.HErrLev 鍘熷洜, a.HDate 鏃堕棿 from h_v_OA_ErrMsgBackBillEdit a
+ left join Gy_EquipFileBillMain b on a.HSourceID = b.HSourceID
+ left join Gy_ErrMsgBackType c on c.HItemID = a.HErrMsgBackTypeID
+ where b.HInterID = {HEquipID}
+ ");
+
+ if (!string.IsNullOrEmpty(sWhere))
+ {
+ sql += sWhere;
+ }
+ var dataSet = oCN.RunProcReturn(sql, "OA_ErrMsgBackBillMain");
+ if (dataSet == null)
+ return new ApiResult<DataSet> { code = -1, msg = "褰撳墠璁惧瀵瑰簲鐨勮鎶ヨ褰曚笉瀛樺湪" };
+
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
#region 寮傚父鍙嶉鍒楄〃缂栬緫鑾峰彇鏁版嵁
[Route("Sc_MESTransFerWorkBill/Get_TransFerBillListCheckDetai")]
[HttpGet]
@@ -8712,7 +8739,18 @@
List<object> columnNameList = new List<object>();
- ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery '" + HStatus + "','" + HBeginDate + "','" + HEndDate + "','" + HSourceID + "','" + user + "'" , "h_p_OA_ErrMsgBackSelfQuery");
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.OA_ErrMsgBackBill_Role == "Y") //绯荤粺鍙傛暟 鏍规嵁瑙掕壊鏌ョ湅瀵瑰簲鐨勫崟鎹繘琛屼笅鎺�
+ {
+ ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_Role '" + HStatus + "','" + HBeginDate + "','" + HEndDate + "','" + HSourceID + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_Role");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery '" + HStatus + "','" + HBeginDate + "','" + HEndDate + "','" + HSourceID + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery");
+ }
+ }
if (ds.Tables[0].Rows.Count != 0 || ds != null)
{
@@ -8766,8 +8804,18 @@
string HEndDate = dic["HEndDate"].ToString();//缁撴潫鏃ユ湡
List<object> columnNameList = new List<object>();
-
- ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_APP '" + HBeginDate + "','" + HEndDate + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_APP");
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.OA_ErrMsgBackBill_Role == "Y") //绯荤粺鍙傛暟 鏍规嵁瑙掕壊鏌ョ湅瀵瑰簲鐨勫崟鎹繘琛屼笅鎺�
+ {
+ ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_APP_Role '" + HBeginDate + "','" + HEndDate + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_APP_Role");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_APP '" + HBeginDate + "','" + HEndDate + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_APP");
+ }
+ }
if (ds.Tables[0].Rows.Count != 0 || ds != null)
{
@@ -8821,14 +8869,14 @@
{
HSourceBill = HSourceBill.Split('-')[0];
//鍗庤垷鍋氭湯浠跺彂璧峰畨鐏殑鏃跺�� 浼犺繃鏉ョ殑鏄嚭绔欏崟鐨勫崟鎹彿
- sql = @"select a.HProcExchInterID 娴佽浆鍗′富鍐呯爜,a.HProcExchEntryID 娴佽浆鍗″瓙鍐呯爜,a.HProcExchBillNo 娴佽浆鍗″彿,a.HSourceID,b.HName 鐢熶骇璧勬簮, c.HNumber 鐗╂枡浠ｇ爜, 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,'') 鐗╂枡浠ｇ爜,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 鐗╂枡浠ｇ爜,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,'') 鐗╂枡浠ｇ爜,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