From 28dd4b8174c87b0576422db3a366d5c12c146c80 Mon Sep 17 00:00:00 2001
From: ouyangqing <ouyangqing@DESKTOP-B85SG1D>
Date: 星期三, 20 一月 2021 13:10:39 +0800
Subject: [PATCH] Revert "进站单 出战单列表"
---
WebAPI/Service/YqnQbService.cs | 44 +-------------------------------------------
1 files changed, 1 insertions(+), 43 deletions(-)
diff --git a/WebAPI/Service/YqnQbService.cs b/WebAPI/Service/YqnQbService.cs
index 9161006..2d06251 100644
--- a/WebAPI/Service/YqnQbService.cs
+++ b/WebAPI/Service/YqnQbService.cs
@@ -91,8 +91,6 @@
{
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)
{
@@ -106,51 +104,11 @@
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();
@@ -195,7 +153,7 @@
if (!dicLock.TryAdd(omodel.HBillNo, omodel.HBillNo))
return new ApiResult { code = -1, msg = "鏈嶅姟鍣ㄧ箒蹇�" };
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- omodel.HInterID = DBUtility.ClsPub.CreateBillID("3791", ref DBUtility.ClsPub.sExeReturnInfo);
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID("4788", ref DBUtility.ClsPub.sExeReturnInfo);
oCN.BeginTran();
var sql = "Insert Into Sc_StationOutBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
--
Gitblit v1.9.1