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

王 垚

2021-11-09 58f5677ff0d81fb5414a46c9f6c81104e01fa0df

 WebAPI/Controllers/POInStockController.cs

@@ -27,7 +27,7 @@
        /// <returns></returns>
        [Route("UpdatePOInStockBillPrintQty")]
        [HttpPost]
        public object UpdatePOInStockBillPrintQty([FromBody]JObject msg)
        public object UpdatePOInStockBillPrintQty([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
@@ -79,8 +79,8 @@
                    objjson.data = null;
                    return objjson;
                }
                string HBillNo,HDate;
                HBillNo = DBUtility.ClsPub.CreateBillCode_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo,true);
                string HBillNo, HDate;
                HBillNo = DBUtility.ClsPub.CreateBillCode_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo, true);
                HDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
                //创建临时表
                DataTable dt = new DataTable();
@@ -238,6 +238,36 @@
                return objjson;
            }
        }

        /// <summary>
        /// 更新物流单号
        /// </summary>
        /// <returns></returns>
        [Route("SavePOInStock")]
        [HttpGet]
        public object SavePOInStock(string HmainId, string HDeliveryNo)
        {
            try
            {
                string sql = $"update　Cg_POInStockBillMain　 set  HDeliveryNo ='{HDeliveryNo}' where HInterID in ({HmainId})";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                oCn.RunProc(sql);

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "操作成功！";
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// 保存送货单
        /// </summary>
@@ -246,7 +276,7 @@
        /// <returns></returns>
        [Route("SaverPOInStock")]
        [HttpPost]
        public object SaverPOInStock([FromBody]JObject msg)
        public object SaverPOInStock([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
@@ -255,19 +285,19 @@
            string msg3 = sArray[1].ToString();


            string UserName="";
            string UserName = "";
            ListModels oListModels = new ListModels();
            try
            {
                DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
                List<Model.ClsCg_POInStockBillMain> lsmain = new List<Model.ClsCg_POInStockBillMain>();
                DAL.ClsCg_POInStockBills oBill = new DAL.ClsCg_POInStockBills();
                List<Model.ClsCg_POInStockBillMains> lsmain = new List<Model.ClsCg_POInStockBillMains>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_POInStockMain(msg2);
                foreach (Model.ClsCg_POInStockBillMain oItem in lsmain)
                lsmain = oListModels.getObjectByJson_POInStockMains(msg2);
                foreach (Model.ClsCg_POInStockBillMains oItem in lsmain)
                {
                    //oItem.HMaker = "";
                    UserName=oItem.HMaker;
                    UserName = oItem.HMaker;
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
@@ -276,7 +306,7 @@
                    oItem.HMainSourceInterID = oItem.HInterID;
                    oItem.HInterID = 0;
                    //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
                    if (DBUtility.ClsPub.isStrNull(oItem.HDHDate)=="")
                    if (DBUtility.ClsPub.isStrNull(oItem.HDHDate) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
@@ -285,24 +315,24 @@
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                }             
                }
                //表体数据
                //按 },{来拆分数组 //去掉【和】
                msg3 = msg3.Substring(1, msg3.Length - 2);
                msg3 = msg3.Replace("\\", "");
                msg3 = msg3.Replace("\n", "");  //\n
                //msg2 = msg2.Replace("'", "’");
                List<Model.ClsCg_POInStockBillSub> ls = new List<Model.ClsCg_POInStockBillSub>();
                ls = oListModels.getObjectByJson_POInStockSub(msg3);
                List<Model.ClsCg_POInStockBillSubs> ls = new List<Model.ClsCg_POInStockBillSubs>();
                ls = oListModels.getObjectByJson_POInStockSubs(msg3);
                int i = 0;
                foreach (Model.ClsCg_POInStockBillSub oItemSub in ls)
                foreach (Model.ClsCg_POInStockBillSubs oItemSub in ls)
                {
                    i++;
                    if (oItemSub.HQty<=0)
                    if (oItemSub.HQty <= 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！第"+ i.ToString()+"行数量不大于0无法保存！";
                        objJsonResult.Message = "保存失败！第" + i.ToString() + "行数量不大于0无法保存！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
@@ -314,7 +344,7 @@
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    if (DBUtility.ClsPub.isStrNull(oItemSub.HBatChNo)=="")
                    if (DBUtility.ClsPub.isStrNull(oItemSub.HBatChNo) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
@@ -329,7 +359,7 @@
                    oItemSub.HCloseMan = "";
                    oItemSub.HCloseType = false;
                    oBill.DetailColl.Add(oItemSub);
                    

                }
                //保存前判断(单据号重复，笔录项目)
                //保存
@@ -393,12 +423,12 @@
                //其他过滤
                if (msg.Trim() == "")
                {
                    msg = " Where hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
                    msg = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
                    // msg = " Where   hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
                }
                else
                {
                    msg = msg + " and   hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
                    msg = msg + " and   hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
                    // msg = msg + " Where   hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
                }
                //转换特殊字符
@@ -414,6 +444,7 @@
                Int64 RowTotal = Common.GetRowTotal("H_v_SRM_POInStockBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
                //获取返回数据
                ds = oCn.RunProcReturn("exec H_p_SRM_POInStockBillList '" + PcWhere + "'", "H_p_SRM_POInStockBillList");
                LogService.Write("exec H_p_SRM_POInStockBillList '" + PcWhere + "'");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objjson.code = "0";