优化

王 垚

2022-08-12 c7489d4f0fd834c5ea9a191ea2dd5a392d07bc94

 WebAPI/Controllers/POInStockController.cs

@@ -289,10 +289,6 @@
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            //LogService.Write("msg1:" + msg1);
            //LogService.Write("msg2:" + msg2);
            //LogService.Write("msg3:" + msg3);

            string UserName = "";
            ListModels oListModels = new ListModels();
            try
@@ -372,25 +368,12 @@
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    if (FCusName == "安瑞医疗") //系统参数  客户定制化名称     空白为通用
                    {
                        if (DBUtility.ClsPub.isStrNull(oItemSub.HBatChNo) == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "保存失败！第" + i.ToString() + "行未填写批号！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                    }

                    oItemSub.HEntryID = i;
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HRemark = "";
                    oItemSub.HCloseMan = "";
                    oItemSub.HCloseType = false;
                    oBill.DetailColl.Add(oItemSub);

                }
                //保存前判断(单据号重复，笔录项目)
                //保存
@@ -398,7 +381,6 @@
                bool bResult;
                if (oBill.omodel.HInterID == 0)
                {
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
@@ -474,22 +456,13 @@
                //获取返回数据
                ds = oCn.RunProcReturn("exec H_p_SRM_POInStockBillList '" + PcWhere + "'", "H_p_SRM_POInStockBillList");
                LogService.Write("送货单列表加载sql:exec H_p_SRM_POInStockBillList '" + PcWhere + "'");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取成功，无数据";
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 10000;
                    objjson.Message = "获取成功";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }

                objjson.code = "0";
                objjson.count = 10000;
                objjson.Message = "获取成功";
                objjson.data = ds.Tables[0];
                return objjson;

            }
            catch (Exception e)
            {
@@ -662,6 +635,7 @@
LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID  
 WHERE b.hinterid in ({1}) and M.HERPInterID = 0
", kdTbaleName, HInterID);
                        LogService.Write(sql);
                        //LEFT JOIN  {0}..T_HR_EMPINFO T5 ON D.F_XBKF_BASE1 = T5.FID

                        dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
@@ -1010,7 +984,7 @@

        [Route("DeltetPOInStockBill")]
        [HttpGet]
        public object DeltetPOInStockBill(string HInterID, string HUserName, string HBillNo)
        public object DeltetPOInStockBill(string HInterID, string HUserName)
        {
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            try
@@ -1022,11 +996,16 @@
                if (objjson.code == "0")
                    return objjson;

                WebAPIController.Add_Log("送货单删除", HUserName, "送货单删除，单号：" + HBillNo);
                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);
                string sql = $"select HInterID,HBillNo from Cg_POInStockBillMain where HInterID in ({HInterID})";
                DataTable dt = oCN.RunProcReturn(sql, "deleteTable").Tables[0];
                foreach (DataRow dr in dt.Rows)
                {
                    WebAPIController.Add_Log("送货单删除", HUserName, "送货单删除，单号：" + dr["HBillNo"]);
                    oBill.DeleteRelation(ref DBUtility.ClsPub.sExeReturnInfo, Convert.ToInt32(dr["HInterID"]));
                    oCN.RunProc($"Delete From Cg_POInStockBillMain where HInterID in ({dr["HInterID"]})");
                    oCN.RunProc($"Delete From Cg_POInStockBillSub where HInterID in ({dr["HInterID"]})");
                }
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -1049,54 +1028,69 @@
        public json DeleteKingDee(string hinterid)
        {
            var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");

            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            string sql = string.Format("select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain where HERPInterID>0 and hinterid in (" + hinterid + ")");
            string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
            if (FCusName == "夏宝电器")
                sql = $"select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain t1 join {kdTbaleName}..T_PUR_RECEIVE t2 on t1.HERPInterID = t2.FID where HERPInterID>0 and hinterid in (" + hinterid + ")";
            else if (FCusName.Contains("瑞与祺"))
            else if (FCusName.Contains("瑞与祺") || FCusName == "")
                sql = $"select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain t1 join {kdTbaleName}..T_PUR_RECEIVE t2 on t1.HERPInterID = t2.FID where HERPInterID>0 and hinterid in (" + hinterid + ")";
            DataTable dt = oCN.RunProcReturn(sql, "deleteDt").Tables[0];
            if (dt.Rows.Count > 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;
                    }
                    //LogService.Write("");
                    var result = InvokeHelper.Delete("PUR_ReceiveBill", JsonConvert.SerializeObject(sJson));
                    //LogService.Write("api结果删除：" + 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;
            }
            List<string> HERPInterIdList = new List<string>();
            foreach (DataRow dr in dt.Rows)
            {
                HERPInterIdList.Add(dr["HERPInterID"].ToString());
            }
            var sJson = new
            {
                Ids = string.Join(",", HERPInterIdList)
            };
            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;
            }
            //LogService.Write("");
            var result = InvokeHelper.Delete("PUR_ReceiveBill", JsonConvert.SerializeObject(sJson));
            //LogService.Write("api结果删除：" + result);
            if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
            {
                //var errorsList = JObject.Parse(result)["Result"]["ResponseStatus"]["Errors"];
                //List<string> errList = new List<string>();
                //foreach (var item in errorsList)
                //{
                //    errList.Add(item["Message"].ToString()+ "\r\n");
                //}
                //string err = string.Join(",", errList);
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "对应金蝶收料通知单删除失败 ！\r\n" + result;
                objjson.data = null;
                return objjson;
            }
            objjson.code = "1";
            objjson.count = 1;
            objjson.Message = "Sucess！";
            objjson.data = null;
            return objjson;

        }




        //[Route("POInStockAccept")]
        //[HttpGet]
