From fac7460490a706d9c0c7505246aee09ed6f0d585 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 14 七月 2021 21:43:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/WebServer.cs | 14 +++++++++++++-
WebAPI/Controllers/ProductInController.cs | 4 ++++
WebAPI/Controllers/POStockInBillController.cs | 2 +-
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index f058753..c428c7d 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -213,7 +213,7 @@
}
else if (HSourceBillType == "1103")
{
- ds = webserver.GetCg_PoInStockBillList(sWhere + " and isnull(HBillSubType,0)=12510 ");
+ ds = webserver.GetCg_PoInStockBillList(sWhere + "");
}
else
{
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 03e4b12..c648fca 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -219,6 +219,10 @@
{
ds = webserver.GetSc_ICMOBillList(sWhere + " ");
}
+ if (HSourceBillType == "3711")
+ {
+ ds = webserver.GetSc_ICMOReportBillList(sWhere + " ");
+ }
else
{
objJsonResult.code = "0";
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index 8ed27bd..c89a8b0 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -4645,7 +4645,19 @@
//DAL.Cls_S_IF_ICMOBill_Lite dal = new DAL.Cls_S_IF_ICMOBill_Lite();
//return dal.DisSourceBillList(sWhere);
}
-
+ /// <summary>
+ /// 杩斿洖鐢熶骇姹囨姤鍗曞垪琛� 婧愬崟
+ /// </summary>
+ /// <param name="sWhere">杩囨护鏉′欢</param>
+ /// <returns></returns>
+ public DataSet GetSc_ICMOReportBillList(string sWhere)
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
+ return oWebs.GetSc_ICMOReportBillList (sWhere);
+ //DAL.Cls_S_IF_ICMOBill_Lite dal = new DAL.Cls_S_IF_ICMOBill_Lite();
+ //return dal.DisSourceBillList(sWhere);
+ }
/// <summary>
/// 鐢熸垚浜у搧鍏ュ簱鍗昁3
--
Gitblit v1.9.1