Merge branch 'master' of http://101.37.171.70:10101/r/SRM-WEBAPI

YL

2021-12-31 338a7ef46eddc9f2f0f8f40d17a37a9ef4a844bb

Merge branch 'master' of http://101.37.171.70:10101/r/SRM-WEBAPI

 WebAPI/Controllers/POInStockController.cs

@@ -289,7 +289,7 @@
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            


            string UserName = "";
            ListModels oListModels = new ListModels();
@@ -331,7 +331,7 @@
                            return objJsonResult;
                        }
                    }
                  

                    oBill.omodel = oItem;
                }
                //表体数据
@@ -602,12 +602,23 @@

        [Route("AuditPOInStockBill")]
        [HttpGet]
        public object AuditPOInStockBill(string HInterID, string CurUserName)
        public object AuditPOInStockBill(string HInterID, string CurUserName, string HBillNo)
        {
            json objjson = new json();
            try
            {
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                //采购订单 生成送货单列表
                if (!String.IsNullOrEmpty(HBillNo))
                    HInterID = GetHinterIDByBillNo(HBillNo).ToString();
                if (HInterID == "0")
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "操作失败,请先保存订单";
                    objjson.data = null;
                    return objjson;
                }

                string kdTbaleName = "AIS20211209082932";
                string sql = string.Format(@"
@@ -765,6 +776,118 @@
            }

        }
        [Route("GetHinterID")]
        [HttpGet]
        public object GetHinterID(string HBillNo)
        {
            int HinterID = GetHinterIDByBillNo(HBillNo);
            if (HinterID == 0)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "操作失败,请先保存订单";
                objjson.data = HinterID;
                return objjson;
            }
            objjson.code = "1";
            objjson.count = 1;
            objjson.Message = "操作成功";
            objjson.data = HinterID;
            return objjson;
        }

        public int GetHinterIDByBillNo(string HBillNo)
        {
            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
            int HInterID = 0;
            string sql = "select HInterID from CG_POINSTOCKBILLMAIN where HBILLNO = '" + HBillNo + "'";
            DataTable dt = oCn.RunProcReturn(sql, "HInterID").Tables[0];
            if (dt.Rows.Count > 0)
                HInterID = Convert.ToInt32(dt.Rows[0]["HInterID"]);
            return HInterID;
        }


        [Route("DeltetPOInStockBill")]
        [HttpGet]
        public object DeltetPOInStockBill(string HInterID)
        {
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            try
            {
                DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
                //先删除 金蝶数据
                objjson = DeleteKingDee(HInterID);
                if (objJsonResult.code == "0")
                    return objJsonResult;
                
                oCN.BeginTran();
                oBill.DeleteRelation(ref DBUtility.ClsPub.sExeReturnInfo, Convert.ToInt32(HInterID));
                oCN.RunProc("Delete From Cg_POInStockBillMain where HInterID = " + HInterID);
                oCN.RunProc("Delete From Cg_POInStockBillSub where HInterID = " + HInterID);
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        //审核 删除 删除金蝶数据库对应 收料通知到数据
        public json DeleteKingDee(string hinterid)
        {
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            string sql = string.Format("select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain where HERPInterID>0 and hinterid in (" + hinterid + ")");
            DataTable dt = oCN.RunProcReturn(sql, "deleteDt").Tables[0];
            if (dt.Rows.Count > 0)
            {
                foreach (DataRow dr in dt.Rows)
                {
                    var sJson = new
                    {
                        Numbers = dr["HERPBillNO"].ToString(),
                        Ids = ""
                    };
                    var loginRet = InvokeHelper.Login();
                    var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                    if (isSuccess == 0)
                    {
                        objjson.code = "0";
                        objjson.count = 0;
                        objjson.Message = "操作失败,金蝶账号登录异常。" + loginRet;
                        objjson.data = null;
                        return objjson;
                    }

                    var result = InvokeHelper.Delete("PUR_ReceiveBill", JsonConvert.SerializeObject(sJson));
                    //LogService.Write(result);
                    if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                    {
                        objjson.code = "0";
                        objjson.count = 0;
                        objjson.Message = "对应金蝶收料通知单删除失败 ！" + result;
                        objjson.data = null;
                        return objjson;
                    }

                }
            }
            objjson.code = "1";
            objjson.count = 1;
            objjson.Message = "Sucess！";
            objjson.data = null;
            return objjson;
        }

        //[Route("POInStockAccept")]
        //[HttpGet]

 WebAPI/Controllers/WebAPIController.cs

@@ -180,7 +180,15 @@
                DataSet ds = null;
                ClsCNSRM oCnLoc = new ClsCNSRM();
                DAL.ClsUser oUser = new DAL.ClsUser();
                ds = oUser.CheckCzymc(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
                Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
                string sReturn = "测试";
                string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref sReturn);
                //LogService.Write(sReturn);
                //LogService.Write(FCusName);
                if (FCusName == "夏宝电器")
                    ds = oUser.CheckMainID(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
                else
                    ds = oUser.CheckCzymc(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
@@ -776,7 +784,8 @@
                objJsonResult.Message = "返回数据成功！";
                objJsonResult.data = oDs;
            }
            else {
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "返回数据失败！";
@@ -789,17 +798,17 @@
        #region[更改公告状态]
        [Route("UpdateMessage")]
        [HttpGet]
        public object UpdateMessage(string UserName, string HInterID,string HEntryID)
        public object UpdateMessage(string UserName, string HInterID, string HEntryID)
        {
            ClsCNSRM oCn = new ClsCNSRM();
            oCn.BeginTran();
            oCn.RunProc("Update OA_InformBillSub set HReadFlag=1 HUpDater='"+ UserName + "',HUpDateDate=getdate() where HInterID='" + HInterID + "' and HEntryID='"+ HEntryID + "'", ref ClsPub.sExeReturnInfo);
            oCn.RunProc("Update OA_InformBillSub set HReadFlag=1 HUpDater='" + UserName + "',HUpDateDate=getdate() where HInterID='" + HInterID + "' and HEntryID='" + HEntryID + "'", ref ClsPub.sExeReturnInfo);
            oCn.Commit();
            objjson.code = "1";
            objjson.count = 1;
            objjson.Message =ClsPub.sExeReturnInfo;
            objjson.Message = ClsPub.sExeReturnInfo;
            objjson.data = null;
            return objjson;;
            return objjson; ;
        }
        #endregion
    }