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

yangle

2022-11-02 0c51493aa579b8e58863709b769c7b1d283d2165

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

 WebAPI/Controllers/BarCodeController.cs

@@ -605,7 +605,7 @@
                            }
                            //TM = "B" + TM;
                            TM = "SRM" + "B" + TM;
                          

                            if (HSumQty - HMinQty > 0)
                            {
                                WeiShu = "";
@@ -955,8 +955,8 @@
                                WeiShu = "尾数";
                                HMinQty = HSumQty - (HBQty - 1) * HMinQty;
                            }
                            TM = $"{oItemSub.HMaterID}#{HMinQty}";
                            //TM = $"{oItemSub.HMaterID}";
                            //TM = $"{oItemSub.HMaterID}#{HMinQty}";
                            TM = $"{oItemSub.HMaterID}";
                            Model.ClsGy_BarCodeBill_WMS_Model bar = new Model.ClsGy_BarCodeBill_WMS_Model();
                            bar.HBarCode = TM;
                            bar.HMaterID = oItemSub.HMaterID;
@@ -1335,29 +1335,19 @@
        /// <param name="OnePage"></param>
        /// <returns></returns>
        [Route("GetBarCodeShowList")]
        [HttpGet]
        public object GetBarCodeShowList(string HSupNo, string sqlWhere)
        [HttpPost]
        public object GetBarCodeShowList([FromBody] JObject msg)
        {
            string msg = "";
            string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            try
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                DataSet ds;
                //其他过滤
                if (msg.Trim() == "")
                {
                    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 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() + "^^)";
                }
                //转换特殊字符
                if (Common.SQLtoChange(msg, ref VsWhere, ref PcWhere) == false)
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户=''" + HSupNo.Trim() + "'') " + sqlWhere;

                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
                {
                    objjson.code = "0";
                    objjson.count = 0;

 WebAPI/Controllers/EntrustOrderController.cs

@@ -28,30 +28,18 @@
        /// <param name="OnePage"></param>
        /// <returns></returns>
        [Route("GetEntrustOrderBill")]
        [HttpGet]
        //采购订单列表
        public object GetEntrustOrderBill(string HSupNo, string sqlWhere)
        [HttpPost]
        public object GetEntrustOrderBill([FromBody] JObject msg)
        {
            string msg = "";
            string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            try
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                DataSet ds;
                //其他过滤
                if (msg.Trim() == "")
                {
                    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 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() + "^^)";
                }
                //转换特殊字符
                if (Common.SQLtoChange(msg, ref VsWhere, ref PcWhere) == false)
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
                {
                    objjson.code = "0";
                    objjson.count = 0;

 WebAPI/Controllers/PODemandPlanController.cs

@@ -27,11 +27,11 @@
        /// <param name="OnePage"></param>
        /// <returns></returns>
        [Route("GetPODemandPlanBill")]
        [HttpGet]
        [HttpPost]
        //采购订单列表
        public object GetPODemandPlanBill(string HSupNo, string sqlWhere)
        public object GetPODemandPlanBill([FromBody] JObject msg)
        {
            string msg = "";
            string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            try
            {
                string VsWhere = "";
@@ -39,18 +39,10 @@
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                DataSet ds;
                //其他过滤
                if (msg.Trim() == "")
                {
                    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 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() + "^^)";
                }
               string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
               
                //转换特殊字符
                if (Common.SQLtoChange(msg, ref VsWhere, ref PcWhere) == false)
                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
                {
                    objjson.code = "0";
                    objjson.count = 0;

 WebAPI/Controllers/POInStockBackController.cs

@@ -27,33 +27,20 @@
        /// <param name="OnePage"></param>
        /// <returns></returns>
        [Route("GetPOInStockBackBillList")]
        [HttpGet]
        public object GetPOInStockBackBillList(string HSupNo, string sqlWhere)
        [HttpPost]
        public object GetPOInStockBackBillList([FromBody] JObject msg)
        {
            string msg = "";
            string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            try
            {
                if (msg == null)
                {
                    msg = "";
                }
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                DataSet ds;
                //其他过滤
                if (msg.Trim() == "")
                {
                    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 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() + "^^)";
                }
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户=''" + HSupNo.Trim() + "'') " + sqlWhere;
                //转换特殊字符
                if (Common.SQLtoChange(msg, ref VsWhere, ref PcWhere) == false)
                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
                {
                    return "";
                }

 WebAPI/Controllers/POInStockController.cs

@@ -433,11 +433,11 @@
        /// <param name="OnePage"></param>
        /// <returns></returns>
        [Route("GetPOInStockBill")]
        [HttpGet]
        [HttpPost]
        //送货单列表
        public object GetPOInStockBill(string HSupNo, string sqlWhere)
        public object GetPOInStockBill([FromBody] JObject msg)
        {
            string msg = "";
            string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            try
            {
                string VsWhere = "";
@@ -445,16 +445,10 @@
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                DataSet ds;
                //其他过滤
                if (msg.Trim() == "")
                {
                    msg = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
                }
                else
                {
                    msg = msg + " and   hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
                }
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;

                //转换特殊字符
                if (Common.SQLtoChange(msg, ref VsWhere, ref PcWhere) == false)
                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
                {
                    objjson.code = "0";
                    objjson.count = 0;
@@ -695,6 +689,7 @@
                                    FentityModel.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); //预计到货日期   
                                    FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 计价单位   
                                    FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); //  库存单位   
                                    FentityModel.Add("FStockID", new JObject() { ["Fnumber"] = "BJCK-SH.01.005" }); //  库存单位   
                                    FentityModel.Add("FActReceiveQty", Convert.ToDecimal(item["HQTY"])); // 供应商送货数量（提料计划数量 - 已生成送货单数量）
                                    FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//货主类型
                                    FentityModel.Add("FOwnerID", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() });//货主 

 WebAPI/Controllers/POOrderController.cs

@@ -28,31 +28,21 @@
        /// <param name="OnePage"></param>
        /// <returns></returns>
        [Route("GetPOOrderBill")]
        [HttpGet]
        [HttpPost]
        //采购订单列表
        public object GetPOOrderBill(string HSupNo, string sqlWhere)
        public object GetPOOrderBill([FromBody] JObject msg)
        {
            string msg = "";
            string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
            //string msg = "";
            try
            {
                string VsWhere = "";
                string PcWhere = "";
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                DataSet ds;
                //其他过滤
                if (msg.Trim() == "")
                {
                    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 += " and hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户 =^^" + 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() + "^^)";
                }
                string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 用户 = ^^" + HSupNo.Trim() + "^^) " + sqlWhere;
                //转换特殊字符
                if (Common.SQLtoChange(msg, ref VsWhere, ref PcWhere) == false)
                if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
                {
                    objjson.code = "0";
                    objjson.count = 0;
@@ -63,7 +53,7 @@
                //获取总行数
                //Int64 RowTotal = Common.GetRowTotal("H_v_SRM_POOrderBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
                //获取返回数据
                string sql = "exec H_p_SRM_POOrderBillList '" + PcWhere + "'";
                sql = "exec H_p_SRM_POOrderBillList '" + PcWhere + "'";
                //LogService.WriteAsync(sql);

                ds = oCn.RunProcReturn("exec H_p_SRM_POOrderBillList '" + PcWhere + "'", "H_p_SRM_POOrderBillList");