单品过站增加班次,修复班次开班单的制单人字段保存错

zrg

2025-01-08 bafdbac9abdfc9de05b211cf7f54a3f792cb8a74

 WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs

@@ -20,6 +20,69 @@
        DataSet ds;
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

        #region 生产订单全程跟踪报表 查询全部销售订单号根据生产订单的销售订单号
        [Route("Mes_OrderProcFlowAllReport/getHSeOrderBillNo")]
        [HttpGet]
        public object getHSeOrderBillNo()
        {
            try
            {
                ds = oCN.RunProcReturn($"select DISTINCT HSeOrderBillNo from Sc_ICMOBillSub ", "Sc_ICMOBillSub");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 生产订单全程跟踪报表 查询
        [Route("Mes_OrderProcFlowAllReport/OrderProcFlowAllReportICMOList")]
        [HttpGet]
        public object OrderProcFlowAllReportICMOList(string sWhere)
        {
            try
            {
                //反序列化传递的值

                ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport_ICMO " + sWhere + "", "h_p_Mes_OrderProcFlowAllReport_ICMO");

                List<object> listCol = new List<object>();
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    listCol.Add(JsonConvert.DeserializeObject(str));
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = listCol;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 车间工序全程跟踪报表 查询
        [Route("Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList")]
        [HttpGet]
@@ -533,6 +596,97 @@
        #endregion


        #region 工序异常过站报表
        /// <summary>
        /// 工序异常过站报表
        /// </summary>
        /// <returns></returns>
        [Route("Mes_OrderProcFlowAllReportController/GetSc_ProcessErrStationReport_Json")]
        [HttpGet]
        public object GetSc_ProcessErrStationReport_Json(string sWhere,string user)
        {
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Sc_ProcessErrStationReport", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("exec h_p_Sc_ProcessErrStationReport " + sWhere, "h_p_Sc_ProcessErrStationReport");
                List<object> columnNameList = new List<object>();
                //添加列名
                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列对象的列名
                }
                objJsonResult.code = "0";
                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

        #region 车间模块  生产日需求模具报表  查询

        [Route("Mes_OrderProcFlowAllReport/getSc_MouldRequirementDay")]
        [HttpGet]
        public object getSc_MouldRequirementDay(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_MouldRequirementDay order by 日期 desc", "h_v_Sc_MouldRequirementDay");
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_MouldRequirementDay where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by 日期 ";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRequirementDay");
                }

                //添加列名
                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列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}