From ce04dea6414345e9dfe9b26bb6671fd3414e0bea Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期五, 27 二月 2026 14:35:04 +0800
Subject: [PATCH] 新增下模单方法  避免app调用发信息锁表

---
 WebAPI/Controllers/WebAPIController.cs |   52 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index e83bff7..3bfaf2f 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1150,7 +1150,52 @@
             }
         }
 
+        /// <summary>
+        /// 鑾峰彇浠撳簱鍒楄〃  --娣诲姞妯″叿浠撳簱鏉′欢  鐢ㄤ簬鍙煡璇㈡ā鍏蜂粨搴�
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetWarehouseList_Json_MJ")]
+        [HttpGet]
+        public object GetWarehouseList_Json_MJ(string Warehouse, Int64 HOrgID)
+        {
+            sWhere = " Where HStopFlag=0  and HEndFlag=1 and HWarehouseType='妯″叿浠撳簱' and HUSEORGID =" + HOrgID + "";
+            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+            if (Warehouse != "")
+            {
+                sWhere = sWhere + " and ( HNumber like '%" + Warehouse + "%' or HName like '%" + Warehouse + "%'  or HUSEORGID like '%" + Warehouse + "%' ) ";
+            }
 
+            try
+            {
+                WebS.WebService1 oWeb = new WebS.WebService1();
+                ds = oWeb.GetWarehouseList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
 
         /// <summary>
         /// 鑾峰彇浠撲綅鍒楄〃
@@ -1473,7 +1518,7 @@
         /// <returns></returns>
         [Route("Web/GetEmployeeList_Json")]
         [HttpGet]
-        public object GetEmployeeList_Json(string Employee, Int64 HGroupID)
+        public object GetEmployeeList_Json2(string Employee, Int64 HGroupID)
         {
             sWhere = " Where HStopFlag=0  and HEndFlag=1";
             //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
@@ -1492,11 +1537,11 @@
             {
                 if (Employee != "")
                 {
-                    sWhere = " Where HStopFlag=0 and HWHID=" + HGroupID.ToString() + " and ( HNumber like '%" + Employee + "%' or HName like '%" + Employee + "%' ) ";
+                    sWhere = " Where HStopFlag=0 and HGroupID=" + HGroupID.ToString() + " and ( HNumber like '%" + Employee + "%' or HName like '%" + Employee + "%' ) ";
                 }
                 else
                 {
-                    sWhere = " Where HStopFlag=0 and HWHID=" + HGroupID.ToString();
+                    sWhere = " Where HStopFlag=0 and HGroupID=" + HGroupID.ToString();
                 }
             }
             try
@@ -1531,6 +1576,7 @@
             }
         }
 
+       
 
         /// <summary>
         /// 鑾峰彇鐝鍒楄〃

--
Gitblit v1.9.1