WebAPI/Controllers/MateOutController.cs
@@ -17,6 +17,7 @@
using WebAPI.Code;
using WebAPI.Controllers.SCGL.日计划管理;
using WebAPI.Models;
using WebAPI.Utility;
using static WebAPI.Controllers.基础资料.基础资料.Gy_DutyBillController;
namespace WebAPI.Controllers
@@ -1635,7 +1636,7 @@
        #endregion
        //车间定位  车间上下架时间查询
        #region 车间定位  车间上下架时间查询
        [Route("Kf_WorkShopICStockBill/List")]
        [HttpGet]
        public object Kf_WorkShopICStockBillList(string HBillType, string HCarBarCode, string HProcExBillNo, string HMaterNumber, long HWHID, long HSPID, string sWhere)
@@ -1685,7 +1686,7 @@
                return objJsonResult;
            }
        }
        #endregion
        [Route("MateOutBill/Delete_Json")]
        [HttpGet]
        public object Delete_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType)
@@ -2585,6 +2586,7 @@
        /// <returns></returns>
        [Route("MateOutController/GetKf_MateOutSumReport_QiaoYi_Json")]
        [HttpGet]
        [Permission(HModName = "Kf_MateOutSumReport_QiaoYi")]
        public object GetKf_MateOutSumReport_QiaoYi_Json(string sWhere, string user)
        {
            try
@@ -2642,6 +2644,7 @@
        #region  (生产订单维度)客户订单报表
        [Route("MaterOutEntryReport/sc_ICOMReportList")]
        [HttpGet]
        [Permission(HModName = "sc_ICOMReportList")]
        public object sc_ICOMReportList(string sWhere,string HBeginDate,string HEndDate, string user)
        {
            try
@@ -2734,6 +2737,7 @@
        #region  流转卡未入库报表
        [Route("MaterOutEntryReport/Sc_ProcExchangeNoInReport")]
        [HttpGet]
        [Permission(HModName = "Sc_ProcExchangeNoInReport")]
        public object Sc_ProcExchangeNoInReport(string sWhere, string HBeginDate, string HEndDate, string user)
        {
            try
@@ -2784,6 +2788,7 @@
        #region  生产入库报表
        [Route("MaterOutEntryReport/sc_ICOMRKReport")]
        [HttpGet]
        [Permission(HModName = "sc_ICOMRKReport")]
        public object sc_ICOMRKReport(string sWhere, string user)
        {
            try
@@ -2839,6 +2844,7 @@
        /// </summary>
        [Route("Sc_BadReasonReport/list")]
        [HttpGet]
        [Permission(HModName = "Sc_BadReasonReport")]
        public object list(string sWhere, string user,string HGroupID)
        {
            try
@@ -2946,6 +2952,7 @@
        }
        [Route("MaterOutEntryReport/SC_DayRkReport")]
        [HttpGet]
        [Permission(HModName = "SC_DayRkReport")]
        public object SC_DayRkReport(string sWhere,int num, string user)
        {
            try
@@ -3031,6 +3038,7 @@
        }
        [Route("MaterOutEntryReport/SemiFinishedProductsReportList")]
        [HttpGet]
        [Permission(HModName = "SemiFinishedProductsReportList")]
        public object SemiFinishedProductsReportList(string sWhere, int num, string user)
        {
            try
@@ -3997,5 +4005,60 @@
        #endregion
        #endregion
        #region 车间定位  车间上下架时间查询
        [Route("KF_ICInventory_WorkShop/KF_ICInventory_WorkShopList")]
        [HttpGet]
        public object KF_ICInventory_WorkShopList(string sWhere)
        {// string HBarCode, string HMaterNumber, long HWHID, long HSPID,
            try
            {
                DataSet ds;
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                List<object> columnNameList = new List<object>();
                if (sWhere != null)
                {
                    //sWhere = sWhere.Replace("'", "''");
                    ds = oCN.RunProcReturn("select * from h_v_KF_ICInventory_WorkShop_WMS where 1=1 "+ sWhere, "h_v_KF_ICInventory_WorkShop_WMS");
                }
                else
                 ds = oCN.RunProcReturn("select * from h_v_KF_ICInventory_WorkShop_WMS where 1=1", "h_v_KF_ICInventory_WorkShop_WMS");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功!";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}