From c9e16fa099de3442f005ba9c973de10b7905a963 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期二, 26 一月 2021 15:18:27 +0800
Subject: [PATCH] 增加墙咔工资统计报表、进站单列表删除、出站单列表删除功能
---
WebAPI/Service/YqnQbService.cs | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Service/YqnQbService.cs b/WebAPI/Service/YqnQbService.cs
index 6bbe40e..1cda2af 100644
--- a/WebAPI/Service/YqnQbService.cs
+++ b/WebAPI/Service/YqnQbService.cs
@@ -91,11 +91,11 @@
/// </summary>
public static ApiResult SetStationInBill(ClsSc_StationInBillMain oMain)
{
- if (dicLock.TryAdd(oMain.HICMOBillNo + "jz", ""))//闃叉骞跺彂
+ if (!dicLock.TryAdd(oMain.HICMOBillNo + "jz", ""))//闃叉骞跺彂
return new ApiResult { code = -1, msg = "鏈嶅姟鍣ㄧ箒蹇�" };
try
{
- if (oMain.HProcID == 0 || oMain.HQty == 0 || oMain.HEmpID == 0||string.IsNullOrEmpty(oMain.HICMOBillNo)||string.IsNullOrEmpty(oMain.HProcExchBillNo)||oMain.HQty==0||oMain.HICMOInterID==0||string.IsNullOrEmpty(oMain.HBillNo))
+ if (oMain.HProcID == 0 || oMain.HQty == 0 ||string.IsNullOrEmpty(oMain.HProcExchBillNo)||oMain.HQty==0||string.IsNullOrEmpty(oMain.HBillNo))
return new ApiResult { code = 1, msg = "鍙傛暟涓嶅叏" };
var stationInList = YqnDal.GetStationInBillMailList(oMain.HICMOBillNo);//鑾峰緱璇ユ祦杞崱鎵�鏈夎繘绔欏崟
if (stationInList.Count > 0)
@@ -126,7 +126,7 @@
}
catch (Exception ex)
{
- throw;
+ return new ApiResult { code = -1, msg = "璇锋眰閿欒"+ex.ToString() };
}
finally
{
@@ -153,6 +153,30 @@
public static ApiResult<DataSet> GetStationOutBillList(string sWhere)
{
var dataSet = GetStationOutBill(sWhere);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌鏁版嵁" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ /// <summary>
+ /// 鑾峰彇娴佽浆鍗″垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ public static ApiResult<DataSet> GetPorcessMainList(string sWhere)
+ {
+ var dataSet = GetProcessMain(sWhere);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌鏁版嵁" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ /// <summary>
+ /// 鑾峰彇娴佽浆鍗″瓙琛ㄥ垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ public static ApiResult<DataSet> GetPorcessSubList(int hInterId)
+ {
+ var dataSet = GetProcessSubList(hInterId);
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
return new ApiResult<DataSet> { code = -1, msg = "鏈煡璇㈠埌鏁版嵁" };
return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
@@ -190,6 +214,21 @@
var dataSet = oCN.RunProcReturn(sql, "h_v_MES_StationInBillList");
return dataSet;
}
+ public static DataSet GetProcessSubList(int hInterId)
+ {
+ var sql = "select a.HProcNo 娴佹按鍙�,a.HProcNumber as 宸ュ簭浠ｇ爜,b.HName 宸ュ簭鍚嶇О,c.HName 宸ヤ綔涓績,a.HQty 娴佽浆鍗℃暟閲� from Sc_ProcessExchangeBillSub a left join Gy_Process b on b.HItemID = a.HProcID left join Gy_WorkCenter c on c.HItemID = a.HCenterID where 1=1 and a.HInterID=" + hInterId;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn(sql, "Sc_ProcessExchangeBillSub");
+ return dataSet;
+ }
+ public static DataSet GetProcessMain(string strWhere)
+ {
+ var sql = "select a.HBillNo 鍗曟嵁鍙�, a.HDate 鏃ユ湡, HInterID, a.HICMOBillNo 鐢熶骇璁㈠崟, b.HName 浜у搧鍚嶇О, b.HNumber 浜у搧浠ｇ爜, a.HPlanQty 娴佽浆鍗℃暟閲�, c.HName 鍗曚綅, a.HPlanBeginDate 璁″垝寮�宸ユ棩鏈�, a.HPlanEndDate 璁″垝瀹屽伐鏃ユ湡, a.HRemark 澶囨敞" +
+ " from Sc_ProcessExchangeBillMain a left join Gy_Material b on a.HMaterID = b.HItemID left join Gy_Unit c on c.HItemID = a.HUnitID where 1=1 " + strWhere;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn(sql, "Sc_ProcessExchangeBillMain");
+ return dataSet;
+ }
public static DataSet GetBarCodeDb(string billBarCode)
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
--
Gitblit v1.9.1