@@ -1193,7 +1187,6 @@
                objJsonResult.data = null;
                return objJsonResult;
            }

            try
            {
                //采购订单下推生成送货单 时候 判断是否有生成采购订单变更单 如果有且变更单状态不为已审核 限制下推
@@ -1201,27 +1194,27 @@
                if (objJsonResult.code == "0")
                    return objJsonResult;

                string HinterID = "";
                for (int i = 0; i < mylist.Count; i++)
                {
                    //更新关联数量
                    HinterID = mylist[i].ToString();
                    oCn.RunProc("exec h_p_SRM_UpDatePPBomRelationQty '" + HinterID + "'");
                    var HinterID = mylist[i].ToString();
                    oCn.RunProc($"exec h_p_SRM_UpDatePPBomRelationQty {HinterID}");
                    //判断未关联数量是否为0
                    DataSet ds = oCn.RunProcReturn("select *   from H_v_SRM_POOrderBillList where hmainid='" + HinterID + "'", "H_v_SRM_POOrderBillList");
                    if (ds != null || ds.Tables[0].Rows.Count > 0)
                    DataSet ds = oCn.RunProcReturn("select * from H_v_SRM_POOrderBillList where hmainid='" + HinterID + "'", "H_v_SRM_POOrderBillList");
                    DataTable dt = ds.Tables[0];
                    if (dt.Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["未关联数量"].ToString() == "0")
                        DataRow[] dr = dt.Select("未关联数量 = " + 0);
                        if (dr.Count() > 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据号：" + ds.Tables[0].Rows[0]["单据号"].ToString() + "已全部生成送货单！";
                            objJsonResult.Message = "单据号：" + dr[0]["单据号"].ToString() + "未关联数量为0，已全部生成送货单！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "操作成功!";
@@ -1258,7 +1251,7 @@
LEFT JOIN {1}..T_PUR_POORDERENTRY C ON B.HInterID = C.FID AND B.HEntryID = C.FENTRYID
WHERE ISNULL(C.FENTRYID,0) = 0
AND B.HEntryID in ({0})"
, entryids, kdTbaleName);
        , entryids, kdTbaleName);
                DataSet ds = oCn.RunProcReturn(sql, "temp");
                if (ds.Tables[0].Rows.Count > 0)
                {
@@ -1280,7 +1273,7 @@
LEFT join {1}..T_PUR_POCHANGE F ON D.FID = F.FID
where b.HEntryID in ({0})
and F.FDOCUMENTSTATUS <> 'C'"
, entryids, kdTbaleName);
        , entryids, kdTbaleName);
                ds = oCn.RunProcReturn(sql, "temp");
                if (ds.Tables[0].Rows.Count > 0)
                {