From abe6630fe280b96b246170adcd6a2f666c77c520 Mon Sep 17 00:00:00 2001
From: ouyangqing <ouyangqing@DESKTOP-B85SG1D>
Date: 星期四, 21 一月 2021 13:17:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/~ouyangqing/YqnApi
---
WebAPI/Service/YqnQbService.cs | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Service/YqnQbService.cs b/WebAPI/Service/YqnQbService.cs
index 3b8e27e..9ec208b 100644
--- a/WebAPI/Service/YqnQbService.cs
+++ b/WebAPI/Service/YqnQbService.cs
@@ -94,9 +94,34 @@
var result = oWebs.set_SaveStationInBill(oMain, ref sErrMsg);
if (!result)
{
+
return new ApiResult { code = -1, msg = sErrMsg };
}
return new ApiResult { code = 1, msg = "鎿嶄綔鎴愬姛" };
+ }
+ /// <summary>
+ /// 鑾峰彇杩涚珯鍗曞垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ public static ApiResult<DataSet> GetStationInBillList(string sWhere)
+ {
+ var dataSet = GetStationInBill(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> 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>
/// 鍑虹珯鎺ユ敹鍗�
@@ -109,6 +134,20 @@
return result;
}
#region sql璇彞
+ public static DataSet GetStationOutBill(string strWhere)
+ {
+ var sql = "Select top 5000 * from h_v_MES_StationOutBillList Where 1=1 " + strWhere;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList");
+ return dataSet;
+ }
+ public static DataSet GetStationInBill(string strWhere)
+ {
+ var sql = "Select top 5000 * from h_v_MES_StationInBillList Where 1=1 " + strWhere;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn(sql, "h_v_MES_StationInBillList");
+ return dataSet;
+ }
public static DataSet GetBarCodeDb(string billBarCode)
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
--
Gitblit v1.9.1