From dc1ba27d451f990ebdb3f3d56b70ebaeeeeed87e Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 09 十一月 2021 15:03:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-WEBAPI
---
WebAPI/Controllers/POInStockController.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index 4e93d06..c82d080 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -289,12 +289,12 @@
ListModels oListModels = new ListModels();
try
{
- DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
- List<Model.ClsCg_POInStockBillMain> lsmain = new List<Model.ClsCg_POInStockBillMain>();
+ DAL.ClsCg_POInStockBills oBill = new DAL.ClsCg_POInStockBills();
+ List<Model.ClsCg_POInStockBillMains> lsmain = new List<Model.ClsCg_POInStockBillMains>();
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
- lsmain = oListModels.getObjectByJson_POInStockMain(msg2);
- foreach (Model.ClsCg_POInStockBillMain oItem in lsmain)
+ lsmain = oListModels.getObjectByJson_POInStockMains(msg2);
+ foreach (Model.ClsCg_POInStockBillMains oItem in lsmain)
{
//oItem.HMaker = "";
UserName = oItem.HMaker;
@@ -322,10 +322,10 @@
msg3 = msg3.Replace("\\", "");
msg3 = msg3.Replace("\n", ""); //\n
//msg2 = msg2.Replace("'", "鈥�");
- List<Model.ClsCg_POInStockBillSub> ls = new List<Model.ClsCg_POInStockBillSub>();
- ls = oListModels.getObjectByJson_POInStockSub(msg3);
+ List<Model.ClsCg_POInStockBillSubs> ls = new List<Model.ClsCg_POInStockBillSubs>();
+ ls = oListModels.getObjectByJson_POInStockSubs(msg3);
int i = 0;
- foreach (Model.ClsCg_POInStockBillSub oItemSub in ls)
+ foreach (Model.ClsCg_POInStockBillSubs oItemSub in ls)
{
i++;
if (oItemSub.HQty <= 0)
@@ -423,12 +423,12 @@
//鍏朵粬杩囨护
if (msg.Trim() == "")
{
- msg = " Where hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+ msg = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
// msg = " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
}
else
{
- msg = msg + " and hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+ msg = msg + " and hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
// msg = msg + " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
}
//杞崲鐗规畩瀛楃
--
Gitblit v1.9.1