From 713ec2424b372cb9b1fb906494a5290a3d32db60 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 29 十二月 2021 23:58:33 +0800
Subject: [PATCH] 博日扫码线
---
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
index 577436e..14262b3 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs"
@@ -7,7 +7,6 @@
using System.Net.Http;
using System.Web.Http;
using WebAPI.Models;
-using SQLHelper;
namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
{
@@ -56,16 +55,15 @@
public static DataSet StockCheckItemList(string sWhere)
{
+ string sql1 = string.Format(@"select * from h_v_Gy_StockCheckItemList");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Gy_StockCheckItemList order by hitemid desc", "h_v_Gy_StockCheckItemList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by hitemid desc", "h_v_Gy_StockCheckItemList");
}
else
{
- string sql1 = "select * from h_v_Gy_StockCheckItemList where 1 = 1 ";
- string sql = sql1 + sWhere + " order by hitemid desc";
+ string sql = sql1 + sWhere + "order by hitemid desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_StockCheckItemList");
-
}
}
#endregion
@@ -258,14 +256,13 @@
[HttpGet]
public object Get_InventoryAnalysisList(string sWhere,string sID)
{
- DataSet ds = new DataSet();
+ DataSet ds;
List<object> list = new List<object>();
- string sql = "";
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql;
try
{
-
- if (sID==null||sID=="")
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sID == null || sID == "")
{
sql = string.Format(@"select k.HBarCode 鏉＄爜,m.HBillNo 鍣ㄥ叿缂栧彿,s.HName 鐩樼偣鏂规,
case when k.HCorrespondentTypeID=1 then '渚涘簲鍟�' when k.HCorrespondentTypeID=2 then '瀹㈡埛' when k.HCorrespondentTypeID=4 then '浠撳簱' end 瀹為檯浣嶇疆绫诲瀷,
@@ -299,9 +296,8 @@
left join Gy_Customer c1 on m.HNowSupID=c1.HItemID
left join Gy_Warehouse w on k.HCorrespondentID=w.HItemID
left join Gy_Warehouse w1 on m.HNowSupID=w1.HItemID
- where " + sWhere+ " and k.HSourceInterID=(select HItemID from Gy_StockCheckItem where HItemID="+sID+") and k.HMakeDate<=(select HEndDate from Gy_StockCheckItem where HItemID="+sID+")");
+ where " + sWhere + " and k.HSourceInterID=(select HItemID from Gy_StockCheckItem where HItemID=" + sID + ") and k.HMakeDate<=(select HEndDate from Gy_StockCheckItem where HItemID=" + sID + ")");
}
- //ds = oCN.RunProcReturn(sql, "Sc_MouldStockBillMain_Temp");
ds = oCN.RunProcReturn(sql, "Sc_MouldStockBillMain_Temp");
list.Add(ds.Tables[0]);
objJsonResult.code = "0";
--
Gitblit v1.9.1