From dcbb1bd3499f2b90cc2a9457959c1f4dcab714a1 Mon Sep 17 00:00:00 2001
From: ouyangqing <ouyangqing@DESKTOP-B85SG1D>
Date: 星期四, 25 二月 2021 22:41:55 +0800
Subject: [PATCH] 进出站

---
 WebAPI/Controllers/LookingForBillController.cs |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/WebAPI/Controllers/LookingForBillController.cs b/WebAPI/Controllers/LookingForBillController.cs
index 620b90b..8bbba99 100644
--- a/WebAPI/Controllers/LookingForBillController.cs
+++ b/WebAPI/Controllers/LookingForBillController.cs
@@ -14,6 +14,8 @@
         private json objJsonResult = new json();
         public DataSet ds = new DataSet();
         public WebServer webserver = new WebServer();
+
+
         /// <summary>
         /// 鏍规嵁鍖呰鍗� 杩斿洖姝ゅ寘瑁呭崟鍐呯殑鐩稿叧淇℃伅
         /// </summary>
@@ -91,7 +93,7 @@
         }
 
         /// <summary>
-        /// 鏍规嵁閿�鍞鍗� 杩斿洖姝ら攢鍞鍗曞唴鐨勭浉鍏充俊鎭�
+        /// 涓嬫灦鎵捐揣鍗曟牴鎹攢鍞鍗� 杩斿洖姝ら攢鍞鍗曞唴鐨勭浉鍏充俊鎭�
         /// </summary>
         /// <returns></returns>
         [Route("LookingFor/getSellOrderList")]
@@ -100,8 +102,7 @@
         {
             try
             {
-                string sWhere = " Where HSourceBillNo = '" + HSourceBillNo.Trim() + "'";
-                ds = getSellOrderList_s(sWhere);
+                ds = getSellOrderList_s(HSourceBillNo);
                 if (ds == null || ds.Tables[0].Rows.Count <= 0)
                 {
                     objJsonResult.code = "0";
@@ -130,7 +131,7 @@
         }
 
         /// <summary>
-        /// 鏍规嵁瀹炵墿鏉＄爜 杩斿洖鐩稿叧淇℃伅
+        /// 涓婃灦褰掕繕鍗曟牴鎹疄鐗╂潯鐮� 杩斿洖鐩稿叧淇℃伅
         /// </summary>
         /// <returns></returns>
         [Route("LookingFor/getBarCodeDetails")]
@@ -314,6 +315,44 @@
             }
         }
 
+        /// <summary>
+        /// 寰呭彂鍖烘壘璐ф牴鎹簮鍗曞彿 杩斿洖鐩稿叧淇℃伅
+        /// </summary>
+        /// <returns></returns>
+        [Route("LookingFor/getWaitingLookingFor")]
+        [HttpGet]
+        public object GetWaitingLookingFor(string HBillType,string HBillNo,string HSourceBillNo,string HCreateBy,string BenginHCreateDate,string EndHCreateDate)
+        {
+            try
+            {
+                ds = GetWaitingLookingFor_s(HBillType, HBillNo, HSourceBillNo, HCreateBy, BenginHCreateDate, EndHCreateDate);
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+                    objJsonResult.data = ds.Tables[0];
+                    return objJsonResult;
+                }
+            }
+            catch (Exception ex)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
 
         #region sql璇彞
 
@@ -327,8 +366,10 @@
             return new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_Kf_getPackUnionBillListDetailed " + "'" + HBarCode + "'", "h_p_Kf_getPackUnionBillListDetailed");
         }
 
-        public static DataSet getSellOrderList_s(string sWhere)
+        public static DataSet getSellOrderList_s(string HSourceBillNo)
         {
+            new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_IFCLD_ERPSourceBillToLocal_SEOrderToICMO '" + HSourceBillNo+ "'", "h_p_IFCLD_ERPSourceBillToLocal_SEOrderToICMO");
+            string sWhere = " Where HSourceBillNo = '" + HSourceBillNo.Trim() + "'";
             return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_getSellOrderList_s " + sWhere, "h_v_getSellOrderList_s");
         }
 
@@ -341,6 +382,10 @@
         {
             return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_StockPlace " + sWhere, "h_v_IF_StockPlace");
         }
+        public static DataSet GetWaitingLookingFor_s(string HBillType, string HBillNo, string HSourceBillNo,string HCreateBy,string BenginHCreateDate,string EndHCreateDate)
+        {
+            return new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_lookForBillList " + "'" + HBillType + "','" + HBillNo + "','" + HSourceBillNo + "','" + HCreateBy + "','" + HCreateBy + "','" + HCreateBy + "','" + BenginHCreateDate + "','" + EndHCreateDate + "'", "h_p_lookForBillList");
+        }
 
         #endregion
 

--
Gitblit v1.9.1