Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API

YL

2021-06-28 345e6bd76ba3ba62117b5128ac25f266812328b9

 WebAPI/Controllers/WebAPIController.cs

@@ -1779,6 +1779,59 @@


        }
        /// <summary>
        /// 获取生产任务单列表
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetSc_ICMOBillListView")]
        [HttpGet]
        public object GetSc_ICMOBillListView(string ICMOBill,int OrganizationID)
        {
            if (ICMOBill != "")
            {
                sWhere = "where 1=1 and 生产订单号 like '%" + ICMOBill + "%' and HSTOCKINORGID=" + OrganizationID;
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where HSTOCKINORGID=" + OrganizationID, "h_v_S_Sc_ICMOBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_S_Sc_ICMOBillList ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_S_Sc_ICMOBillList");
                }
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }


    }