From 9e841f9489bf21c59e76b1722e5a90d5a6d8c971 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期二, 19 一月 2021 23:52:53 +0800
Subject: [PATCH] nothing
---
WebAPI/Service/YqnQbService.cs | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Service/YqnQbService.cs b/WebAPI/Service/YqnQbService.cs
index 087f849..9161006 100644
--- a/WebAPI/Service/YqnQbService.cs
+++ b/WebAPI/Service/YqnQbService.cs
@@ -91,6 +91,8 @@
{
WebS.WebService1 oWebs = new WebS.WebService1();
string sErrMsg = string.Empty;
+ oMain.HYear = 2021;
+ oMain.HPeriod = 1;
var result = oWebs.set_SaveStationInBill(oMain, ref sErrMsg);
if (!result)
{
@@ -101,14 +103,54 @@
/// <summary>
/// 鍑虹珯鎺ユ敹鍗�
/// </summary>
- public static ApiResult SetStationOutBill(Model.ClsSc_StationOutBillMain omodel)
+ public static ApiResult SetStationOutBill(StationOutBillView omodel)
{
WebS.WebService1 oWebs = new WebS.WebService1();
+ omodel.HYear = 2021;
+ omodel.HPeriod = 1;
string sErrMsg = string.Empty;
var result = SetOutBill(omodel);
return result;
}
+ /// <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 };
+ }
#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();
@@ -124,7 +166,7 @@
public static DataSet GetGroupDb(string sWhere)
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 鐢熶骇鐝粍浠ｇ爜,HName 鐢熶骇鐝粍 from Gy_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source");
+ var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 宸ヤ綔涓績浠ｇ爜,HName 宸ヤ綔涓績 from Gy_WorkCenter where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source");
return dataSet;
}
@@ -146,7 +188,7 @@
return dataSet;
}
private static ConcurrentDictionary<string,string> dicLock=new System.Collections.Concurrent.ConcurrentDictionary<string,string>();//骞跺彂閿�
- public static ApiResult SetOutBill(Model.ClsSc_StationOutBillMain omodel)
+ public static ApiResult SetOutBill(StationOutBillView omodel)
{
try
{
--
Gitblit v1.9.1