nn

王 垚

2021-12-31 99e41064f7a5ac3f5a70c9d80637318a6e3ee45d

nn

 WebAPI/Controllers/BarCodeController.cs

@@ -1735,6 +1735,35 @@
                return objjson;
            }
        }

        [Route("DeltetBarCodeBill")]
        [HttpGet]
        public object DeltetBarCodeBill(string HInterID, string HUserName)
        {
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            try
            {
                WebAPIController.Add_Log("条码档案删除", HUserName, "条码档案删除");
                oCN.BeginTran();
                //LogService.Write("Delete From Gy_BarCodeBill where HItemID in(" + HInterID + ")") ;
                oCN.RunProc("Delete From Gy_BarCodeBill where HItemID in(" + 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;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/POInStockController.cs

@@ -295,6 +295,8 @@
            ListModels oListModels = new ListModels();
            try
            {
                //获取客户名称
                string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
                DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
                List<Model.ClsCg_POInStockBillMain> lsmain = new List<Model.ClsCg_POInStockBillMain>();
                msg2 = msg2.Replace("\\", "");
@@ -312,7 +314,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 (FCusName == "安瑞医疗") //系统参数  客户定制化名称     空白为通用
                    {
                        if (DBUtility.ClsPub.isStrNull(oItem.HDHDate) == "")
                        {
@@ -362,7 +364,7 @@
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    if (oSystemParameter.omodel.WMS_CampanyName == "安瑞医疗") //系统参数  客户定制化名称     空白为通用
                    if (FCusName == "安瑞医疗") //系统参数  客户定制化名称     空白为通用
                    {
                        if (DBUtility.ClsPub.isStrNull(oItemSub.HBatChNo) == "")
                        {
@@ -621,8 +623,10 @@
                }

                string kdTbaleName = "AIS20211209082932";
                //string kdTbaleName = "AIS20211130140219";//夏宝正式
                
                string sql = string.Format(@"
 SELECT B.HINTERID,c.FID,c.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER  AS FSETTLEORGNUMBER,E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID ,CU.FNUMBER AS FUNITNUMBER FROM 
 SELECT M.HBillNo,B.HINTERID,B.HENTRYID,c.FID,c.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER  AS FSETTLEORGNUMBER,E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID ,CU.FNUMBER AS FUNITNUMBER FROM 
   CG_POINSTOCKBILLSUB B  
 JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
 JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
@@ -654,6 +658,7 @@

                        JObject model = new JObject();
                        model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = "SLD01_SYS" }); //单据类型
                        model.Add("FBILLNO", dr["HBillNo"].ToString()); //单据类型
                        model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //通知日期
                        model.Add("FStockOrgId", new JObject() { ["Fnumber"] = dr["FRECEIVENUMBER"].ToString() }); // 收料组织 
                        model.Add("FPurOrgId", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() }); //采购组织
@@ -678,7 +683,7 @@
                            FentityModel.Add("FSRCENTRYID", item["FENTRYID"].ToString());//源单分录内码
                            FentityModel.Add("FORDERBILLNO", item["FBILLNO"].ToString());//源单单号
                            FentityModel.Add("FPOORDERENTRYID", item["FENTRYID"].ToString());//源单分录内码

                            FentityModel.Add("FSRMENTRYID", item["HENTRYID"].ToString());//SRM hentryid

                            JArray Fentity2 = new JArray();
                            JObject FentityModel2 = new JObject();
@@ -810,7 +815,7 @@

        [Route("DeltetPOInStockBill")]
        [HttpGet]
        public object DeltetPOInStockBill(string HInterID)
        public object DeltetPOInStockBill(string HInterID, string HUserName, string HBillNo)
        {
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            try
@@ -818,9 +823,11 @@
                DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
                //先删除 金蝶数据
                objjson = DeleteKingDee(HInterID);
                if (objJsonResult.code == "0")
                    return objJsonResult;
                
                LogService.Write(objjson.ToString());
                if (objjson.code == "0")
                    return objjson;

                WebAPIController.Add_Log("送货单删除，单号：" + HBillNo, HUserName, "送货单删除");
                oCN.BeginTran();
                oBill.DeleteRelation(ref DBUtility.ClsPub.sExeReturnInfo, Convert.ToInt32(HInterID));
                oCN.RunProc("Delete From Cg_POInStockBillMain where HInterID = " + HInterID);
@@ -868,9 +875,9 @@
                        objjson.data = null;
                        return objjson;
                    }

                    LogService.Write("");
                    var result = InvokeHelper.Delete("PUR_ReceiveBill", JsonConvert.SerializeObject(sJson));
                    //LogService.Write(result);
                    LogService.Write(result);
                    if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                    {
                        objjson.code = "0";

 WebAPI/Controllers/WebAPIController.cs

@@ -181,10 +181,10 @@
                ClsCNSRM oCnLoc = new ClsCNSRM();
                DAL.ClsUser oUser = new DAL.ClsUser();
                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);
                //LogService.Write("测试1："+ DBUtility.ClsPub.sExeReturnInfo);
                string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
                //LogService.Write("测试2：" + DBUtility.ClsPub.sExeReturnInfo);
                LogService.Write(FCusName);
                if (FCusName == "夏宝电器")
                    ds = oUser.CheckMainID(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
                else
@@ -241,12 +241,13 @@
                    return objJsonResult; ;
                }
                //===========
                oDs = oCn.RunProcReturn("select Czmm from  Gy_Czygl where Czymc='" + UserName + "'", "Gy_Czygl");
                LogService.Write("select Czmm from  Gy_Czygl where Czymc='" + UserName + "' and  Czmm = '" + DBUtility.ClsPub.StrToPsd(oldPassword.Trim()) + "'");
                oDs = oCn.RunProcReturn("select Czmm from  Gy_Czygl where Czymc='" + UserName + "' and  Czmm = '" + DBUtility.ClsPub.StrToPsd(oldPassword.Trim()) + "'", "Gy_Czygl");
                if (oDs == null || oDs.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有这个用户，不能修改密码！";
                    objJsonResult.Message = "原密码错误！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }

 WebAPI/InvokeHelper.cs

@@ -26,6 +26,7 @@
            httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc");

            //var loginResult = client.ValidateLogin("61b14ea86f5c8a", "Administrator", "sharbo@2012", 2052); 夏宝备份测试账套
            //var loginResult = client.ValidateLogin("61a5bea53ffc61", "Administrator", "1234.com", 2052);夏宝正式账套
            List<object> Parameters = new List<object>();
            Parameters.Add("61b14ea86f5c8a");//账套标示
            Parameters.Add("Administrator");//用户名