wtt
5 天以前 3eb961f8a1b2db14dcd1b31c031610924568b888
出站汇报英文接口
5个文件已修改
25 ■■■■ 已修改文件
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -1766,10 +1766,10 @@
        }
        #endregion
        #region 返回工序出站汇报单列表英文
        #region 返回工序出站汇报单列表-分页
        [Route("Cj_StationOutBill/get_Display_Eng")]
        [HttpGet]
        public object get_Display_Eng(string sWhere, string user, string HBillSubType)
        public object get_Display_Eng(string sWhere, string user, string Organization, int page, int size, string HBillSubType)
        {
            try
            {
@@ -1825,15 +1825,15 @@
                    }
                }
                //sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_Eng where 1 = 1" + sWhere + "order by hmainid desc", "h_v_MES_StationOutBillList_Eng");
                    ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList_Eng " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_MES_StationOutBillList_Eng");
                }
                else
                {
                    string sql1 = "select * from h_v_MES_StationOutBillList_Eng where 1 = 1 ";
                    string sql = sql1 + sWhere + "  order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList_Eng");
                    ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList_Eng " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_MES_StationOutBillList_Eng");
                }
                //添加列名
@@ -1844,23 +1844,12 @@
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
                objJsonResult.Message = "[0000-1-037]Sucess!";
                objJsonResult.list = columnNameList;
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception e)
            {
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