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

yusijie

2024-12-17 feec6d0e153a8435ead4383a2a8f988b47003191

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_SOPBillController.cs

@@ -31,15 +31,6 @@
        {
            try
            {
                //编辑权限
                //if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无查看权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                string sql1 = string.Format(@"select * from h_v_Sc_WorkOrderList where å¼€å·¥æ ‡è®° = 1 and HMainID='" + sWhere + "'");
               
                ds = oCN.RunProcReturn(sql1, "h_v_Sc_WorkOrderList");
@@ -102,5 +93,179 @@
            }
        }

        /// <summary>
        /// è¿”回当前生产资源生产状态下的工单列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Sc_ICMOBill/list2")]
        [HttpGet]
        public object list2(string HSourceID, string user,string HMainID)
        {
            try
            {
                var sWhere = "";
                if (Convert.ToInt32(HMainID) != 0 && HMainID.ToString() != "")
                {
                    sWhere += " and HMainID = " + HMainID;
                }
                string sql1 = string.Format(@"select * from h_v_Sc_ICMOBillList_ToSop where çŠ¶æ€ = '开工' and HSourceID='" + HSourceID + "'" + sWhere);

                ds = oCN.RunProcReturn(sql1, "h_v_Sc_ICMOBillList_ToSop");


                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;
            }
        }

        /// <summary>
        /// è¿”回生产工位列表信息
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_SourceWorkStationSet_ToSop/Soplist")]
        [HttpGet]
        public object Soplist(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
               
                string sql1 = string.Format(@"select * from h_v_Gy_SourceWorkStationSetList where 1 = 1");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID ", "h_v_Gy_SourceWorkStationSetList");
                }
                else
                {
                    string sql = sql1 + sWhere + " order by HItemID ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_SourceWorkStationSetList");
                }

                //添加列名
                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;
            }
        }

        /// <summary>
        /// æ ¹æ®ç‰©æ–™ï¼Œå·¥å•æŸ¥æ‰¾ä½œä¸šæŒ‡å¯¼ä¹¦
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_SopBill/getListByMaterID")]
        [HttpGet]
        public object getListByMaterID(Int64 HMaterID, string HSourceNo)
        {
            try
            {
                var sWhere = "";
                if (Convert.ToInt32(HMaterID) != 0 && HMaterID.ToString() != "" && HSourceNo != null && HSourceNo.ToString() != "" )
                {
                    sWhere += " and HMaterID = " + HMaterID + " and HSourceNo = '" + HSourceNo + "'";
                }
                string sql1 = string.Format(@"select * from h_v_Sc_ICMOBillList_ToSop where 1 = 1 " + sWhere);

                ds = oCN.RunProcReturn(sql1, "h_v_Sc_ICMOBillList_ToSop");


                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;
            }
        }

        /// <summary>
        /// æ ¹æ®ç‰©æ–™+工序查找作业指导书
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_SopBill/getListByMaterProc")]
        [HttpGet]
        public object getListByMaterProc(Int64 HMaterID, Int64 HProcID,string HType)
        {
            try
            {
                var sWhere = "";
                if (HType != "")
                {
                    if (Convert.ToInt32(HMaterID) != 0 && HMaterID.ToString() != "" && Convert.ToInt32(HProcID) != 0 && HProcID.ToString() != "")
                    {
                        sWhere += " and HMaterID = " + HMaterID + " and HProcID = " + HProcID + " and HProcID2 = " + HProcID + " and æŒ‡å¯¼ä¹¦ç±»åž‹ = '"+ HType + "'";
                    }
                }
                else
                {
                    if (Convert.ToInt32(HMaterID) != 0 && HMaterID.ToString() != "" && Convert.ToInt32(HProcID) != 0 && HProcID.ToString() != "")
                    {
                        sWhere += " and HMaterID = " + HMaterID + " and HProcID = " + HProcID + " and HProcID2 = " + HProcID + " ";
                    }
                }
                //if (Convert.ToInt32(HMaterID) != 0 && HMaterID.ToString() != "" && Convert.ToInt32(HProcID) != 0 && HProcID.ToString() != "")
                //{
                //    sWhere += " and HMaterID = " + HMaterID + " and HProcID = " + HProcID + " and HProcID2 = " + HProcID ;
                //}
                string sql1 = string.Format(@"select * from h_v_Sc_ICMOBillStatus_Tmp_SOP where 1 = 1 " + sWhere);

                ds = oCN.RunProcReturn(sql1, "h_v_Sc_ICMOBillStatus_Tmp_SOP");


                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;
            }
        }

    }
}