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

YL

2021-11-01 d52357b1173b5bba11a9401a909cc776c0cff1d1

 WebAPI/Controllers/POInStockController.cs

@@ -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>
@@ -259,12 +289,12 @@
            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;
@@ -292,10 +322,10 @@
                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)