From 8328b788b11f8550aaff514e0d917490fd6bcb57 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 29 十二月 2021 23:55:00 +0800
Subject: [PATCH] 夏宝登录加组织、单据按照内码排序、必填项判断

---
 WebAPI/Controllers/WebAPIController.cs    |   32 ++++++++++++++++++++++++++++++++
 WebAPI/Controllers/POInStockController.cs |    4 ++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index e23c6b5..55ba2f5 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -312,7 +312,7 @@
                     oItem.HMainSourceInterID = oItem.HInterID;
                     oItem.HInterID = 0;
                     //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
-                    if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟  瀹㈡埛瀹氬埗鍖栧悕绉�     绌虹櫧涓洪�氱敤
+                    if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺鍖荤枟") //绯荤粺鍙傛暟  瀹㈡埛瀹氬埗鍖栧悕绉�     绌虹櫧涓洪�氱敤
                     {
                         if (DBUtility.ClsPub.isStrNull(oItem.HDHDate) == "")
                         {
@@ -362,7 +362,7 @@
                         objJsonResult.data = 1;
                         return objJsonResult;
                     }
-                    if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟  瀹㈡埛瀹氬埗鍖栧悕绉�     绌虹櫧涓洪�氱敤
+                    if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺鍖荤枟") //绯荤粺鍙傛暟  瀹㈡埛瀹氬埗鍖栧悕绉�     绌虹櫧涓洪�氱敤
                     {
                         if (DBUtility.ClsPub.isStrNull(oItemSub.HBatChNo) == "")
                         {
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index a695033..e15b8b0 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -133,6 +133,38 @@
             }
 
         }
+
+        /// <summary>
+        /// 鑾峰彇鐧诲綍椤电粍缁囧垪
+        /// </summary>
+        /// <returns></returns>
+        [Route("GetOrganizations")]
+        [HttpGet]
+        public object GetOrganizations()
+        {
+            try
+            {
+                ClsCN oCn = new ClsCN();
+                DataSet oDs = new DataSet();
+                //==========
+                oDs = oCn.RunProcReturn("select HItemID ID,Hname Name,HStopflag Stopflag from Xt_ORGANIZATIONS", "Xt_ORGANIZATIONS");
+                objjson.code = "1";
+                objjson.count = 1;
+                objjson.Message = "鑾峰彇鎴愬姛锛�";
+                objjson.data = oDs.Tables[0];
+                return objjson; ;
+            }
+            catch (Exception e)
+            {
+
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触锛佸紓甯�" + e.ToString();
+                objjson.data = null;
+                return objjson; ;
+            }
+        }
+
         /// <summary>
         /// 鐧诲綍
         /// </summary>

--
Gitblit v1.9.1