关键件绑定替换配件码；工资报表（金蝶取值）

yusijie

2024-11-22 4386ec5e50e45877e38ad535a8e00f74187f4754

关键件绑定替换配件码；工资报表（金蝶取值）

 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;
            }
        }

    }
}

 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));//获取到DataColumn列对象的列名
                }
                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+

    }
}

 WebAPI/Controllers/ÌõÂë¹ÜÀí/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;