From 4386ec5e50e45877e38ad535a8e00f74187f4754 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 22 十一月 2024 15:30:49 +0800
Subject: [PATCH] 关键件绑定替换配件码;工资报表(金蝶取值)

---
 WebAPI/Controllers/Pay_ReportController.cs                |   68 ++++++++++++++++++++++
 WebAPI/Controllers/条码管理/WEBSController.cs                 |   11 ++-
 WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs |   62 ++++++++++++++++++++
 3 files changed, 136 insertions(+), 5 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs b/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs
index e1d9db7..67195a9 100644
--- a/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs
@@ -554,5 +554,67 @@
         }
         #endregion
 
+        [Route("Sc_KeyElementBinding/UpdatePartsCode")]
+        [HttpGet]
+        /// <summary>
+        /// 鏇挎崲閰嶄欢鐮佺粦瀹�
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns></returns>
+        public object UpdatePartsCode(string HInterID, string HEntryID, string HPartsCode,string HPartsOld,string HOrgID,string user)
+        {
+            try
+            {
+                if (HInterID == null || HInterID == "" || HInterID == "undefined" || HEntryID == null || HEntryID == "" || HEntryID == "undefined")
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鎿嶄綔澶辫触锛佷富鍐呯爜鎴栧瓙鍐呯爜涓虹┖";
+                    objJsonResult.data = 1;
+                    return objJsonResult;
+                }
+
+                string sql = "exec h_p_Sc_KeyElementBinding_Change '" + HInterID + "','" + HEntryID + "','" + HPartsCode + "','" + HPartsOld + "','" + HOrgID + "','" + user + "'";
+
+                ds = oCN.RunProcReturn(sql, "h_p_Sc_KeyElementBinding_Replace");
+
+                if (ds != null && ds.Tables[0].Rows.Count > 0)
+                {
+                    if (ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) != 0)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+                        objJsonResult.data = "";
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        objJsonResult.code = "1";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+                        objJsonResult.data = ds.Tables[0];
+                        return objJsonResult;
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "";
+                    objJsonResult.data = "娌℃湁杩斿洖鏁版嵁锛�" + sql;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
     }
 }
diff --git a/WebAPI/Controllers/Pay_ReportController.cs b/WebAPI/Controllers/Pay_ReportController.cs
index ac86a0f..a817a58 100644
--- a/WebAPI/Controllers/Pay_ReportController.cs
+++ b/WebAPI/Controllers/Pay_ReportController.cs
@@ -639,5 +639,73 @@
             return objJsonResult;
         }
         #endregion
+
+        #region [宸ヨ祫鎶ヨ〃--閲戣澏鍙栧�糫
+        [Route("Pay_PayrollReportByKD/list")]
+        [HttpGet]
+        public object Pay_PayrollReportByKD(string sWhere, string user)
+        {
+            List<object> columnNameList = new List<object>();
+            try
+            {
+                //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+                if (!DBUtility.ClsPub.Security_Log("Pay_PayrollReportByKD", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (sWhere == null || sWhere == "")
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡璇㈡潯浠讹紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+                string HBeginDate = dic["HBeginDate"].ToString();
+                string HEndDate = dic["HEndDate"].ToString();
+                int HDeptID = int.Parse(dic["HDeptID"].ToString());
+                string HGroupName = dic["HGroupName"].ToString();
+                string HMaterNumber = dic["HMaterNumber"].ToString();
+                string HMaterName = dic["HMaterName"].ToString();
+                string HMaterModel = dic["HMaterModel"].ToString();
+
+                ds = oCN.RunProcReturn("exec h_p_KD_PayrollReport '" + HBeginDate + "','" + HEndDate + "'," + HDeptID + ",'" + HGroupName + "','" + HMaterNumber + "','" + HMaterName + "','" + HMaterModel + "'", "h_p_KD_PayrollReport");
+
+                //ds = oCN.RunProcReturn("select * from h_v_KD_PayrollReport where 1 = 1 " + sWhere, "h_v_KD_PayrollReport");
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = e.Message.ToString();
+                objJsonResult.data = null;
+                objJsonResult.list = columnNameList;
+            }
+            return objJsonResult;
+        }
+        #endregion+
+
     }
 }
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 2d8bc14..82909c1 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -4417,6 +4417,7 @@
                                     FentityModel.Add("F_paez_BaseQty", item["瀹炲彂鏁伴噺"].ToString()); //瀹炲彂鏁伴噺
                                     FentityModel.Add("F_paez_Qty1", item["瀹炴敹鏁伴噺"].ToString()); //瀹炴敹鏁伴噺
                                     FentityModel.Add("F_paez_Text2", item["绠卞彿"].ToString()); //绠卞彿 ???涓嶈兘涓烘暟瀛�
+                                    FentityModel.Add("FLOT", new JObject() { ["FNumber"] = item["鎵瑰彿"].ToString() });  // 杈呰閲忓崟浣嶄唬鐮�
 
 
                                     //JArray Fentity2 = new JArray();
@@ -4457,7 +4458,7 @@
                                 //浠庨厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
                                 if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
                                 {
-                                    oCn.RollBack();
+                                    //oCn.RollBack();
                                     objJsonResult.code = "0";
                                     objJsonResult.count = 0;
                                     objJsonResult.Message = "鍏ュ簱鐢宠鍗曞悓姝ヨ幏鍙栫櫥褰曡处鍙峰瘑鐮佸け璐ワ紒";
@@ -4473,7 +4474,7 @@
                                 if (isSuccess == 0)
                                 {
                                     LogService.Write("鍏朵粬鍏ュ簱,鐧诲綍閲戣澏澶辫触锛�");
-                                    oCn.RollBack();
+                                    //oCn.RollBack();
                                     objJsonResult.code = "0";
                                     objJsonResult.count = 0;
                                     objJsonResult.Message = "鐧诲綍閲戣澏澶辫触锛�";
@@ -4487,7 +4488,7 @@
                                     if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                                     {
                                         LogService.Write("鍏ュ簱鐢宠鍗曞悓姝ラ噾铦朵簯澶辫触锛�" + JsonConvert.SerializeObject(jsonRoot));
-                                        oCn.RollBack();
+                                        //oCn.RollBack();
                                         objJsonResult.code = "0";
                                         objJsonResult.count = 0;
                                         objJsonResult.Message = "鍏ュ簱鐢宠鍗曞悓姝ラ噾铦朵簯澶辫触锛佸崟鍙�:" + HSourceBillNo_TB + result + jsonRoot;
@@ -4511,7 +4512,7 @@
 
                                         if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                                         {
-                                            oCn.RollBack();
+                                            //oCn.RollBack();
                                             objJsonResult.code = "0";
                                             objJsonResult.count = 0;
                                             objJsonResult.Message = "鍏ュ簱鐢宠鍗曞崟鍙�:" + ",鎻愪氦澶辫触" + result1;
@@ -4521,7 +4522,7 @@
 
                                         if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                                         {
-                                            oCn.RollBack();
+                                            //oCn.RollBack();
                                             objJsonResult.code = "0";
                                             objJsonResult.count = 0;
                                             objJsonResult.Message = "鍏ュ簱鐢宠鍗曞崟鍙�:" + ",瀹℃牳澶辫触" + result2;

--
Gitblit v1.9.1