From a985e84471d68d7bcb886ef96655a9178447884c Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 28 六月 2023 17:03:12 +0800
Subject: [PATCH] 新增其他入库、生产领料、委外出库、分步式调出、分步式调入扫描源单调用方法

---
 WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs |   70 +++++++++++++++++++++++++----------
 1 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs b/WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs
index 50fb796..af2ec3a 100644
--- a/WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs
+++ b/WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs
@@ -29,36 +29,46 @@
         /// </summary>
         [Route("Gy_WorkTypeBill/GetWorkTypelist")]
         [HttpGet]
-        public object GetWorkTypelist(string sWhere)
+        public object GetWorkTypelist(string sWhere,string user)
         {
             try
             {
+                if (!DBUtility.ClsPub.Security_Log("Gy_WorkType", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_Gy_WorkTypeList " + sWhere, "h_v_Gy_WorkTypeList");
+                    ds = oCN.RunProcReturn("select * from h_v_Gy_WorkTypeList  order by 宸ョ浠g爜", "h_v_Gy_WorkTypeList");
                 }
                 else
                 {
                     string sql1 = "select * from h_v_Gy_WorkTypeList where 1 = 1 ";
-                    string sql = sql1 + sWhere;
+                    string sql = sql1 + sWhere+ " order by 宸ョ浠g爜";
                     ds = oCN.RunProcReturn(sql, "h_v_Gy_WorkTypeList");
                 }
-                if (ds == null || ds.Tables[0].Rows.Count == 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "false锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                else
-                {
-                    objJsonResult.code = "1";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "Sucess锛�";
-                    objJsonResult.data = ds.Tables[0];
-                    return objJsonResult;
-                }
+
+                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+                //{
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                return objJsonResult;
+                //}
+                //else
+                //{
+                //objJsonResult.code = "0";
+                //objJsonResult.count = 0;
+                //objJsonResult.Message = "鏃犳暟鎹�";
+                //objJsonResult.data = null;
+                //return objJsonResult;
+                //}
             }
             catch (Exception e)
             {
@@ -79,8 +89,17 @@
         /// </summary>
         [Route("Gy_WorkTypeBill/Delete_Json")]
         [HttpGet]
-        public object Delete_Json(string HInterID)
+        public object Delete_Json(string HInterID,string user)
         {
+            if (!DBUtility.ClsPub.Security_Log("Gy_WorkType_Delete", 1, false, user))
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
             //鐢╥d鏌ュ埌璇ュ璞�
             string sql = "select * from Gy_WorkType where HItemID =  "+HInterID;
             ds = oCN.RunProcReturn(sql, "Gy_WorkType");
@@ -161,11 +180,22 @@
             string msg1 = _value.ToString();
             string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
             string msg2 = sArray[0].ToString();
+            string msg3 = sArray[1].ToString();
+            string msg4 = sArray[2].ToString();
 
             ListModels oListModels = new ListModels();
 
             try
             {
+                if (!DBUtility.ClsPub.Security_Log(msg4, 1, false, msg3))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
                 DLL.ClsGy_WorkTypeBill oBill = new DLL.ClsGy_WorkTypeBill();
                 List<Model.ClsGy_WorkType_Model> lsmain = new List<Model.ClsGy_WorkType_Model>();
                 msg2 = msg2.Replace("\\", "");

--
Gitblit v1.9.1