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

yangle

2023-12-12 096f0a528fc003ad60d50155af11a40d14b9f0d9

 WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs

@@ -1856,11 +1856,11 @@
            try
            {
                string sql = @"select 
                            c.HEmpID
                            ISNULL(c.HEmpID,0) HEmpID
                            ,e.HName HEmpName
                            ,c.HDeptID
                            ,ISNULL(c.HDeptID,0) HDeptID
                            ,d.HName HDeptName
                            ,d.HEmpID HManagerID
                            ,ISNULL(d.HEmpID,0) HManagerID
                            ,e1.HName HManagerName
                            from Gy_Czygl as c
                            left join Gy_Employee as e on c.HEmpID = e.HItemID
@@ -1914,27 +1914,29 @@
                }
                else
                {
                    string sql = "select * from Gy_UserCustomerRelation where HUserID = '" + CurUserID + "'";
                    ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        sWhere = " and 1 = 0";
                    }
                    else
                    {
                        sWhere = " and HCusID in (";
                        for(var i = 0; i < ds.Tables[0].Rows.Count; i++)
                        {
                            if (i < ds.Tables[0].Rows.Count - 1)
                            {
                                sWhere += ds.Tables[0].Rows[i]["HCusID"].ToString() + ",";
                            }
                            else
                            {
                                sWhere += ds.Tables[0].Rows[i]["HCusID"].ToString() + ")";
                            }
                        }
                    }
                    //string sql = "select * from Gy_UserCustomerRelation where HUserID = '" + CurUserID + "'";
                    //ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
                    //if (ds == null || ds.Tables[0].Rows.Count == 0)
                    //{
                    //    sWhere = " and 1 = 0";
                    //}
                    //else
                    //{
                    //    sWhere = " and HCusID in (";
                    //    for(var i = 0; i < ds.Tables[0].Rows.Count; i++)
                    //    {
                    //        if (i < ds.Tables[0].Rows.Count - 1)
                    //        {
                    //            sWhere += ds.Tables[0].Rows[i]["HCusID"].ToString() + ",";
                    //        }
                    //        else
                    //        {
                    //            sWhere += ds.Tables[0].Rows[i]["HCusID"].ToString() + ")";
                    //        }
                    //    }
                    //}

                    sWhere = " and 1=1 ";
                }

                objJsonResult.code = "1";
@@ -2062,6 +2064,8 @@
                List<object> columnNameList0 = new List<object>();
                List<object> columnNameList1 = new List<object>();
                List<object> columnNameList2 = new List<object>();
                List<object> columnNameList3 = new List<object>();
                List<object> columnNameList4 = new List<object>();

                string sql = "exec h_p_Xs_SeOrderBill_lookdown " + HInterID;
                ds = oCN.RunProcReturn(sql, "h_p_Xs_SeOrderBill_lookdown");
@@ -2090,9 +2094,27 @@
                    columnNameList2.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                //添加 销售出库单 列名
                foreach (DataColumn col in ds.Tables[3].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList3.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                //添加 工序流转卡 列名
                foreach (DataColumn col in ds.Tables[4].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList4.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                columnNameListSum.Add(columnNameList0);
                columnNameListSum.Add(columnNameList1);
                columnNameListSum.Add(columnNameList2);
                columnNameListSum.Add(columnNameList3);
                columnNameListSum.Add(columnNameList4);

                objJsonResult.code = "1";
                objJsonResult.count = 1;