From 56275613ecb69bc70d213e492bff7287047e1db5 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 01 十一月 2021 11:05:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Service/YqnDal.cs | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/WebAPI/Service/YqnDal.cs b/WebAPI/Service/YqnDal.cs
index e60f7ee..06fe816 100644
--- a/WebAPI/Service/YqnDal.cs
+++ b/WebAPI/Service/YqnDal.cs
@@ -10,38 +10,58 @@
public class YqnDal
{
/// <summary>
- /// 鏍规嵁鍗曟嵁鍙锋垨鑰呮祦杞崱鏌ユ壘杩涚珯鍗�
+ /// 鏍规嵁宸ュ簭鍜屾祦杞崱鏌ユ壘杩涚珯鍗�
/// </summary>
/// <param name="billNo"></param>
/// <param name="icmoBillNo"></param>
/// <returns></returns>
- public static Models.M_StationBillMail GetStationInBillMail(string billNo, string icmoBillNo)
+ public static Models.M_StationBillMail GetStationInBillMail(long hProcID, string icmoBillNo)
{
StringBuilder sqlBuilder = new StringBuilder();
sqlBuilder.Append("select top 1 HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationInBillMain where HBillType='3790' ");
- if (!string.IsNullOrEmpty(billNo))
- sqlBuilder.Append(" and HBillNo=@billNo ");
- if (!string.IsNullOrEmpty(icmoBillNo))
- sqlBuilder.Append(" and HICMOBillNo=@icmoBillNo");
- var model = SqlPools.GetInstance("YqnConn").GetModel<Models.M_StationBillMail>(sqlBuilder.ToString(), new { billNo, icmoBillNo });
+ sqlBuilder.Append(" and HProcExchBillNo=@icmoBillNo ");
+ sqlBuilder.Append(" and HProcID=@hProcID");
+ var model = SqlPools.GetInstance("YqnConn").GetModel<Models.M_StationBillMail>(sqlBuilder.ToString(), new { icmoBillNo,hProcID });
return model;
}
/// <summary>
- /// 鏍规嵁鍗曟嵁鍙锋垨鑰呮祦杞崱鏌ユ壘鍑虹珯鍗�
+ /// 鏍规嵁宸ュ簭鍜屾祦杞崱鏌ユ壘鍑虹珯鍗�
/// </summary>
/// <param name="billNo"></param>
/// <param name="icmoBillNo"></param>
/// <returns></returns>
- public static Models.M_StationBillMail GetStationOutBillMail(string billNo, string icmoBillNo)
+ public static Models.M_StationBillMail GetStationOutBillMail(long hProcID, string icmoBillNo)
{
StringBuilder sqlBuilder = new StringBuilder();
sqlBuilder.Append("select top 1 HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationOutBillMain where HBillType in ('3791','4788') ");
- if (!string.IsNullOrEmpty(billNo))
- sqlBuilder.Append(" and HBillNo=@billNo ");
- if (!string.IsNullOrEmpty(icmoBillNo))
- sqlBuilder.Append(" and HICMOBillNo=@icmoBillNo");
- var model = SqlPools.GetInstance("YqnConn").GetModel<Models.M_StationBillMail>(sqlBuilder.ToString(), new { billNo, icmoBillNo });
+ sqlBuilder.Append(" and HProcExchBillNo=@icmoBillNo ");
+ sqlBuilder.Append(" and HProcID=@hProcID");
+ var model = SqlPools.GetInstance("YqnConn").GetModel<Models.M_StationBillMail>(sqlBuilder.ToString(), new { icmoBillNo, hProcID });
return model;
}
+ /// <summary>
+ /// 鏍规嵁娴佷紶鍗″彿鑾峰彇杩涚珯鍗曞垪琛�
+ /// </summary>
+ /// <param name="icBillNo"></param>
+ /// <returns></returns>
+ public static List<Models.M_StationBillMail> GetStationInBillMailList(string icBillNo)
+ {
+ StringBuilder sqlBuilder = new StringBuilder();
+ sqlBuilder.Append("select HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationInBillMain where HBillType='3790' and HProcExchBillNo=@icBillNo");
+ var list = SqlPools.GetInstance("YqnConn").GetModelList<Models.M_StationBillMail>(sqlBuilder.ToString(), new { icBillNo });
+ return list;
+ }
+ /// <summary>
+ /// 鏍规嵁娴佷紶鍗″彿鑾峰彇鍑虹珯鍗曞垪琛�
+ /// </summary>
+ /// <param name="icBillNo"></param>
+ /// <returns></returns>
+ public static List<Models.M_StationBillMail> GetStationOutBillMailList(string icBillNo)
+ {
+ StringBuilder sqlBuilder = new StringBuilder();
+ sqlBuilder.Append("select HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationOutBillMain where HBillType in ('3791','4788') and HProcExchBillNo=@icBillNo");
+ var list = SqlPools.GetInstance("YqnConn").GetModelList<Models.M_StationBillMail>(sqlBuilder.ToString(), new { icBillNo });
+ return list;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1