From 310aa7681537db520e216af97b34a32b98698dd1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 07 十一月 2023 13:38:51 +0800
Subject: [PATCH] 添加去除core默认返回数据首字母小写配置,同时修改返回值Message为小写message
---
VueWebCoreApi/Controllers/ImportExcelController.cs | 6
VueWebCoreApi/DLL/BLL/WorkOrderBLL.cs | 44
VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs | 374 ++++-
VueWebCoreApi/Tools/ToMessage.cs | 2
VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs | 248 +-
VueWebCoreApi/DLL/DAL/LoginDAL.cs | 50
VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs | 589 +++++---
VueWebCoreApi/ApiGroup/OpenApiGroup.cs | 5
VueWebCoreApi/Tools/JwtTools.cs | 2
VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs | 7
VueWebCoreApi/Tools/SeachEncodeJob.cs | 16
VueWebCoreApi/DLL/DAL/SystemSettingDAL.cs | 34
VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs | 190 +-
VueWebCoreApi/Controllers/TaskBackGroundController.cs | 2
VueWebCoreApi/Controllers/GeneralBasicDataController.cs | 14
VueWebCoreApi/Controllers/ProductModelController.cs | 2
VueWebCoreApi/Tools/AppLableBarCode.cs | 8
VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs | 467 +++---
VueWebCoreApi/DLL/DAL/KanBanManagerentDAL.cs | 212 +++
VueWebCoreApi/Controllers/ReportManagerController.cs | 64
VueWebCoreApi/Controllers/LoginController.cs | 20
VueWebCoreApi/Controllers/BasicSettingController.cs | 5
VueWebCoreApi/DLL/BLL/ReportManagerBLL.cs | 48
VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs | 4
VueWebCoreApi/DLL/DAL/GridReportDAL.cs | 4
VueWebCoreApi/Models/ErpOrder/ErpOrderBatch.cs | 59
VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs | 112
VueWebCoreApi/Controllers/MouldManagerController.cs | 67 +
VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs | 113 +
VueWebCoreApi/Tools/ChannelActionFilterAttribute.cs | 6
VueWebCoreApi/Tools/ScanStartReport.cs | 110
VueWebCoreApi/Quartz/QuartzNETExtension.cs | 10
VueWebCoreApi/Tools/ExcelList.cs | 4
VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs | 15
VueWebCoreApi/DLL/DAL/ProductModelDAL.cs | 110
VueWebCoreApi/Controllers/KanBanManagerentController.cs | 109 +
VueWebCoreApi/DLL/BLL/KanBanManagerentBLL.cs | 55
VueWebCoreApi/Tools/DapperHelper.cs | 12
VueWebCoreApi/Tools/ChannelActionFilterAttributeApp.cs | 4
VueWebCoreApi/DLL/BLL/BasicSettingBLL.cs | 4
VueWebCoreApi/DLL/DAL/BaseDateDAL.cs | 60
VueWebCoreApi/DLL/DAL/ErpSyncMesDAL.cs | 30
VueWebCoreApi/Startup.cs | 9
VueWebCoreApi/Controllers/WorkOrderController.cs | 58
VueWebCoreApi/Tools/ImportExcel.cs | 4
VueWebCoreApi/Tools/SeachEncode.cs | 28
VueWebCoreApi/DLL/DAL/ProductionManagementDAL.cs | 400 +++---
47 files changed, 2,387 insertions(+), 1,409 deletions(-)
diff --git a/VueWebCoreApi/ApiGroup/OpenApiGroup.cs b/VueWebCoreApi/ApiGroup/OpenApiGroup.cs
index df42ce0..2f2f7ea 100644
--- a/VueWebCoreApi/ApiGroup/OpenApiGroup.cs
+++ b/VueWebCoreApi/ApiGroup/OpenApiGroup.cs
@@ -37,7 +37,8 @@
[Description("Excel瀵煎叆")]
Excel瀵煎叆 = 14,
[Description("鍗曟嵁鎵撳嵃")]
- 鍗曟嵁鎵撳嵃 = 15
-
+ 鍗曟嵁鎵撳嵃 = 15,
+ [Description("鐪嬫澘绠＄悊")]
+ 鐪嬫澘绠＄悊=16
}
}
diff --git a/VueWebCoreApi/Controllers/BasicSettingController.cs b/VueWebCoreApi/Controllers/BasicSettingController.cs
index a1fc254..bdd966d 100644
--- a/VueWebCoreApi/Controllers/BasicSettingController.cs
+++ b/VueWebCoreApi/Controllers/BasicSettingController.cs
@@ -694,7 +694,7 @@
/// <summary>
/// 浠撲綅淇℃伅鍒楄〃
/// </summary>
- /// <param name="flag">閫変腑宸︿晶鏍戝瀷鏄惁浠撳簱(Y/N)</param>
+ /// <param name="flag">閫変腑宸︿晶鏍戝瀷灞傜骇</param>
/// <param name="stckcode">浠撳簱缂栫爜瀛楃涓查泦</param>
/// <param name="locacode">浠撲綅缂栫爜</param>
/// <param name="locaname">浠撲綅鍚嶇О</param>
@@ -733,10 +733,11 @@
string locaname = obj["locaname"].ToString(); //璐т綅鍚嶇О
string stckcode = obj["stckcode"].ToString(); //瀵瑰簲浠撳簱缂栫爜
string parentlocacode = obj["parentlocacode"].ToString(); //涓婄骇璐т綅缂栫爜
+ string depth = obj["depth"].ToString(); //绾ф
string status = obj["status"].ToString(); //鐘舵��
string description = obj["description"].ToString(); //澶囨敞
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = BasicSettingBLL.TSecLocaAddUpdate(data_sources, locacode, locaname, stckcode, parentlocacode, status, description, OperType, us);
+ mes = BasicSettingBLL.TSecLocaAddUpdate(data_sources, locacode, locaname, stckcode, parentlocacode, depth, status, description, OperType, us);
return Json(mes);
}
#endregion
diff --git a/VueWebCoreApi/Controllers/GeneralBasicDataController.cs b/VueWebCoreApi/Controllers/GeneralBasicDataController.cs
index 7e89081..4bfa980 100644
--- a/VueWebCoreApi/Controllers/GeneralBasicDataController.cs
+++ b/VueWebCoreApi/Controllers/GeneralBasicDataController.cs
@@ -31,6 +31,20 @@
}
#endregion
+ #region[缁勭粐鏋舵瀯鍩虹璧勬枡(鏃犲叕鍙�)]
+ /// <summary>
+ /// 缁勭粐鏋舵瀯鍩虹璧勬枡(鏃犲叕鍙�)
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "PrentOrganizationNoCompany")]
+ [HttpGet]
+ public JsonResult PrentOrganizationNoCompany()
+ {
+ mes = GeneralBasicDataBLL.PrentOrganizationNoCompany();
+ return Json(mes);
+ }
+ #endregion
+
#region[宀椾綅鍩虹璧勬枡]
/// <summary>
/// 宀椾綅鍩虹璧勬枡
diff --git a/VueWebCoreApi/Controllers/ImportExcelController.cs b/VueWebCoreApi/Controllers/ImportExcelController.cs
index dd36c4c..16276d0 100644
--- a/VueWebCoreApi/Controllers/ImportExcelController.cs
+++ b/VueWebCoreApi/Controllers/ImportExcelController.cs
@@ -119,7 +119,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
}
return mes;
}
@@ -145,7 +145,7 @@
List<DataTable> dataTable = myModel.TableData;
list = ExcelCheckBLL.ExcelCheckData(FileCode, dataTable, out StuCode, out message, out count);
mes.code = StuCode;
- mes.Message = message;
+ mes.message = message;
mes.count = count;
mes.data = list;
return mes;
@@ -179,7 +179,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
}
return mes;
}
diff --git a/VueWebCoreApi/Controllers/KanBanManagerentController.cs b/VueWebCoreApi/Controllers/KanBanManagerentController.cs
new file mode 100644
index 0000000..624d19b
--- /dev/null
+++ b/VueWebCoreApi/Controllers/KanBanManagerentController.cs
@@ -0,0 +1,109 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using VueWebCoreApi.DLL.BLL;
+using VueWebCoreApi.Tools;
+
+namespace VueWebCoreApi.Controllers
+{
+ [ApiExplorerSettings(GroupName = "鐪嬫澘绠＄悊")]
+ [ApiController]
+ [Route("api/[controller]")]
+ public class KanBanManagerentController : Controller
+ {
+ //瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
+ ToMessage mes = new ToMessage();
+ RedisHelper redis = new RedisHelper();
+
+ #region[杞﹂棿鐪嬫澘,涓婄敓浜т俊鎭痌
+ /// <summary>
+ /// 杞﹂棿鐪嬫澘,涓婄敓浜т俊鎭�
+ /// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "WorkShopProduceTopData")]
+ [HttpGet]
+ public JsonResult WorkShopProduceTopData(string wkshopcode)
+ {
+ mes = KanBanManagerentBLL.WorkShopProduceTopData(wkshopcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[杞﹂棿鐪嬫澘,涓嬪乏杩戜竴鍛ㄤ笉鑹秼鍔縘
+ /// <summary>
+ /// 杞﹂棿鐪嬫澘,涓嬪乏杩戜竴鍛ㄤ笉鑹秼鍔�
+ /// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "WorkShopProduceBottomLeftData")]
+ [HttpGet]
+ public JsonResult WorkShopProduceBottomLeftData(string wkshopcode)
+ {
+ mes = KanBanManagerentBLL.WorkShopProduceBottomLeftData(wkshopcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[杞﹂棿鐪嬫澘,涓嬪彸杩戜竴鏈堜笉鑹粺璁
+ /// <summary>
+ /// 杞﹂棿鐪嬫澘,涓嬪彸杩戜竴鏈堜笉鑹粺璁�
+ /// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "WorkShopProduceBottomRightData")]
+ [HttpGet]
+ public JsonResult WorkShopProduceBottomRightData(string wkshopcode)
+ {
+ mes = KanBanManagerentBLL.WorkShopProduceBottomRightData(wkshopcode);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[杞﹂棿缁煎悎鐪嬫澘,宸︿笂鐢熶骇璁㈠崟]
+ /// <summary>
+ /// 杞﹂棿缁煎悎鐪嬫澘,宸︿笂鐢熶骇璁㈠崟
+ /// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜瀛楃涓查泦</param>
+ /// <returns></returns>
+ [Route(template: "WorkShopCompreLeftTop")]
+ [HttpGet]
+ public JsonResult WorkShopCompreLeftTop(string wkshopcode)
+ {
+ mes = KanBanManagerentBLL.WorkShopCompreLeftTop(wkshopcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[杞﹂棿缁煎悎鐪嬫澘,鍙充笂閿�鍞鍗昡
+ /// <summary>
+ /// 杞﹂棿缁煎悎鐪嬫澘,鍙充笂閿�鍞鍗�
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "WorkShopCompreRightTop")]
+ [HttpGet]
+ public JsonResult WorkShopCompreRightTop()
+ {
+ mes = KanBanManagerentBLL.WorkShopCompreRightTop();
+ return Json(mes);
+ }
+ #endregion
+
+ #region[杞﹂棿缁煎悎鐪嬫澘,鍙充笅搴撳瓨]
+ /// <summary>
+ /// 杞﹂棿缁煎悎鐪嬫澘,鍙充笅搴撳瓨
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "WorkShopCompreRightBottom")]
+ [HttpGet]
+ public JsonResult WorkShopCompreRightBottom()
+ {
+ mes = KanBanManagerentBLL.WorkShopCompreRightBottom();
+ return Json(mes);
+ }
+ #endregion
+ }
+}
diff --git a/VueWebCoreApi/Controllers/LoginController.cs b/VueWebCoreApi/Controllers/LoginController.cs
index a22b43a..14a44c2 100644
--- a/VueWebCoreApi/Controllers/LoginController.cs
+++ b/VueWebCoreApi/Controllers/LoginController.cs
@@ -80,7 +80,7 @@
//鍐欏叆鐧诲綍鎿嶄綔璁板綍
LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
mes.code = "200";
- mes.Message = "鐧诲綍鎴愬姛!";
+ mes.message = "鐧诲綍鎴愬姛!";
mes.data = ms.token.ToString();
}
else //濡傛灉瀛樺湪
@@ -92,7 +92,7 @@
{
mes.data = ms.token.ToString();
mes.code = "302";
- mes.Message = "褰撳墠璐﹀彿宸茬櫥褰�,鏄惁寮哄埗涓嬬嚎!";
+ mes.message = "褰撳墠璐﹀彿宸茬櫥褰�,鏄惁寮哄埗涓嬬嚎!";
}
else
{
@@ -102,7 +102,7 @@
LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
mes.data = ms;
mes.code = "200";
- mes.Message = "鐧诲綍鎴愬姛!";
+ mes.message = "鐧诲綍鎴愬姛!";
}
}
}
@@ -110,7 +110,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
@@ -162,14 +162,14 @@
LogHelper.DbOperateLog(us.usercode, "寮哄埗涓嬬嚎", "琚己鍒朵笅绾夸簡", us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "寮哄埗涓嬬嚎鎴愬姛!";
+ mes.message = "寮哄埗涓嬬嚎鎴愬姛!";
mes.data = null;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return Json(mes);
@@ -198,7 +198,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
}
return Json(mes);
}
@@ -295,7 +295,7 @@
//鍐欏叆鐧诲綍鎿嶄綔璁板綍
LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
mes.code = "200";
- mes.Message = "鐧诲綍鎴愬姛!";
+ mes.message = "鐧诲綍鎴愬姛!";
mes.data = ms.token.ToString();
}
else //濡傛灉瀛樺湪
@@ -316,7 +316,7 @@
LogHelper.DbOperateLog(ms.usercode, "鐧诲綍", "鐧诲綍浜嗙郴缁�", ms.usertype);
mes.data = ms;
mes.code = "200";
- mes.Message = "鐧诲綍鎴愬姛!";
+ mes.message = "鐧诲綍鎴愬姛!";
}
}
}
@@ -324,7 +324,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
diff --git a/VueWebCoreApi/Controllers/MouldManagerController.cs b/VueWebCoreApi/Controllers/MouldManagerController.cs
index f130a31..4a637b7 100644
--- a/VueWebCoreApi/Controllers/MouldManagerController.cs
+++ b/VueWebCoreApi/Controllers/MouldManagerController.cs
@@ -661,7 +661,7 @@
User us = JwtTools.Denocode(token.ToString());
var files = Request.Form.Files; // 鑾峰彇浼犺緭鐨勬枃浠跺垪琛�
mes = MouldManagerBLL.MaintainScanMouldApplySave(menucode, mouldcode, faultsourcecode, faultdescr, us, files);
- mes.Message = menucode;
+ mes.message = menucode;
return Json(mes);
}
#endregion
@@ -1383,5 +1383,70 @@
}
#endregion
+
+ #region[妯″叿鍑哄叆搴撹褰曟煡璇
+ /// <summary>
+ /// 妯″叿鍑哄叆搴撹褰曟煡璇�
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="mouldname">妯″叿鍚嶇О</param>
+ /// <param name="mouldspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="type">鎿嶄綔绫诲瀷(鍏ュ簱:IN 鍑哄簱:OUT)</param>
+ /// <param name="warehousecode">浠撳簱缂栫爜</param>
+ /// <param name="locationcode">搴撲綅缂栫爜</param>
+ /// <param name="operuser">鎿嶄綔浜哄憳</param>
+ /// <param name="operdate">鎿嶄綔鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "MouldInOutMachinesSearch")]
+ [HttpGet]
+ public JsonResult MouldInOutMachinesSearch(int page, int rows, string prop, string order, string mouldcode = null, string mouldname = null, string mouldspec = null, string type = null,string warehousecode=null,string locationcode=null, string operuser = null, string operdate = null)
+ {
+ string opendate = ""; //寮�濮嬫椂闂�
+ string closedate = ""; //缁撴潫鏃堕棿
+ if (operdate != "" && operdate != null)
+ {
+ opendate = operdate.Split('~')[0].ToString();
+ closedate = operdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = MouldManagerBLL.MouldInOutMachinesSearch(mouldcode, mouldname, mouldspec, type, warehousecode,locationcode, operuser, opendate, closedate, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鍑哄叆搴撹褰曞鍑篯
+ /// <summary>
+ /// 妯″叿鍑哄叆搴撹褰曞鍑�
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="mouldname">妯″叿鍚嶇О</param>
+ /// <param name="mouldspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="type">鎿嶄綔绫诲瀷(鍏ュ簱:IN 鍑哄簱:OUT)</param>
+ /// <param name="warehousecode">浠撳簱缂栫爜</param>
+ /// <param name="locationcode">搴撲綅缂栫爜</param>
+ /// <param name="operuser">鎿嶄綔浜哄憳</param>
+ /// <param name="operdate">鎿嶄綔鏃堕棿</param>
+ /// <returns></returns>
+ [Route(template: "MouldInOutMachinesOutExcel")]
+ [HttpGet]
+ public JsonResult MouldInOutMachinesOutExcel(string mouldcode = null, string mouldname = null, string mouldspec = null, string type = null, string warehousecode = null, string locationcode = null, string operuser = null, string operdate = null)
+ {
+ string opendate = ""; //寮�濮嬫椂闂�
+ string closedate = ""; //缁撴潫鏃堕棿
+ if (operdate != "" && operdate != null)
+ {
+ opendate = operdate.Split('~')[0].ToString();
+ closedate = operdate.Split('~')[1].ToString();
+ }
+ mes = MouldManagerBLL.MouldInOutMachinesOutExcel(mouldcode, mouldname, mouldspec, type, warehousecode, locationcode, operuser, opendate, closedate);
+ return Json(mes);
+ }
+ #endregion
+
}
}
diff --git a/VueWebCoreApi/Controllers/ProductModelController.cs b/VueWebCoreApi/Controllers/ProductModelController.cs
index e3361ad..de57fc0 100644
--- a/VueWebCoreApi/Controllers/ProductModelController.cs
+++ b/VueWebCoreApi/Controllers/ProductModelController.cs
@@ -278,7 +278,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
}
return Json(mes);
}
diff --git a/VueWebCoreApi/Controllers/ReportManagerController.cs b/VueWebCoreApi/Controllers/ReportManagerController.cs
index 39b3c80..17ed30b 100644
--- a/VueWebCoreApi/Controllers/ReportManagerController.cs
+++ b/VueWebCoreApi/Controllers/ReportManagerController.cs
@@ -24,9 +24,8 @@
/// 鐢熶骇杩涘害鎶ヨ〃
/// </summary>
/// <param name="status">宸ュ崟鐘舵��</param>
+ /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
/// <param name="wocode">宸ュ崟缂栧彿</param>
- /// /// <param name="wkshopcode">杞﹂棿缂栧彿</param>
- /// /// <param name="wkshopname">杞﹂棿鍚嶇О</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -38,7 +37,7 @@
/// <returns></returns>
[Route(template: "ProductionScheduleReportSearch")]
[HttpGet]
- public JsonResult ProductionScheduleReportSearch(int page, int rows, string prop, string order, string status = null, string wocode = null,string wkshopcode=null,string wkshopname=null, string partcode = null, string partname = null, string partspec = null, string lm_date = null)
+ public JsonResult ProductionScheduleReportSearch(int page, int rows, string prop, string order, string status = null, string wocode = null,string wkshopcode=null, string partcode = null, string partname = null, string partspec = null, string lm_date = null)
{
string opendate = ""; //寮�濮嬫椂闂�
string closedate = ""; //缁撴潫鏃堕棿
@@ -49,7 +48,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.ProductionScheduleReportSearch(status, wocode, wkshopcode,wkshopname, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.ProductionScheduleReportSearch(status, wkshopcode, wocode,partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -59,9 +58,8 @@
/// 鐢熶骇杩涘害鎶ヨ〃瀵煎嚭
/// </summary>
/// <param name="status">宸ュ崟鐘舵��</param>
+ /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
/// <param name="wocode">宸ュ崟缂栧彿</param>
- /// /// <param name="wkshopcode">杞﹂棿缂栧彿</param>
- /// /// <param name="wkshopname">杞﹂棿鍚嶇О</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -69,7 +67,7 @@
/// <returns></returns>
[Route(template: "ProductionScheduleReportExcelSearch")]
[HttpGet]
- public JsonResult ProductionScheduleReportExcelSearch(string status = null, string wocode = null, string wkshopcode = null, string wkshopname = null, string partcode = null, string partname = null, string partspec = null, string lm_date = null)
+ public JsonResult ProductionScheduleReportExcelSearch(string status = null, string wkshopcode = null, string wocode = null,string partcode = null, string partname = null, string partspec = null, string lm_date = null)
{
string opendate = ""; //寮�濮嬫椂闂�
string closedate = ""; //缁撴潫鏃堕棿
@@ -78,7 +76,7 @@
opendate = lm_date.Split('~')[0].ToString();
closedate = lm_date.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.ProductionScheduleReportExcelSearch(status, wocode, wkshopcode, wkshopname, partcode, partname, partspec, opendate, closedate);
+ mes = ReportManagerBLL.ProductionScheduleReportExcelSearch(status, wkshopcode,wocode, partcode, partname, partspec, opendate, closedate);
return Json(mes);
}
#endregion
@@ -89,6 +87,7 @@
/// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
/// </summary>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
+ /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -104,7 +103,7 @@
/// <returns></returns>
[Route(template: "GroupSalaryReportSearch")]
[HttpGet]
- public JsonResult GroupSalaryReportSearch(int page, int rows, string prop, string order, string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)
+ public JsonResult GroupSalaryReportSearch(int page, int rows, string prop, string order, string compute,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)
{
string operopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string operclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -115,7 +114,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.GroupSalaryReportSearch(compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.GroupSalaryReportSearch(compute, wkshopcode, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -140,6 +139,7 @@
/// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
/// </summary>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
+ /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -151,7 +151,7 @@
/// <returns></returns>
[Route(template: "GroupSalaryReportExcelSearch")]
[HttpGet]
- public JsonResult GroupSalaryReportExcelSearch(string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)
+ public JsonResult GroupSalaryReportExcelSearch(string compute,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)
{
string operopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string operclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -160,7 +160,7 @@
operopendate = operdate.Split('~')[0].ToString();
operclosedate = operdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.GroupSalaryReportExcelSearch(compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate);
+ mes = ReportManagerBLL.GroupSalaryReportExcelSearch(compute,wkshopcode, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate);
return Json(mes);
}
#endregion
@@ -171,6 +171,7 @@
/// 浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃
/// </summary>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
+ /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -186,7 +187,7 @@
/// <returns></returns>
[Route(template: "PeopleSalaryReportSearch")]
[HttpGet]
- public JsonResult PeopleSalaryReportSearch(int page, int rows, string prop, string order, string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null,string stepcode=null, string stepname = null, string reportname = null, string reportdate = null)
+ public JsonResult PeopleSalaryReportSearch(int page, int rows, string prop, string order, string compute,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null,string stepcode=null, string stepname = null, string reportname = null, string reportdate = null)
{
string reportopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -197,7 +198,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.PeopleSalaryReportSearch(compute, wocode, partcode, partname, partspec, stepcode, stepname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.PeopleSalaryReportSearch(compute, wkshopcode, wocode, partcode, partname, partspec, stepcode, stepname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -207,6 +208,7 @@
/// 浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭
/// </summary>
/// <param name="compute">璁＄畻鏂瑰紡(閫愰亾/鏈亾)</param>
+ /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -218,7 +220,7 @@
/// <returns></returns>
[Route(template: "PeopleSalaryReportExcelSearch")]
[HttpGet]
- public JsonResult PeopleSalaryReportExcelSearch(string compute, string wocode = null, string partcode = null, string partname = null, string partspec = null,string stepcode=null, string stepname = null, string reportname = null, string reportdate = null)
+ public JsonResult PeopleSalaryReportExcelSearch(string compute,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null,string stepcode=null, string stepname = null, string reportname = null, string reportdate = null)
{
string reportopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -227,7 +229,7 @@
reportopendate = reportdate.Split('~')[0].ToString();
reportclosedate = reportdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(compute, wocode, partcode, partname, partspec,stepcode,stepname, reportname, reportopendate, reportclosedate);
+ mes = ReportManagerBLL.PeopleSalaryReportExcelSearch(compute, wkshopcode, wocode, partcode, partname, partspec,stepcode,stepname, reportname, reportopendate, reportclosedate);
return Json(mes);
}
#endregion
@@ -237,6 +239,7 @@
/// <summary>
/// 濮斿鎶ヨ〃璁板綍鏌ヨ
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -252,7 +255,7 @@
/// <returns></returns>
[Route(template: "OutSourceReportSearch")]
[HttpGet]
- public JsonResult OutSourceReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null, string receivdate = null)
+ public JsonResult OutSourceReportSearch(int page, int rows, string prop, string order,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null, string receivdate = null)
{
string receivopendate = ""; //鏀舵枡寮�濮嬫椂闂�
string receivclosedate = ""; //鏀舵枡缁撴潫鏃堕棿
@@ -263,7 +266,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.OutSourceReportSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.OutSourceReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -272,6 +275,7 @@
/// <summary>
/// 濮斿鎶ヨ〃璁板綍瀵煎嚭
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -283,7 +287,7 @@
/// <returns></returns>
[Route(template: "OutSourceReportExcelSearch")]
[HttpGet]
- public JsonResult OutSourceReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null, string receivdate = null)
+ public JsonResult OutSourceReportExcelSearch(string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null, string receivdate = null)
{
string receivopendate = ""; //鏀舵枡寮�濮嬫椂闂�
string receivclosedate = ""; //鏀舵枡缁撴潫鏃堕棿
@@ -292,7 +296,7 @@
receivopendate = receivdate.Split('~')[0].ToString();
receivclosedate = receivdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.OutSourceReportExcelSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
+ mes = ReportManagerBLL.OutSourceReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
return Json(mes);
}
#endregion
@@ -302,6 +306,7 @@
/// <summary>
/// 涓嶈壇鏄庣粏鎶ヨ〃
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -318,7 +323,7 @@
/// <returns></returns>
[Route(template: "DefectDetailsReportSearch")]
[HttpGet]
- public JsonResult DefectDetailsReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string defectcode = null, string defectname = null, string reportname = null, string reportdate = null)
+ public JsonResult DefectDetailsReportSearch(int page, int rows, string prop, string order,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string defectcode = null, string defectname = null, string reportname = null, string reportdate = null)
{
string reportopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -329,7 +334,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.DefectDetailsReportSearch(wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.DefectDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -338,6 +343,7 @@
/// <summary>
/// 涓嶈壇鏄庣粏鎶ヨ〃瀵煎嚭
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -350,7 +356,7 @@
/// <returns></returns>
[Route(template: "DefectDetailsReportExcelSearch")]
[HttpGet]
- public JsonResult DefectDetailsReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string defectcode = null, string defectname = null, string reportname = null, string reportdate = null)
+ public JsonResult DefectDetailsReportExcelSearch(string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string defectcode = null, string defectname = null, string reportname = null, string reportdate = null)
{
string reportopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -359,7 +365,7 @@
reportopendate = reportdate.Split('~')[0].ToString();
reportclosedate = reportdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.DefectDetailsReportExcelSearch(wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
+ mes = ReportManagerBLL.DefectDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
return Json(mes);
}
#endregion
@@ -369,6 +375,7 @@
/// <summary>
/// 缁翠慨鏄庣粏鎶ヨ〃
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -385,7 +392,7 @@
/// <returns></returns>
[Route(template: "MaintenanceDetailsReportSearch")]
[HttpGet]
- public JsonResult MaintenanceDetailsReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string style = null, string defectname = null, string repairname = null, string repairdate = null)
+ public JsonResult MaintenanceDetailsReportSearch(int page, int rows, string prop, string order,string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string style = null, string defectname = null, string repairname = null, string repairdate = null)
{
string repairopendate = ""; //缁翠慨寮�濮嬫椂闂�
string repairclosedate = ""; //缁翠慨缁撴潫鏃堕棿
@@ -396,7 +403,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ReportManagerBLL.MaintenanceDetailsReportSearch(wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
+ mes = ReportManagerBLL.MaintenanceDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -405,6 +412,7 @@
/// <summary>
/// 缁翠慨鏄庣粏鎶ヨ〃瀵煎嚭
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栧彿</param >
/// <param name="wocode">宸ュ崟缂栧彿</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -417,7 +425,7 @@
/// <returns></returns>
[Route(template: "MaintenanceDetailsReportExcelSearch")]
[HttpGet]
- public JsonResult MaintenanceDetailsReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string style = null, string defectname = null, string repairname = null, string repairdate = null)
+ public JsonResult MaintenanceDetailsReportExcelSearch(string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string style = null, string defectname = null, string repairname = null, string repairdate = null)
{
string repairopendate = ""; //缁翠慨寮�濮嬫椂闂�
string repairclosedate = ""; //缁翠慨缁撴潫鏃堕棿
@@ -426,7 +434,7 @@
repairopendate = repairdate.Split('~')[0].ToString();
repairclosedate = repairdate.Split('~')[1].ToString();
}
- mes = ReportManagerBLL.MaintenanceDetailsReportExcelSearch(wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
+ mes = ReportManagerBLL.MaintenanceDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
return Json(mes);
}
#endregion
diff --git a/VueWebCoreApi/Controllers/TaskBackGroundController.cs b/VueWebCoreApi/Controllers/TaskBackGroundController.cs
index 32509a8..f2bb7d5 100644
--- a/VueWebCoreApi/Controllers/TaskBackGroundController.cs
+++ b/VueWebCoreApi/Controllers/TaskBackGroundController.cs
@@ -35,7 +35,7 @@
public async Task<IActionResult> GetJobs()
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛锛�";
+ mes.message = "鏌ヨ鎴愬姛锛�";
mes.data = await _schedulerFactory.GetJobs();
return Json(mes);
}
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index cfb6886..ec43071 100644
--- a/VueWebCoreApi/Controllers/WorkOrderController.cs
+++ b/VueWebCoreApi/Controllers/WorkOrderController.cs
@@ -8,6 +8,7 @@
using System.Threading.Tasks;
using VueWebCoreApi.DLL.BLL;
using VueWebCoreApi.Models;
+using VueWebCoreApi.Models.ErpOrder;
using VueWebCoreApi.Models.ReportVerify;
using VueWebCoreApi.Models.UpdateReport;
using VueWebCoreApi.Models.WorkData;
@@ -30,6 +31,7 @@
/// ERP璁㈠崟鏌ヨ
/// </summary>
/// <param name="erporderstus">璁㈠崟鐘舵�佺爜</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="erpordercode">璁㈠崟缂栧彿</param>
/// <param name="saleordercode">閿�鍞崟鍙�</param>
/// <param name="partcode">浜у搧缂栫爜</param>
@@ -45,7 +47,7 @@
/// <returns></returns>
[Route(template: "ErpOrderSearch")]
[HttpGet]
- public JsonResult ErpOrderSearch(string erporderstus = null, string erpordercode = null, string saleordercode = null, string partcode = null, string partname = null, string partspec = null, string paystartdate = null, string payenddate = null, string creatuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult ErpOrderSearch(string erporderstus = null,string wkshopcode=null, string erpordercode = null, string saleordercode = null, string partcode = null, string partname = null, string partspec = null, string paystartdate = null, string payenddate = null, string creatuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
@@ -65,7 +67,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.ErpOrderSearch(erporderstus, erpordercode, saleordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
+ mes = WorkOrderBLL.ErpOrderSearch(erporderstus, wkshopcode, erpordercode, saleordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -95,6 +97,18 @@
string relse_qty = obj["relse_qty"].ToString(); //宸蹭笅鍗曟暟閲�
string saleOrderDeliveryDate = obj["saleOrderDeliveryDate"].ToString(); //浜や粯鏃堕棿
mes = WorkOrderBLL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate,us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁㈠崟鎵归噺涓嬭揪]
+ [Route(template: "MarkBatchSaveErpOrder")]
+ [HttpPost]
+ public JsonResult MarkBatchSaveErpOrder(List<ErpOrderBatch> obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.MarkBatchSaveErpOrder(obj, us);
return Json(mes);
}
#endregion
@@ -141,6 +155,7 @@
/// MES宸ュ崟鏌ヨ
/// </summary>
/// <param name="mesorderstus">宸ュ崟鐘舵�佺爜</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="mesordercode">宸ュ崟缂栧彿</param>
/// <param name="sourceorder">婧愬崟鍗曞彿</param>
/// <param name="saleordercode">閿�鍞崟鍙�</param>
@@ -157,13 +172,13 @@
/// <returns></returns>
[Route(template: "MesOrderSearch")]
[HttpGet]
- public JsonResult MesOrderSearch(int page, int rows, string prop, string order, string mesorderstus = null, string mesordercode = null, string sourceorder = null, string saleordercode = null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
+ public JsonResult MesOrderSearch(int page, int rows, string prop, string order, string mesorderstus = null,string wkshopcode=null, string mesordercode = null, string sourceorder = null, string saleordercode = null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderSearch(mesorderstus, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderSearch(mesorderstus, wkshopcode, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -172,6 +187,7 @@
/// <summary>
/// MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="mesordercode">宸ュ崟缂栧彿</param>
/// <param name="sourceorder">婧愬崟鍗曞彿</param>
/// <param name="saleordercode">閿�鍞崟鍙�</param>
@@ -187,11 +203,11 @@
/// <returns></returns>
[Route(template: "MesBadOrderSearch")]
[HttpGet]
- public JsonResult MesBadOrderSearch(int page, int rows, string prop, string order, string mesordercode = null, string sourceorder = null, string saleordercode = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
+ public JsonResult MesBadOrderSearch(int page, int rows, string prop, string order,string wkshopcode=null, string mesordercode = null, string sourceorder = null, string saleordercode = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
{
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesBadOrderSearch(mesordercode, sourceorder, saleordercode, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ mes = WorkOrderBLL.MesBadOrderSearch(wkshopcode,mesordercode, sourceorder, saleordercode, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -290,6 +306,7 @@
/// MES宸ュ崟鍏抽棴鍒楄〃鏌ヨ
/// </summary>
/// <param name="mesorderstus">宸ュ崟鐘舵��(宸插叧闂�/鏈叧闂�)</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="mesordercode">宸ュ崟缂栧彿</param>
/// <param name="sourceorder">婧愬崟鍗曞彿</param>
/// <param name="saleordercode">閿�鍞崟鍙�</param>
@@ -306,13 +323,13 @@
/// <returns></returns>
[Route(template: "MesOrderClosedSearch")]
[HttpGet]
- public JsonResult MesOrderClosedSearch(int page, int rows, string prop, string order, string mesorderstus = null, string mesordercode = null, string sourceorder = null, string saleordercode = null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
+ public JsonResult MesOrderClosedSearch(int page, int rows, string prop, string order, string mesorderstus = null,string wkshopcode=null, string mesordercode = null, string sourceorder = null, string saleordercode = null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderClosedSearch(mesorderstus, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderClosedSearch(mesorderstus, wkshopcode, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -339,6 +356,7 @@
/// <summary>
/// 鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(鑷埗)
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟鍙�</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -350,13 +368,13 @@
/// <returns></returns>
[Route(template: "MesOrderStepSearch")]
[HttpGet]
- public JsonResult MesOrderStepSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderStepSearch(string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderStepSearch(wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -365,6 +383,7 @@
/// <summary>
/// 鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(澶栧崗)
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟鍙�</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -376,13 +395,13 @@
/// <returns></returns>
[Route(template: "MesOrderWxStepSearch")]
[HttpGet]
- public JsonResult MesOrderWxStepSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderWxStepSearch(string wkshopcode, string wocode = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderWxStepSearch(wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderWxStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -391,6 +410,7 @@
/// <summary>
/// 鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(涓嶈壇)
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟鍙�</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -402,13 +422,13 @@
/// <returns></returns>
[Route(template: "MesOrderNgStepSearch")]
[HttpGet]
- public JsonResult MesOrderNgStepSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderNgStepSearch(string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderNgStepSearch(wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderNgStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -558,6 +578,7 @@
/// <summary>
/// 鐢熶骇鎵ц,鎶ュ伐璋冩暣鍒楄〃鏁版嵁鏌ヨ鎺ュ彛
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wo_code">宸ュ崟缂栧彿</param>
/// <param name="partnumber">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -571,7 +592,7 @@
/// <returns></returns>
[Route(template: "MesOrderStepVerifySearch")]
[HttpGet]
- public JsonResult MesOrderStepVerifySearch(string wo_code = null, string partnumber = null, string partname = null, string partspec = null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderStepVerifySearch(string wkshopcode=null, string wo_code = null, string partnumber = null, string partname = null, string partspec = null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
string reportdateopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportdateclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -582,7 +603,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderStepVerifySearch(wo_code, partnumber, partname, partspec, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderStepVerifySearch(wkshopcode,wo_code, partnumber, partname, partspec, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -631,6 +652,7 @@
/// <summary>
/// 鐢熶骇鎵ц,鎶ュ伐瀹℃牳鍒楄〃鏁版嵁鏌ヨ鎺ュ彛
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wo_code">宸ュ崟缂栧彿</param>
/// <param name="partnumber">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -645,7 +667,7 @@
/// <returns></returns>
[Route(template: "MesOrderStepReportVerifySearch")]
[HttpGet]
- public JsonResult MesOrderStepReportVerifySearch(string wo_code = null, string partnumber = null, string partname = null, string partspec = null,string stepname=null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderStepReportVerifySearch(string wkshopcode=null, string wo_code = null, string partnumber = null, string partname = null, string partspec = null,string stepname=null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
string reportdateopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportdateclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -656,7 +678,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderStepReportVerifySearch(wo_code, partnumber, partname, partspec,stepname,reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderStepReportVerifySearch(wkshopcode,wo_code, partnumber, partname, partspec,stepname,reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
diff --git a/VueWebCoreApi/DLL/BLL/BasicSettingBLL.cs b/VueWebCoreApi/DLL/BLL/BasicSettingBLL.cs
index 67e3b20..0edaa1b 100644
--- a/VueWebCoreApi/DLL/BLL/BasicSettingBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/BasicSettingBLL.cs
@@ -359,9 +359,9 @@
#endregion
#region[浠撲綅淇℃伅鏂板/缂栬緫淇濆瓨]
- public static ToMessage TSecLocaAddUpdate(string data_sources, string locacode, string locaname, string stckcode, string parentlocacode, string status, string description, string OperType, User us)
+ public static ToMessage TSecLocaAddUpdate(string data_sources, string locacode, string locaname, string stckcode, string parentlocacode,string depth, string status, string description, string OperType, User us)
{
- return BasicSettingDAL.TSecStckAddUpdate(data_sources, locacode, locaname, stckcode, parentlocacode, status, description, OperType, us);
+ return BasicSettingDAL.TSecLocaAddUpdate(data_sources, locacode, locaname, stckcode, parentlocacode, depth, status, description, OperType, us);
}
#endregion
diff --git a/VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs b/VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs
index 502cbc7..15e038d 100644
--- a/VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/GeneralBasicDataBLL.cs
@@ -17,6 +17,13 @@
}
#endregion
+ #region[缁勭粐鏋舵瀯鍩虹璧勬枡(鏃犲叕鍙�)]
+ public static ToMessage PrentOrganizationNoCompany()
+ {
+ return GeneralBasicDataDAL.PrentOrganizationNoCompany();
+ }
+ #endregion
+
#region[宀椾綅鍩虹璧勬枡]
public static ToMessage PostPermissions()
{
diff --git a/VueWebCoreApi/DLL/BLL/KanBanManagerentBLL.cs b/VueWebCoreApi/DLL/BLL/KanBanManagerentBLL.cs
new file mode 100644
index 0000000..a6f15e4
--- /dev/null
+++ b/VueWebCoreApi/DLL/BLL/KanBanManagerentBLL.cs
@@ -0,0 +1,55 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using VueWebCoreApi.DLL.DAL;
+using VueWebCoreApi.Tools;
+
+namespace VueWebCoreApi.DLL.BLL
+{
+ public class KanBanManagerentBLL
+ {
+ #region[杞﹂棿鐪嬫澘,涓婄敓浜т俊鎭痌
+ public static ToMessage WorkShopProduceTopData(string wkshopcode)
+ {
+ return KanBanManagerentDAL.WorkShopProduceTopData(wkshopcode);
+ }
+ #endregion
+
+ #region[杞﹂棿鐪嬫澘,涓嬪乏杩戜竴鍛ㄤ笉鑹秼鍔縘
+ public static ToMessage WorkShopProduceBottomLeftData(string wkshopcode)
+ {
+ return KanBanManagerentDAL.WorkShopProduceBottomLeftData(wkshopcode);
+ }
+ #endregion
+
+ #region[杞﹂棿鐪嬫澘,涓嬪彸杩戜竴鏈堜笉鑹粺璁
+ public static ToMessage WorkShopProduceBottomRightData(string wkshopcode)
+ {
+ return KanBanManagerentDAL.WorkShopProduceBottomRightData(wkshopcode);
+ }
+ #endregion
+
+
+ #region[杞﹂棿缁煎悎鐪嬫澘,宸︿笂鐢熶骇璁㈠崟]
+ public static ToMessage WorkShopCompreLeftTop(string wkshopcode)
+ {
+ return KanBanManagerentDAL.WorkShopCompreLeftTop(wkshopcode);
+ }
+ #endregion
+
+ #region[杞﹂棿缁煎悎鐪嬫澘,鍙充笂閿�鍞鍗昡
+ public static ToMessage WorkShopCompreRightTop()
+ {
+ return KanBanManagerentDAL.WorkShopCompreRightTop();
+ }
+ #endregion
+
+ #region[杞﹂棿缁煎悎鐪嬫澘,鍙充笅搴撳瓨]
+ public static ToMessage WorkShopCompreRightBottom()
+ {
+ return KanBanManagerentDAL.WorkShopCompreRightBottom();
+ }
+ #endregion
+ }
+}
diff --git a/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs b/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
index ca3d908..8056c64 100644
--- a/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/MouldManagerBLL.cs
@@ -486,5 +486,20 @@
return MouldManagerDAL.MouldCirculateMachinesOutExcel(mouldcode, mouldname, mouldspec, type, operuser, opendate, closedate);
}
#endregion
+
+
+ #region[妯″叿鍑哄叆搴撹褰曟煡璇
+ public static ToMessage MouldInOutMachinesSearch(string mouldcode, string mouldname, string mouldspec, string type, string warehousecode, string locationcode, string operuser, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+ {
+ return MouldManagerDAL.MouldInOutMachinesSearch(mouldcode, mouldname, mouldspec, type, warehousecode, locationcode, operuser, opendate, closedate, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[妯″叿鍑哄叆搴撹褰曞鍑篯
+ public static ToMessage MouldInOutMachinesOutExcel(string mouldcode, string mouldname, string mouldspec, string type, string warehousecode, string locationcode, string operuser, string opendate, string closedate)
+ {
+ return MouldManagerDAL.MouldInOutMachinesOutExcel(mouldcode, mouldname, mouldspec, type, warehousecode, locationcode, operuser, opendate, closedate);
+ }
+ #endregion
}
}
diff --git a/VueWebCoreApi/DLL/BLL/ReportManagerBLL.cs b/VueWebCoreApi/DLL/BLL/ReportManagerBLL.cs
index 2f5db86..3abaf3b 100644
--- a/VueWebCoreApi/DLL/BLL/ReportManagerBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/ReportManagerBLL.cs
@@ -10,24 +10,24 @@
public class ReportManagerBLL
{
#region[鐢熶骇杩涘害鎶ヨ〃]
- public static ToMessage ProductionScheduleReportSearch(string status, string wocode,string wkshopcode,string wkshopname, string partcode, string partname, string partspec, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage ProductionScheduleReportSearch(string status, string wkshopcode,string wocode,string partcode, string partname, string partspec, string opendate, string closedate, int startNum, int endNum, string prop, string order)
{
- return ReportManagerDAL.ProductionScheduleReportSearch(status, wocode, wkshopcode, wkshopname, partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
+ return ReportManagerDAL.ProductionScheduleReportSearch(status, wkshopcode, wocode,partcode, partname, partspec, opendate, closedate, startNum, endNum, prop, order);
}
#endregion
#region[鐢熶骇杩涘害鎶ヨ〃瀵煎嚭]
- public static ToMessage ProductionScheduleReportExcelSearch(string status, string wocode, string wkshopcode, string wkshopname, string partcode, string partname, string partspec, string opendate, string closedate)
+ public static ToMessage ProductionScheduleReportExcelSearch(string status, string wkshopcode, string wocode, string partcode, string partname, string partspec, string opendate, string closedate)
{
- return ReportManagerDAL.ProductionScheduleReportExcelSearch(status, wocode, wkshopcode, wkshopname, partcode, partname, partspec, opendate, closedate);
+ return ReportManagerDAL.ProductionScheduleReportExcelSearch(status, wkshopcode, wocode, partcode, partname, partspec, opendate, closedate);
}
#endregion
#region[鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ]
- public static ToMessage GroupSalaryReportSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage GroupSalaryReportSearch(string compute,string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, int startNum, int endNum, string prop, string order)
{
- return ReportManagerDAL.GroupSalaryReportSearch(compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);
+ return ReportManagerDAL.GroupSalaryReportSearch(compute, wkshopcode, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);
}
#endregion
@@ -39,69 +39,69 @@
#endregion
#region[鐝粍宸ヨ祫鎶ヨ〃璁板綍瀵煎嚭]
- public static ToMessage GroupSalaryReportExcelSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate)
+ public static ToMessage GroupSalaryReportExcelSearch(string compute,string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate)
{
- return ReportManagerDAL.GroupSalaryReportExcelSearch(compute, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate);
+ return ReportManagerDAL.GroupSalaryReportExcelSearch(compute, wkshopcode, wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate);
}
#endregion
#region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃]
- public static ToMessage PeopleSalaryReportSearch(string compute, string wocode, string partcode, string partname, string partspec,string stepcode, string stepname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage PeopleSalaryReportSearch(string compute,string wkshopcode, string wocode, string partcode, string partname, string partspec,string stepcode, string stepname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
{
- return ReportManagerDAL.PeopleSalaryReportSearch(compute, wocode, partcode, partname, partspec, stepcode, stepname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
+ return ReportManagerDAL.PeopleSalaryReportSearch(compute, wkshopcode, wocode, partcode, partname, partspec, stepcode, stepname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
}
#endregion
#region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭]
- public static ToMessage PeopleSalaryReportExcelSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepcode, string stepname, string reportname, string reportopendate, string reportclosedate)
+ public static ToMessage PeopleSalaryReportExcelSearch(string compute,string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepcode, string stepname, string reportname, string reportopendate, string reportclosedate)
{
- return ReportManagerDAL.PeopleSalaryReportSearch(compute, wocode, partcode, partname, partspec, stepcode, stepname, reportname, reportopendate, reportclosedate);
+ return ReportManagerDAL.PeopleSalaryReportSearch(compute, wkshopcode, wocode, partcode, partname, partspec, stepcode, stepname, reportname, reportopendate, reportclosedate);
}
#endregion
#region[濮斿鎶ヨ〃璁板綍鏌ヨ]
- public static ToMessage OutSourceReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage OutSourceReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate, int startNum, int endNum, string prop, string order)
{
- return ReportManagerDAL.OutSourceReportSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
+ return ReportManagerDAL.OutSourceReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
}
#endregion
#region[濮斿鎶ヨ〃璁板綍瀵煎嚭]
- public static ToMessage OutSourceReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate)
+ public static ToMessage OutSourceReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate)
{
- return ReportManagerDAL.OutSourceReportExcelSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
+ return ReportManagerDAL.OutSourceReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
}
#endregion
#region[涓嶈壇鏄庣粏鎶ヨ〃]
- public static ToMessage DefectDetailsReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage DefectDetailsReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
{
- return ReportManagerDAL.DefectDetailsReportSearch(wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
+ return ReportManagerDAL.DefectDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate, startNum, endNum, prop, order);
}
#endregion
#region[涓嶈壇鏄庣粏鎶ヨ〃瀵煎嚭]
- public static ToMessage DefectDetailsReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate)
+ public static ToMessage DefectDetailsReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate)
{
- return ReportManagerDAL.DefectDetailsReportExcelSearch(wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
+ return ReportManagerDAL.DefectDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, defectcode, defectname, reportname, reportopendate, reportclosedate);
}
#endregion
#region[缁翠慨鏄庣粏鎶ヨ〃]
- public static ToMessage MaintenanceDetailsReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage MaintenanceDetailsReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate, int startNum, int endNum, string prop, string order)
{
- return ReportManagerDAL.MaintenanceDetailsReportSearch(wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
+ return ReportManagerDAL.MaintenanceDetailsReportSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate, startNum, endNum, prop, order);
}
#endregion
#region[缁翠慨鏄庣粏鎶ヨ〃瀵煎嚭]
- public static ToMessage MaintenanceDetailsReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate)
+ public static ToMessage MaintenanceDetailsReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate)
{
- return ReportManagerDAL.MaintenanceDetailsReportExcelSearch(wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
+ return ReportManagerDAL.MaintenanceDetailsReportExcelSearch(wkshopcode,wocode, partcode, partname, partspec, stepname, style, defectname, repairname, repairopendate, repairclosedate);
}
#endregion
}
diff --git a/VueWebCoreApi/DLL/BLL/WorkOrderBLL.cs b/VueWebCoreApi/DLL/BLL/WorkOrderBLL.cs
index 8472d63..97d5c44 100644
--- a/VueWebCoreApi/DLL/BLL/WorkOrderBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/WorkOrderBLL.cs
@@ -5,6 +5,7 @@
using System.Threading.Tasks;
using VueWebCoreApi.DLL.DAL;
using VueWebCoreApi.Models;
+using VueWebCoreApi.Models.ErpOrder;
using VueWebCoreApi.Models.ReportVerify;
using VueWebCoreApi.Models.UpdateReport;
using VueWebCoreApi.Models.WorkData;
@@ -16,9 +17,9 @@
{
#region[ERP璁㈠崟鏌ヨ]
- public static ToMessage ErpOrderSearch(string erporderstus, string erpordercode, string saleordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
+ public static ToMessage ErpOrderSearch(string erporderstus,string wkshopcode, string erpordercode, string saleordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
{
- return WorkOrderDAL.ErpOrderSearch(erporderstus, erpordercode, saleordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
+ return WorkOrderDAL.ErpOrderSearch(erporderstus, wkshopcode, erpordercode, saleordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
}
#endregion
@@ -26,6 +27,13 @@
public static ToMessage MarkSaveErpOrder(string erporderid,string sbid, string erpordercode, string saleordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string saleOrderDeliveryDate, User us)
{
return WorkOrderDAL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, us);
+ }
+ #endregion
+
+ #region[璁㈠崟鎵归噺涓嬭揪]
+ public static ToMessage MarkBatchSaveErpOrder(List<ErpOrderBatch> obj, User us)
+ {
+ return WorkOrderDAL.MarkBatchSaveErpOrder(obj,us);
}
#endregion
@@ -46,16 +54,16 @@
#region[MES宸ュ崟鏌ヨ]
- public static ToMessage MesOrderSearch(string mesorderstus, string mesordercode, string saleordercode, string sourceorder, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
+ public static ToMessage MesOrderSearch(string mesorderstus,string wkshopcode, string mesordercode, string saleordercode, string sourceorder, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
{
- return WorkOrderDAL.MesOrderSearch(mesorderstus, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ return WorkOrderDAL.MesOrderSearch(mesorderstus, wkshopcode, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
}
#endregion
#region[MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ]
- public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder, string saleordercode, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
+ public static ToMessage MesBadOrderSearch(string wkshopcode, string mesordercode, string sourceorder, string saleordercode, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
{
- return WorkOrderDAL.MesBadOrderSearch(mesordercode, sourceorder, saleordercode, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ return WorkOrderDAL.MesBadOrderSearch(wkshopcode,mesordercode, sourceorder, saleordercode, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
}
#endregion
@@ -96,9 +104,9 @@
#endregion
#region[宸ュ崟鍏抽棴鍒楄〃鏌ヨ]
- public static ToMessage MesOrderClosedSearch(string mesorderstus, string mesordercode, string sourceorder, string saleordercode, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
+ public static ToMessage MesOrderClosedSearch(string mesorderstus,string wkshopcode, string mesordercode, string sourceorder, string saleordercode, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
{
- return WorkOrderDAL.MesOrderClosedSearch(mesorderstus, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ return WorkOrderDAL.MesOrderClosedSearch(mesorderstus, wkshopcode, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
}
#endregion
@@ -110,23 +118,23 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(鑷埗)]
- public static ToMessage MesOrderStepSearch(string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderStepSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
{
- return WorkOrderDAL.MesOrderStepSearch(wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ return WorkOrderDAL.MesOrderStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
}
#endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(澶栧崗)]
- public static ToMessage MesOrderWxStepSearch(string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderWxStepSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
{
- return WorkOrderDAL.MesOrderWxStepSearch(wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ return WorkOrderDAL.MesOrderWxStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
}
#endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(涓嶈壇)]
- public static ToMessage MesOrderNgStepSearch(string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderNgStepSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
{
- return WorkOrderDAL.MesOrderNgStepSearch(wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ return WorkOrderDAL.MesOrderNgStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
}
#endregion
@@ -174,9 +182,9 @@
#region[鐢熶骇鎵ц,鎶ュ伐璋冩暣鏁版嵁鏌ヨ鎺ュ彛]
- public static ToMessage MesOrderStepVerifySearch(string wo_code, string partnumber, string partname, string partspec, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderStepVerifySearch(string wkshopcode,string wo_code, string partnumber, string partname, string partspec, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
{
- return WorkOrderDAL.MesOrderStepVerifySearch(wo_code, partnumber, partname, partspec, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
+ return WorkOrderDAL.MesOrderStepVerifySearch(wkshopcode,wo_code, partnumber, partname, partspec, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
}
#endregion
@@ -196,9 +204,9 @@
#region[鐢熶骇鎵ц,鎶ュ伐瀹℃牳鍒楄〃鏁版嵁鏌ヨ鎺ュ彛]
- public static ToMessage MesOrderStepReportVerifySearch(string wo_code, string partnumber, string partname, string partspec, string stepname, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderStepReportVerifySearch(string wkshopcode, string wo_code, string partnumber, string partname, string partspec, string stepname, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
{
- return WorkOrderDAL.MesOrderStepReportVerifySearch(wo_code, partnumber, partname, partspec, stepname, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
+ return WorkOrderDAL.MesOrderStepReportVerifySearch(wkshopcode,wo_code, partnumber, partname, partspec, stepname, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
}
#endregion
diff --git a/VueWebCoreApi/DLL/DAL/BaseDateDAL.cs b/VueWebCoreApi/DLL/DAL/BaseDateDAL.cs
index c31c97b..02c2866 100644
--- a/VueWebCoreApi/DLL/DAL/BaseDateDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/BaseDateDAL.cs
@@ -28,14 +28,14 @@
where type in('211','228') and is_delete='0'";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -52,14 +52,14 @@
where description='D' and is_delete='0'";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -75,14 +75,14 @@
sql = @"select code,name from T_Sec_Stck";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -98,14 +98,14 @@
sql = @"select code,name from T_Sec_Loca";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -124,7 +124,7 @@
if (data.Rows.Count <= 0)
{
mes.code = "300";
- mes.Message = "搴撲綅淇℃伅涓嶅瓨鍦�!";
+ mes.message = "搴撲綅淇℃伅涓嶅瓨鍦�!";
mes.data = null;
return mes;
}
@@ -135,14 +135,14 @@
dynamicParams.Add("@locationcode", locationcode);
var data1 = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -159,14 +159,14 @@
where is_delete='0'";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -183,14 +183,14 @@
where status='Y' and checktype='InCheck'";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -208,14 +208,14 @@
dynamicParams.Add("@param", param);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -252,14 +252,14 @@
where G.is_delete<>'1' " + search;
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -296,14 +296,14 @@
where R.is_delete<>'1' " + search;
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -324,14 +324,14 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "erp绯荤粺涓湭缁存姢姝や俊鎭�!";
+ mes.message = "erp绯荤粺涓湭缁存姢姝や俊鎭�!";
mes.data = null;
}
}
@@ -339,7 +339,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -358,14 +358,14 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "erp绯荤粺涓湭缁存姢姝や俊鎭�!";
+ mes.message = "erp绯荤粺涓湭缁存姢姝や俊鎭�!";
mes.data = null;
}
}
@@ -373,7 +373,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -392,14 +392,14 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "erp绯荤粺涓湭缁存姢姝や俊鎭�!";
+ mes.message = "erp绯荤粺涓湭缁存姢姝や俊鎭�!";
mes.data = null;
}
}
@@ -407,7 +407,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
diff --git a/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs b/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
index 4b0931d..2bd8568 100644
--- a/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/BasicSettingDAL.cs
@@ -67,7 +67,7 @@
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -75,7 +75,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -97,7 +97,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
mes.data = null;
return mes;
}
@@ -116,14 +116,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -143,14 +143,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -159,7 +159,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -182,7 +182,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶栧崗渚涙柟宸插叧鑱斿鍗忓伐搴�,涓嶅厑璁稿垹闄�!";
+ mes.message = "澶栧崗渚涙柟宸插叧鑱斿鍗忓伐搴�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -194,14 +194,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -209,7 +209,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -247,14 +247,14 @@
where parent.is_delete<>'1' " + search;
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -273,7 +273,7 @@
where is_delete<>'1' ";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data;
}
@@ -281,7 +281,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -318,14 +318,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -333,7 +333,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -357,7 +357,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鍛煎彨绫诲瀷宸插叧鑱斿懠鍙厤缃�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠鍛煎彨绫诲瀷宸插叧鑱斿懠鍙厤缃�,涓嶅厑璁稿垹闄�!";
mes.data = null;
}
else
@@ -369,14 +369,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -385,7 +385,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -409,7 +409,7 @@
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
@@ -417,7 +417,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -446,14 +446,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏆傛棤鍝嶅簲浜哄憳!";
+ mes.message = "鏆傛棤鍝嶅簲浜哄憳!";
mes.data = null;
}
}
@@ -461,7 +461,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -522,14 +522,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -537,7 +537,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -571,14 +571,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -586,7 +586,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -626,14 +626,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -641,7 +641,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -662,14 +662,14 @@
dynamicParams.Add("@wkshpcode", wkshpcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -703,7 +703,7 @@
where 1=1" + search + " order by T.lm_date desc";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = data.Rows.Count;
mes.data = data;
}
@@ -711,7 +711,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -735,7 +735,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.message = "鏂板鎿嶄綔澶辫触,缂栫爜閲嶅!";
mes.data = null;
return mes;
}
@@ -765,14 +765,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗙粍缁�:" + OrganCode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -789,7 +789,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂伴�夋嫨鐨勬墍灞炵粍缁囧凡浣跨敤涓嶅厑璁镐慨鏀�!";
+ mes.message = "鏂伴�夋嫨鐨勬墍灞炵粍缁囧凡浣跨敤涓嶅厑璁镐慨鏀�!";
mes.data = null;
return mes;
}
@@ -812,7 +812,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鍘熸湁缁勭粐鎴栧瓙绾ц浣跨敤涓嶅厑璁镐慨鏀�!";
+ mes.message = "褰撳墠鍘熸湁缁勭粐鎴栧瓙绾ц浣跨敤涓嶅厑璁镐慨鏀�!";
mes.data = null;
return mes;
}
@@ -863,14 +863,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗙粍缁�:" + OrganCode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -879,7 +879,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -900,7 +900,7 @@
if (data0.Rows.Count > 0)
{
mes.code = "300";
- mes.Message = "褰撳墠缁勭粐鏈変笅绾у叧鑱�,璇峰厛鍒犻櫎涓嬬骇缁勭粐!";
+ mes.message = "褰撳墠缁勭粐鏈変笅绾у叧鑱�,璇峰厛鍒犻櫎涓嬬骇缁勭粐!";
return mes;
}
sql = @"select * from TUser where storg_code=@orgcode";
@@ -910,7 +910,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璇ョ粍缁囦笅鏈夊叧鑱旂殑鐢ㄦ埛,涓嶅厑璁稿垹闄�!";
+ mes.message = "璇ョ粍缁囦笅鏈夊叧鑱旂殑鐢ㄦ埛,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -923,14 +923,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鍒犻櫎浜嗙粍缁�:" + orgcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔鎴愬姛!";
+ mes.message = "鍒犻櫎鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔澶辫触!";
+ mes.message = "鍒犻櫎鎿嶄綔澶辫触!";
mes.data = null;
}
@@ -939,7 +939,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -973,7 +973,7 @@
where 1=1 " + search + "";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -981,7 +981,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1005,7 +1005,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.message = "鏂板鎿嶄綔澶辫触,缂栫爜閲嶅!";
mes.data = null;
return mes;
}
@@ -1033,14 +1033,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗矖浣�:" + postcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1056,7 +1056,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璇ュ矖浣嶆湁鍏宠仈鐨勭敤鎴�,涓嶅厑璁稿仠鐢�!";
+ mes.message = "璇ュ矖浣嶆湁鍏宠仈鐨勭敤鎴�,涓嶅厑璁稿仠鐢�!";
mes.data = null;
return mes;
}
@@ -1084,14 +1084,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗矖浣�:" + postcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1100,7 +1100,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1122,7 +1122,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璇ュ矖浣嶆湁鍏宠仈鐨勭敤鎴�,涓嶅厑璁稿垹闄�!";
+ mes.message = "璇ュ矖浣嶆湁鍏宠仈鐨勭敤鎴�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -1135,14 +1135,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗矖浣�:" + postcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔鎴愬姛!";
+ mes.message = "鍒犻櫎鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔澶辫触!";
+ mes.message = "鍒犻櫎鎿嶄綔澶辫触!";
mes.data = null;
}
@@ -1151,7 +1151,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1211,7 +1211,7 @@
left join TUser S on U.lm_user=S.usercode " + search + "";
var data = DapperHelper.GetPagedDataWith<object>(withsql, sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -1219,7 +1219,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1292,7 +1292,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.message = "鏂板鎿嶄綔澶辫触,缂栫爜閲嶅!";
mes.data = null;
return mes;
}
@@ -1326,14 +1326,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗙敤鎴�:" + usercode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1370,14 +1370,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗙敤鎴�:" + usercode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1386,7 +1386,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1412,14 +1412,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗙敤鎴�:" + usercode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鐢ㄦ埛鎴愬姛!";
+ mes.message = "鍒犻櫎鐢ㄦ埛鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎鐢ㄦ埛澶辫触!";
+ mes.message = "鍒犻櫎鐢ㄦ埛澶辫触!";
mes.data = null;
}
}
@@ -1427,7 +1427,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1461,7 +1461,7 @@
where 1=1 " + search + "";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -1469,7 +1469,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1493,7 +1493,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.message = "鏂板鎿嶄綔澶辫触,缂栫爜閲嶅!";
mes.data = null;
return mes;
}
@@ -1521,14 +1521,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗙彮缁�:" + groupcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1544,7 +1544,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璇ョ彮缁勬湁鍏宠仈鐨勭敤鎴�,涓嶅厑璁稿仠鐢�!";
+ mes.message = "璇ョ彮缁勬湁鍏宠仈鐨勭敤鎴�,涓嶅厑璁稿仠鐢�!";
mes.data = null;
return mes;
}
@@ -1572,14 +1572,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗙彮缁�:" + groupcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1588,7 +1588,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1610,7 +1610,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璇ョ彮缁勬湁鍏宠仈鐨勭敤鎴�,涓嶅厑璁稿垹闄�!";
+ mes.message = "璇ョ彮缁勬湁鍏宠仈鐨勭敤鎴�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -1623,14 +1623,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗙彮缁�:" + groupcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔鎴愬姛!";
+ mes.message = "鍒犻櫎鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔澶辫触!";
+ mes.message = "鍒犻櫎鎿嶄綔澶辫触!";
mes.data = null;
}
@@ -1639,7 +1639,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1679,7 +1679,7 @@
where 1=1 " + search + "";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -1687,7 +1687,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1719,7 +1719,7 @@
if (data.Rows.Count > 0)
{
mes.code = "300";
- mes.Message = "鍚屽悕瑙掕壊宸插瓨鍦�!";
+ mes.message = "鍚屽悕瑙掕壊宸插瓨鍦�!";
mes.data = null;
return mes;
}
@@ -1751,14 +1751,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚鑹�:" + ((List<string>)mes.data)[0].ToString(), us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶辫触!";
+ mes.message = "澶辫触!";
mes.data = null;
}
}
@@ -1774,7 +1774,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璇ヨ鑹叉湁鍏宠仈鐨勭敤鎴�,涓嶅厑璁稿仠鐢�!";
+ mes.message = "璇ヨ鑹叉湁鍏宠仈鐨勭敤鎴�,涓嶅厑璁稿仠鐢�!";
mes.data = null;
return mes;
}
@@ -1840,14 +1840,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗚鑹插悕绉�:" + rolecode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶辫触!";
+ mes.message = "澶辫触!";
mes.data = null;
}
}
@@ -1856,7 +1856,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1880,7 +1880,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璇ヨ鑹叉湁鍏宠仈鐨勭敤鎴�,涓嶅厑璁稿垹闄�!";
+ mes.message = "璇ヨ鑹叉湁鍏宠仈鐨勭敤鎴�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -1897,14 +1897,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗚鑹�:" + rolecode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶辫触!";
+ mes.message = "澶辫触!";
mes.data = null;
}
}
@@ -1912,7 +1912,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1995,7 +1995,7 @@
where 1=1 and U.status='Y' and U.role_code<>'' " + search + "";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -2003,7 +2003,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2045,14 +2045,14 @@
LogHelper.DbOperateLog(us.usercode, "鍙栨秷", "鍙栨秷浜嗚鑹插叧鑱旂殑鐢ㄦ埛:" + string.Join(",", user), us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶辫触!";
+ mes.message = "澶辫触!";
mes.data = null;
}
@@ -2062,7 +2062,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2100,14 +2100,14 @@
LogHelper.DbOperateLog(us.usercode, "娣诲姞", "娣诲姞浜嗚鑹插叧鑱旂殑鐢ㄦ埛:" + string.Join(",", user), us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶辫触!";
+ mes.message = "澶辫触!";
mes.data = null;
}
@@ -2117,7 +2117,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2143,14 +2143,14 @@
{
mes.code = "200";
mes.count = list.Count;
- mes.Message = "鏌ヨ瑙掕壊鎴愬姛锛�";
+ mes.message = "鏌ヨ瑙掕壊鎴愬姛锛�";
mes.data = list;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏆傛棤瑙掕壊锛�";
+ mes.message = "鏆傛棤瑙掕壊锛�";
mes.data = null;
}
}
@@ -2158,7 +2158,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2182,7 +2182,7 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛锛�";
+ mes.message = "鏌ヨ鎴愬姛锛�";
mes.data = data;
return mes;
}
@@ -2190,7 +2190,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏆傛棤鑿滃崟锛�";
+ mes.message = "鏆傛棤鑿滃崟锛�";
mes.data = null;
return mes;
}
@@ -2199,7 +2199,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2220,7 +2220,7 @@
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛锛�";
+ mes.message = "鏌ヨ鎴愬姛锛�";
mes.data = data;
return mes;
}
@@ -2228,7 +2228,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2257,14 +2257,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒嗛厤", "鍒嗛厤浜嗚鑹叉潈闄�:" + "-->瑙掕壊:" + rolecode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶辫触!";
+ mes.message = "澶辫触!";
mes.data = null;
}
}
@@ -2272,7 +2272,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2291,14 +2291,14 @@
sql = @"select code,name,idparent,data_sources from TCustomerType ";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2322,7 +2322,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "寰�鏉ュ崟浣嶅垎绫讳笂绾т笉鑳芥槸宸叉湁寰�鏉ュ崟浣嶇殑鍒嗙被锛岃閲嶆柊杈撳叆锛�";
+ mes.message = "寰�鏉ュ崟浣嶅垎绫讳笂绾т笉鑳芥槸宸叉湁寰�鏉ュ崟浣嶇殑鍒嗙被锛岃閲嶆柊杈撳叆锛�";
mes.data = null;
return mes;
}
@@ -2337,7 +2337,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "寰�鏉ュ崟浣嶅垎绫荤紪鐮佸凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
+ mes.message = "寰�鏉ュ崟浣嶅垎绫荤紪鐮佸凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -2349,7 +2349,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "寰�鏉ュ崟浣嶅垎绫诲悕绉板凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
+ mes.message = "寰�鏉ュ崟浣嶅垎绫诲悕绉板凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -2376,14 +2376,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗線鏉ュ崟浣嶅垎绫�:" + customerclasscode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2398,7 +2398,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "寰�鏉ュ崟浣嶅垎绫诲悕绉板凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
+ mes.message = "寰�鏉ュ崟浣嶅垎绫诲悕绉板凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -2424,14 +2424,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗線鏉ュ崟浣嶅垎绫�:" + customerclasscode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2440,7 +2440,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2464,7 +2464,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠寰�鏉ュ崟浣嶅垎绫绘垨涓嬬骇琚紩鐢ㄤ笉鍏佽鍒犻櫎锛�";
+ mes.message = "褰撳墠寰�鏉ュ崟浣嶅垎绫绘垨涓嬬骇琚紩鐢ㄤ笉鍏佽鍒犻櫎锛�";
mes.data = null;
return mes;
}
@@ -2485,14 +2485,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗線鏉ュ崟浣嶅垎绫�:" + string.Join(",", classcode), us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2500,7 +2500,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2541,7 +2541,7 @@
var total = 0; //鎬绘潯鏁�
data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -2549,7 +2549,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2574,7 +2574,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "寰�鏉ュ崟浣嶇紪鐮佸凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
+ mes.message = "寰�鏉ュ崟浣嶇紪鐮佸凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -2586,7 +2586,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "寰�鏉ュ崟浣嶅悕绉板凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
+ mes.message = "寰�鏉ュ崟浣嶅悕绉板凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -2617,14 +2617,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗線鏉ュ崟浣�:" + customercode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2639,7 +2639,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "寰�鏉ュ崟浣嶅悕绉板凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
+ mes.message = "寰�鏉ュ崟浣嶅悕绉板凡瀛樺湪,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -2669,14 +2669,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗線鏉ュ崟浣�:" + customercode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2685,7 +2685,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2720,14 +2720,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗線鏉ュ崟浣�:" + customercode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔鎴愬姛!";
+ mes.message = "鍒犻櫎鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔澶辫触!";
+ mes.message = "鍒犻櫎鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2736,7 +2736,7 @@
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2780,7 +2780,7 @@
var total = 0; //鎬绘潯鏁�
data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -2788,7 +2788,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2813,7 +2813,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "浠撳簱缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "浠撳簱缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -2825,7 +2825,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "浠撳簱鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "浠撳簱鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -2854,14 +2854,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗕粨搴�:" + stckcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2876,7 +2876,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "浠撳簱鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "浠撳簱鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -2919,14 +2919,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗕粨搴�:" + stckcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2935,7 +2935,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2958,7 +2958,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "浠撳簱宸插惎鐢ㄨ揣浣�,涓嶅厑璁稿垹闄�!";
+ mes.message = "浠撳簱宸插惎鐢ㄨ揣浣�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -2980,14 +2980,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗕粨搴�:" + stckcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔鎴愬姛!";
+ mes.message = "鍒犻櫎鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔澶辫触!";
+ mes.message = "鍒犻櫎鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2996,7 +2996,7 @@
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3011,20 +3011,20 @@
try
{
//鑾峰彇寮�鍚粨浣嶇鎺х殑浠撳簱淇℃伅
- sql = @"select S.code,S.name,'-1' as idparent,S.code as warhouse from TSecStck S where S.ishasPosition='1'
+ sql = @"select code,name,'-1' as idparent,'' as warhouse,'0' as depth from TSecStck where ishasPosition='1'
union all
- select L.code,L.name,case when L.idparent is NULL or L.idparent='' then L.idwarehouse else L.idparent end as idparent,L.idwarehouse as warhouse
+ select code,name,case when L.idparent is NULL or L.idparent='' then '-1' else L.idparent end as idparent,idwarehouse,depth
from TSecLoca L ";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3039,51 +3039,44 @@
IEnumerable<object> data;
try
{
- if (flag == "Y")
+ string[] classcode = Array.ConvertAll<string, string>(stckcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ switch (flag)
{
- if (stckcode != "" && stckcode != null)
- {
- string[] classcode = Array.ConvertAll<string, string>(stckcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
- search += "and C.idparent in @classcode ";
- dynamicParams.Add("@classcode", classcode);
- }
-
- }
- if (flag == "N")
- {
- if (stckcode != "" && stckcode != null)
- {
- string[] classcode = Array.ConvertAll<string, string>(stckcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
- search += "and C.idparent in @classcode and C.endpnt=@endpnt";
- dynamicParams.Add("@classcode", classcode);
- dynamicParams.Add("@endpnt", classcode);
- }
+ case "-1": //鍏ㄩ儴
+ search += " and L.idparent is null or L.idparent='' and L.idwarehouse in @idwarehouse ";
+ dynamicParams.Add("@idwarehouse", classcode);
+ break;
+ case "0": //浠撳簱
+ search += " and L.depth='1' and L.idwarehouse in @idwarehouse ";
+ dynamicParams.Add("@idwarehouse", classcode);
+ break;
+ default: //浠撲綅
+ search += " and L.idparent in @idparent";
+ dynamicParams.Add("@idparent", classcode);
+ break;
}
if (locacode != "" && locacode != null)
{
- search += "and C.code like '%'+@locacode+'%' ";
+ search += "and L.code like '%'+@locacode+'%' ";
dynamicParams.Add("@locacode", locacode);
}
if (locaname != "" && locaname != null)
{
- search += "and C.name like '%'+@locaname+'%' ";
+ search += "and L.name like '%'+@locaname+'%' ";
dynamicParams.Add("@locaname", locaname);
}
- sql = @"select C.code,C.name,C.status,C.description,C.idwarehouse as stckcode,T.name as stckname,C.idparent as parentcode,L.name as parentname,C.endpnt,
- C.lm_user as usercode,U.username,C.lm_date,C.data_sources
- from (
- select L.code,L.name,L.idwarehouse,L.status,L.description,L.lm_user,L.lm_date,L.data_sources,case when L.idparent is NULL or L.idparent='' then L.idwarehouse else L.idparent end as idparent,L.idparent as endpnt
+ sql = @"select L.code,L.name,L.status,L.description,L.idwarehouse as stckcode,T.name as stckname,
+ L.idparent as parentcode,S.name as parentname,L.data_sources,L.lm_user as usercode,U.username,L.lm_date
from TSecLoca L
- ) as C
- left join TSecStck T on C.idwarehouse=T.code
- left join TSecLoca L on C.idparent=L.code
- left join TUser U on C.lm_user=U.usercode
- where 1=1 " + search;
+ left join TSecStck T on L.idwarehouse=T.code
+ left join TSecLoca S on L.idparent=S.code
+ left join TUser U on L.lm_user=U.usercode
+ where 1=1 " + search;
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -3091,7 +3084,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3099,7 +3092,7 @@
#endregion
#region[浠撲綅淇℃伅鏂板/缂栬緫淇濆瓨]
- public static ToMessage TSecStckAddUpdate(string data_sources, string locacode, string locaname, string stckcode, string parentlocacode, string status, string description, string OperType, User us)
+ public static ToMessage TSecLocaAddUpdate(string data_sources, string locacode, string locaname, string stckcode, string parentlocacode,string depth, string status, string description, string OperType, User us)
{
string sql = "";
List<object> list = new List<object>();
@@ -3116,7 +3109,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "浠撲綅缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "浠撲綅缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -3128,13 +3121,17 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "浠撲綅宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "浠撲綅宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
- //鍐欏叆寰�鏉ュ崟浣�
- sql = @"insert into TSecLoca(code,name,idwarehouse,idparent,status,description,lm_user,lm_date,data_sources)
- values(@code,@name,@idwarehouse,@idparent,@status,@description,@lm_user,@lm_date,@data_sources)";
+ if (depth == "1") //灞傜骇涓�1鏃�,缃┖涓婄骇缂栫爜
+ {
+ parentlocacode = "";
+ }
+ //鍐欏叆浠撲綅
+ sql = @"insert into TSecLoca(code,name,idwarehouse,idparent,status,description,lm_user,lm_date,data_sources,depth)
+ values(@code,@name,@idwarehouse,@idparent,@status,@description,@lm_user,@lm_date,@data_sources,@depth)";
list.Add(new
{
str = sql,
@@ -3148,7 +3145,8 @@
description = description,
lm_user = us.usercode,
lm_date = DateTime.Now.ToString(),
- data_sources = data_sources
+ data_sources = data_sources,
+ depth= depth
}
});
bool aa = DapperHelper.DoTransaction(list);
@@ -3158,14 +3156,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗕粨浣�:" + locacode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -3176,7 +3174,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "涓婄骇璐т綅涓嶈兘鏄簱浣嶆湰韬紒";
+ mes.message = "涓婄骇璐т綅涓嶈兘鏄簱浣嶆湰韬紒";
mes.data = null;
return mes;
}
@@ -3189,12 +3187,16 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "浠撲綅鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "浠撲綅鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
+ if (depth == "1") //灞傜骇涓�1鏃�,缃┖涓婄骇缂栫爜
+ {
+ parentlocacode = "";
+ }
//鏇存柊瀛樿揣鍒嗙被
- sql = @"update TSecLoca set name=@name,idwarehouse=@idwarehouse,idparent=@idparent,status=@status,description=@description,lm_user=@lm_user,lm_date=@lm_date
+ sql = @"update TSecLoca set name=@name,idwarehouse=@idwarehouse,idparent=@idparent,depth=@depth,status=@status,description=@description,lm_user=@lm_user,lm_date=@lm_date
where code=@code";
list.Add(new
{
@@ -3205,6 +3207,7 @@
name = locaname,
idwarehouse = stckcode,
idparent = parentlocacode,
+ depth= depth,
status = status,
description = description,
lm_user = us.usercode,
@@ -3232,14 +3235,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗕粨浣�:" + locacode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -3248,7 +3251,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3271,7 +3274,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠浠撲綅涓嬪瓨鍦ㄥ瓙椤�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠浠撲綅涓嬪瓨鍦ㄥ瓙椤�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -3293,14 +3296,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗕粨浣�:" + locacode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔鎴愬姛!";
+ mes.message = "鍒犻櫎鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔澶辫触!";
+ mes.message = "鍒犻櫎鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -3309,7 +3312,7 @@
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3356,7 +3359,7 @@
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -3364,7 +3367,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3388,7 +3391,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
mes.data = null;
return mes;
}
@@ -3408,14 +3411,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗伐搴�:" + stepcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -3432,7 +3435,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ簭鏈夊叧鑱斿伐鍗�,涓嶅厑璁镐慨鏀�!";
+ mes.message = "宸ュ簭鏈夊叧鑱斿伐鍗�,涓嶅厑璁镐慨鏀�!";
mes.data = null;
return mes;
}
@@ -3447,14 +3450,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗伐搴�:" + stepcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -3463,7 +3466,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3487,7 +3490,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ簭鏈夊叧鑱斿伐鍗�,涓嶅厑璁稿垹闄�!";
+ mes.message = "宸ュ簭鏈夊叧鑱斿伐鍗�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -3501,14 +3504,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗伐搴�:" + stepcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -3516,7 +3519,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
diff --git a/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs
index fba962b..ab8bc86 100644
--- a/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/DeviceManagerDAL.cs
@@ -34,7 +34,7 @@
where A.is_delete<>'1' ";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -42,7 +42,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -81,14 +81,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -96,7 +96,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -120,7 +120,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠璁惧缁勫凡鏈夊叧鑱旇澶囩粍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠璁惧缁勫凡鏈夊叧鑱旇澶囩粍,涓嶅厑璁稿垹闄�!";
mes.data = null;
}
else
@@ -133,14 +133,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -149,7 +149,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -171,14 +171,14 @@
dynamicParams.Add("@eqptypecode", eqptypecode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -217,14 +217,14 @@
where parent.is_delete<>'1' " + search;
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -244,14 +244,14 @@
var data = DapperHelper.selectProcedure("h_p_T_WorkShopSelectLine", dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -306,7 +306,7 @@
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -314,7 +314,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -343,14 +343,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -371,14 +371,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -387,7 +387,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -412,7 +412,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鐐规椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠鐐规椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -425,14 +425,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
@@ -441,7 +441,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -490,7 +490,7 @@
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -498,7 +498,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -526,14 +526,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -553,14 +553,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -569,7 +569,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -594,7 +594,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠淇濆吇椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠淇濆吇椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -607,14 +607,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
@@ -623,7 +623,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -688,7 +688,7 @@
where 1=1 " + search1 + ") M on A.code=M.eqpchkmain_code where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -696,7 +696,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -713,14 +713,14 @@
sql = @"select code,name,description from TEqpchk_Item where is_delete<>'1' ";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -752,7 +752,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犵偣妫�鏍囧噯淇℃伅!";
+ mes.message = "鏃犵偣妫�鏍囧噯淇℃伅!";
mes.data = null;
return mes;
}
@@ -765,14 +765,14 @@
rout.Data = data0;
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = rout;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -819,14 +819,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -866,14 +866,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -882,7 +882,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -904,7 +904,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鐐规鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠鐐规鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -922,14 +922,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "璁惧鐐规鏍囧噯鍒犻櫎鎴愬姛!";
+ mes.message = "璁惧鐐规鏍囧噯鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁惧鐐规鏍囧噯鍒犻櫎澶辫触!";
+ mes.message = "璁惧鐐规鏍囧噯鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -937,7 +937,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1024,14 +1024,14 @@
list.Add(rout);
}
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = list;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1097,14 +1097,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1112,7 +1112,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1179,7 +1179,7 @@
where 1=1 " + search1 + ") M on A.code=M.eapmai_code where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -1187,7 +1187,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1204,14 +1204,14 @@
sql = @"select code,name,description from TEqpmai_Item where is_delete<>'1' ";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1243,7 +1243,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犱繚鍏绘爣鍑嗕俊鎭�!";
+ mes.message = "鏃犱繚鍏绘爣鍑嗕俊鎭�!";
mes.data = null;
return mes;
}
@@ -1256,14 +1256,14 @@
rout.Data = data0;
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = rout;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1309,14 +1309,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1355,14 +1355,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1371,7 +1371,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1393,7 +1393,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠淇濆吇鏍囧噯宸茬敓鎴愪繚鍏昏褰�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠淇濆吇鏍囧噯宸茬敓鎴愪繚鍏昏褰�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -1412,14 +1412,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "璁惧淇濆吇鏍囧噯鍒犻櫎鎴愬姛!";
+ mes.message = "璁惧淇濆吇鏍囧噯鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁惧淇濆吇鏍囧噯鍒犻櫎澶辫触!";
+ mes.message = "璁惧淇濆吇鏍囧噯鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -1427,7 +1427,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1515,14 +1515,14 @@
list.Add(rout);
}
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = list;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1586,14 +1586,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1601,7 +1601,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1679,7 +1679,7 @@
where T.description='W' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -1687,7 +1687,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1709,14 +1709,14 @@
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1823,7 +1823,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "宸ュ簭妫�楠岃褰�");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -1831,7 +1831,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1914,7 +1914,7 @@
where T.description='W' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -1922,7 +1922,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1944,14 +1944,14 @@
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2066,7 +2066,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "宸ュ簭妫�楠岃褰�");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -2074,7 +2074,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2171,7 +2171,7 @@
where T.description='W' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -2179,7 +2179,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2239,14 +2239,14 @@
repair.repairimage = data3;
Dict.Add("data2", repair);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = Dict;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2353,7 +2353,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "璁惧缁翠慨璁板綍");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -2361,7 +2361,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2384,7 +2384,7 @@
from TEqpType";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = data.Rows.Count;
mes.data = data;
}
@@ -2392,7 +2392,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2418,7 +2418,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁惧绫诲瀷缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "璁惧绫诲瀷缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -2430,7 +2430,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁惧绫诲瀷鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "璁惧绫诲瀷鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -2459,14 +2459,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚澶囩被鍨�:" + string.Join(",", json.Select(m => m.code)), us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2481,7 +2481,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁惧绫诲瀷鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "璁惧绫诲瀷鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -2509,14 +2509,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗚澶囩被鍨�:" + string.Join(",", json.Select(m => m.code)), us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2525,7 +2525,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2549,7 +2549,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠璁惧绫诲瀷宸叉湁鍏宠仈璁惧,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠璁惧绫诲瀷宸叉湁鍏宠仈璁惧,涓嶅厑璁稿垹闄�!";
mes.data = null;
}
else
@@ -2563,14 +2563,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗚澶囩被鍨�:" + devicetypecode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -2579,7 +2579,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2630,7 +2630,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -2638,7 +2638,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2662,7 +2662,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁惧缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "璁惧缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -2674,7 +2674,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁惧鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "璁惧鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -2696,14 +2696,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚澶�:" + devicecode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2718,7 +2718,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁惧鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "璁惧鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -2738,14 +2738,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗚澶�:" + devicecode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2754,7 +2754,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2782,14 +2782,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗚澶�:" + devicecode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
@@ -2798,7 +2798,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
diff --git a/VueWebCoreApi/DLL/DAL/ErpSyncMesDAL.cs b/VueWebCoreApi/DLL/DAL/ErpSyncMesDAL.cs
index 8e60c8e..bb8b2f1 100644
--- a/VueWebCoreApi/DLL/DAL/ErpSyncMesDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ErpSyncMesDAL.cs
@@ -34,14 +34,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鍚屾璁￠噺鍗曚綅鎴愬姛!";
+ mes.message = "鍚屾璁￠噺鍗曚綅鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍚屾璁￠噺鍗曚綅澶辫触!";
+ mes.message = "鍚屾璁￠噺鍗曚綅澶辫触!";
mes.data = null;
}
}
@@ -49,7 +49,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -71,14 +71,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鍚屾瀛樿揣妗ｆ鎴愬姛!";
+ mes.message = "鍚屾瀛樿揣妗ｆ鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍚屾瀛樿揣妗ｆ澶辫触!";
+ mes.message = "鍚屾瀛樿揣妗ｆ澶辫触!";
mes.data = null;
}
}
@@ -86,7 +86,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -108,14 +108,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鍚屾浠撳簱鎴愬姛!";
+ mes.message = "鍚屾浠撳簱鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍚屾浠撳簱澶辫触!";
+ mes.message = "鍚屾浠撳簱澶辫触!";
mes.data = null;
}
}
@@ -123,7 +123,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -145,14 +145,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鍚屾浠撳簱鎴愬姛!";
+ mes.message = "鍚屾浠撳簱鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍚屾浠撳簱澶辫触!";
+ mes.message = "鍚屾浠撳簱澶辫触!";
mes.data = null;
}
}
@@ -160,7 +160,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -182,14 +182,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鍚屾鐢熶骇璁㈠崟鎴愬姛!";
+ mes.message = "鍚屾鐢熶骇璁㈠崟鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍚屾鐢熶骇璁㈠崟澶辫触!";
+ mes.message = "鍚屾鐢熶骇璁㈠崟澶辫触!";
mes.data = null;
}
}
@@ -197,7 +197,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
diff --git a/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs b/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
index 54cfec8..b33f3d0 100644
--- a/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ExcelCheckDAL.cs
@@ -109,7 +109,7 @@
mes.code = StuCode;
- mes.Message = Message;
+ mes.message = Message;
return mes;
}
@@ -306,7 +306,7 @@
}
mes.code = StuCode;
- mes.Message = Message;
+ mes.message = Message;
return mes;
}
#endregion
diff --git a/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs b/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
index 558029b..004b993 100644
--- a/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/GeneralBasicDataDAL.cs
@@ -34,14 +34,39 @@
sql = @"select * from TOrganization where status='Y'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[缁勭粐鏋舵瀯鍩虹璧勬枡(鏃犲叕鍙�)]
+ public static ToMessage PrentOrganizationNoCompany()
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ sql = @"select * from TOrganization where status='Y' and parent_id<>'0' or leve<>'0'";
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -59,14 +84,14 @@
sql = @"select postcode,postname from TPost where status='Y'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -84,14 +109,14 @@
sql = @"select rolecode,rolename from TRole where status='Y'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -109,14 +134,14 @@
sql = @"select usergroupcode,usergroupname from TGroup where status='Y'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -134,14 +159,14 @@
sql = @"select usercode,username from TUser where status='Y'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -162,14 +187,14 @@
dynamicParams.Add("@groupcode", "%," + groupcode + ",%");
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -187,14 +212,14 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犳寜閽。妗堟暟鎹�!";
+ mes.message = "鏃犳寜閽。妗堟暟鎹�!";
mes.data = null;
}
}
@@ -202,7 +227,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -220,14 +245,14 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犳暟鎹潈闄愭。妗堟暟鎹�!";
+ mes.message = "鏃犳暟鎹潈闄愭。妗堟暟鎹�!";
mes.data = null;
}
}
@@ -235,7 +260,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -257,7 +282,7 @@
from TUnit where isSingleUnit='1' and isGroup='0' and disabled='0'";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
if (tunittype == "M")
@@ -274,7 +299,7 @@
data[i].children = data0;
}
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
}
@@ -282,7 +307,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -300,14 +325,14 @@
sql = @"select code,name from TEqpType";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -325,14 +350,14 @@
sql = @"select code,name from TEqpInfo where enable='Y'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -350,14 +375,14 @@
sql = @"select code,name from TSecStck";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -395,14 +420,14 @@
list.Add(warhouse);
}
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = list;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -416,18 +441,18 @@
var dynamicParams = new DynamicParameters();
try
{
- sql = @"select code,name from TSecLoca where status='0' and idwarehouse=@idwarehouse";
+ sql = @"select code,name,depth from TSecLoca where status='0' and idwarehouse=@idwarehouse";
dynamicParams.Add("@idwarehouse", warhousecode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -445,14 +470,14 @@
sql = @"select stepcode,stepname from TStep where enable='Y'";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -470,14 +495,14 @@
sql = @"select code,name from TDefect";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -494,14 +519,14 @@
sql = @"select code,name from TCustomer where status='0'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -532,14 +557,14 @@
where status='0'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -556,14 +581,14 @@
sql = @"select code,name,description from TMouldchk_Item";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -580,14 +605,14 @@
sql = @"select code,name,description from TMouldmai_Item";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
diff --git a/VueWebCoreApi/DLL/DAL/GridReportDAL.cs b/VueWebCoreApi/DLL/DAL/GridReportDAL.cs
index 44b1065..a123fdc 100644
--- a/VueWebCoreApi/DLL/DAL/GridReportDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/GridReportDAL.cs
@@ -45,14 +45,14 @@
gidmes.recordset = data;
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛锛�";
+ mes.message = "鏌ヨ鎴愬姛锛�";
mes.data = gidmes;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犵敓浜т换鍔℃暟鎹紒";
+ mes.message = "鏃犵敓浜т换鍔℃暟鎹紒";
mes.data = null;
}
diff --git a/VueWebCoreApi/DLL/DAL/KanBanManagerentDAL.cs b/VueWebCoreApi/DLL/DAL/KanBanManagerentDAL.cs
new file mode 100644
index 0000000..9765700
--- /dev/null
+++ b/VueWebCoreApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -0,0 +1,212 @@
+锘縰sing Dapper;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using VueWebCoreApi.Tools;
+
+namespace VueWebCoreApi.DLL.DAL
+{
+ public class KanBanManagerentDAL
+ {
+ public static ToMessage mes = new ToMessage(); //瀹氫箟鍏ㄥ眬杩斿洖淇℃伅瀵硅薄
+
+ #region[杞﹂棿鐪嬫澘,涓婄敓浜т俊鎭痌
+ public static ToMessage WorkShopProduceTopData(string wkshopcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ sql = @"select * from h_v_JLKanBan_WorkshopTop where wkshp_code in @wkshoplist";
+ dynamicParams.Add("@wkshoplist", wkshoplist);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[杞﹂棿鐪嬫澘,涓嬪乏杩戜竴鍛ㄤ笉鑹秼鍔縘
+ public static ToMessage WorkShopProduceBottomLeftData(string wkshopcode)
+ {
+ string sql = "";
+ Dictionary<object, object> dir = new Dictionary<object, object>();
+ try
+ {
+ //瀛樺偍杩囩▼鍚�(褰撳墠鏃堕棿寰�鍓嶄竴鍛�)
+ string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ sql = @"h_p_JLKanBan_WorkshopBottomLeft";
+ for (int i = 0; i < wkshoplist.Length; i++)
+ {
+ var dynamicParams = new DynamicParameters();
+ dynamicParams.Add("@wkshop_code", wkshoplist[i].ToString());
+ var dt = DapperHelper.selectProcedure(sql, dynamicParams);
+ dir.Add(wkshoplist[i].ToString(), dt);
+ }
+
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = dir;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[杞﹂棿鐪嬫澘,涓嬪彸杩戜竴鏈堜笉鑹粺璁
+ public static ToMessage WorkShopProduceBottomRightData(string wkshopcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ sql = @"select * from h_v_JLKanBan_WorkshopBottomRight where wkshp_code in @wkshoplist";
+ dynamicParams.Add("@wkshoplist", wkshoplist);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[杞﹂棿缁煎悎鐪嬫澘,宸︿笂鐢熶骇璁㈠崟]
+ public static ToMessage WorkShopCompreLeftTop(string wkshopcode)
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ Dictionary<object, object> dir = new Dictionary<object, object>();
+ Dictionary<object, object> dir0 = new Dictionary<object, object>();
+ Dictionary<object, object> dir1 = new Dictionary<object, object>();
+ try
+ {
+ string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ sql = @"select * from h_v_JLKanBan_WorkShopCompreLeftTop";
+ var data = DapperHelper.selecttable(sql);
+ sql = @"select * from h_v_JLKanBan_WorkShopCompreLeftCenter";
+ var data1 = DapperHelper.selecttable(sql);
+ for (int i = 0; i < wkshoplist.Length; i++)
+ {
+ var top0 = data.AsEnumerable()
+ .Where(row => row.Field<string>("wkshp_code") == wkshoplist[i].ToString()) // 娣诲姞鏌ヨ鏉′欢
+ .Select(group => new
+ {
+ wkshp_code = group.Field<string>("wkshp_code"),
+ plan_qty = group.Field<decimal>("plan_qty"),
+ good_qty = group.Field<decimal>("good_qty")
+ }).DefaultIfEmpty(new { wkshp_code = wkshoplist[i].ToString(), plan_qty = 0m, good_qty = 0m })//涓虹┖鏃舵寚瀹氶粯璁ゅ��
+ .ToList();
+ dir0.Add(wkshoplist[i].ToString(), top0);
+
+ var top1 = data1.AsEnumerable()
+ .Where(row => row.Field<string>("wkshp_code") == wkshoplist[i].ToString()) // 娣诲姞鏌ヨ鏉′欢
+ .Select(group => new
+ {
+ wkshp_code = group.Field<string>("wkshp_code"),
+ plan_qty = group.Field<decimal>("plan_qty"),
+ quantity = group.Field<decimal>("quantity")
+ }).DefaultIfEmpty(new { wkshp_code = wkshoplist[i].ToString(), plan_qty = 0m, quantity = 0m })//涓虹┖鏃舵寚瀹氶粯璁ゅ��
+ .ToList();
+ dir1.Add(wkshoplist[i].ToString(), top1);
+ }
+ dir.Add("LeftTop", dir0);
+ dir.Add("LeftBottom", dir1);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = dir;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[杞﹂棿缁煎悎鐪嬫澘,鍙充笂閿�鍞鍗昡
+ public static ToMessage WorkShopCompreRightTop()
+ {
+ var sql = "";
+ Dictionary<object, object> dir = new Dictionary<object, object>();
+ try
+ {
+ sql = @"select * from h_v_JLKanBan_WorkShopCompreRightTop";
+ var data = DapperHelper.selecttable(sql);
+ sql = @"select * from h_v_JLKanBan_WorkShopCompreRightCenter";
+ var data1 = DapperHelper.selecttable(sql);
+ dir.Add("RightTop", data);
+ dir.Add("RightBottom", data1);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = dir;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[杞﹂棿缁煎悎鐪嬫澘,鍙充笅搴撳瓨]
+ public static ToMessage WorkShopCompreRightBottom()
+ {
+ var sql = "";
+ Dictionary<object, object> dir = new Dictionary<object, object>();
+ try
+ {
+ sql = @"select * from h_v_JLKanBan_WorkShopCompreRightBottom";
+ var data = DapperHelper.selecttable(sql);
+ dir.Add("Y", data.Rows[0]["BaseQuantity"].ToString());
+ dir.Add("B", data.Rows[1]["BaseQuantity"].ToString());
+ dir.Add("C", data.Rows[2]["BaseQuantity"].ToString());
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.data = dir;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+ }
+}
diff --git a/VueWebCoreApi/DLL/DAL/LoginDAL.cs b/VueWebCoreApi/DLL/DAL/LoginDAL.cs
index 17e0c81..a450eba 100644
--- a/VueWebCoreApi/DLL/DAL/LoginDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/LoginDAL.cs
@@ -45,14 +45,14 @@
if (dt_.Rows.Count <= 0)
{
mes.code = "300";
- mes.Message = "璐﹀彿瀵嗙爜涓嶆纭�!";
+ mes.message = "璐﹀彿瀵嗙爜涓嶆纭�!";
mes.data = null;
return mes;
}
if (dt_.Rows[0]["status"].ToString() == "N")
{
mes.code = "300";
- mes.Message = "褰撳墠璐﹀彿宸插仠鐢�!";
+ mes.message = "褰撳墠璐﹀彿宸插仠鐢�!";
mes.data = null;
return mes;
}
@@ -67,7 +67,7 @@
if (dt_.Rows[0]["storg_code"].ToString() == "" || dt_.Rows[0]["storg_code"].ToString() == null)
{
mes.code = "300";
- mes.Message = "褰撳墠鐢ㄦ埛鏈寚瀹氱粍缁�!";
+ mes.message = "褰撳墠鐢ㄦ埛鏈寚瀹氱粍缁�!";
mes.data = null;
return mes;
}
@@ -75,7 +75,7 @@
if (dt_.Rows[0]["post_code"].ToString() == "" || dt_.Rows[0]["post_code"].ToString() == null)
{
mes.code = "300";
- mes.Message = "褰撳墠鐢ㄦ埛鏈寚瀹氬矖浣�!";
+ mes.message = "褰撳墠鐢ㄦ埛鏈寚瀹氬矖浣�!";
mes.data = null;
return mes;
}
@@ -83,7 +83,7 @@
if (dt_.Rows[0]["role_code"].ToString() == "" || dt_.Rows[0]["role_code"].ToString() == null)
{
mes.code = "300";
- mes.Message = "褰撳墠鐢ㄦ埛鏈寚瀹氳鑹�!";
+ mes.message = "褰撳墠鐢ㄦ埛鏈寚瀹氳鑹�!";
mes.data = null;
return mes;
}
@@ -94,7 +94,7 @@
catch (Exception e)
{
mes.code = "300";
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
return mes;
}
@@ -122,14 +122,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "璁板綍鎴愬姛!";
+ mes.message = "璁板綍鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁板綍澶辫触!";
+ mes.message = "璁板綍澶辫触!";
mes.data = null;
}
}
@@ -137,7 +137,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -210,14 +210,14 @@
}
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = parentMenus;
return mes;
}
else
{
mes.code = "300";
- mes.Message = "绯荤粺鏈缃彍鍗曡祫鏂�,璇疯仈绯荤鐞嗗憳!";
+ mes.message = "绯荤粺鏈缃彍鍗曡祫鏂�,璇疯仈绯荤鐞嗗憳!";
mes.data = null;
return mes;
}
@@ -225,7 +225,7 @@
else
{
mes.code = "300";
- mes.Message = "褰撳墠璐﹀彿瀵瑰簲瑙掕壊鏈缃姛鑳芥潈闄�!";
+ mes.message = "褰撳墠璐﹀彿瀵瑰簲瑙掕壊鏈缃姛鑳芥潈闄�!";
mes.data = null;
return mes;
}
@@ -304,14 +304,14 @@
}).ToList();
}
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = parentMenus;
return mes;
}
else
{
mes.code = "300";
- mes.Message = "绯荤粺鏈缃彍鍗曡祫鏂�,璇疯仈绯荤鐞嗗憳!";
+ mes.message = "绯荤粺鏈缃彍鍗曡祫鏂�,璇疯仈绯荤鐞嗗憳!";
mes.data = null;
return mes;
}
@@ -319,7 +319,7 @@
else
{
mes.code = "300";
- mes.Message = "褰撳墠璐﹀彿瀵瑰簲瑙掕壊鏈缃姛鑳芥潈闄�!";
+ mes.message = "褰撳墠璐﹀彿瀵瑰簲瑙掕壊鏈缃姛鑳芥潈闄�!";
mes.data = null;
return mes;
}
@@ -329,7 +329,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -351,7 +351,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "杈撳叆鐨勫瘑鐮佷笉姝ｇ‘,璇烽噸鏂拌緭鍏ワ紒";
+ mes.message = "杈撳叆鐨勫瘑鐮佷笉姝ｇ‘,璇烽噸鏂拌緭鍏ワ紒";
mes.data = null;
}
else
@@ -366,14 +366,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗瘑鐮�", us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼瀵嗙爜鎴愬姛!";
+ mes.message = "淇敼瀵嗙爜鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼瀵嗙爜澶辫触!";
+ mes.message = "淇敼瀵嗙爜澶辫触!";
mes.data = null;
}
}
@@ -393,14 +393,14 @@
LogHelper.DbOperateLog(us.usercode, "閫�鍑�", "閫�鍑轰簡绯荤粺", us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鐧诲嚭鎴愬姛!";
+ mes.message = "鐧诲嚭鎴愬姛!";
mes.data = null;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -424,14 +424,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "閲嶇疆瀵嗙爜鎴愬姛!";
+ mes.message = "閲嶇疆瀵嗙爜鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "閲嶇疆瀵嗙爜澶辫触!";
+ mes.message = "閲嶇疆瀵嗙爜澶辫触!";
mes.data = null;
}
@@ -480,7 +480,7 @@
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
@@ -488,7 +488,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
diff --git a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
index 7d86f8e..713538e 100644
--- a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
@@ -86,7 +86,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -94,7 +94,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -154,14 +154,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -220,14 +220,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -236,7 +236,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -298,7 +298,7 @@
) as AA where 1=1 "+search+" order by AA.operdate desc ";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -306,7 +306,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -340,7 +340,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠妯″叿瀛樺湪鎿嶄綔璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠妯″叿瀛樺湪鎿嶄綔璁板綍,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -364,14 +364,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
@@ -380,7 +380,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -423,7 +423,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -431,7 +431,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -460,14 +460,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿鐐规椤�:" + checkitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -488,14 +488,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿鐐规椤�:" + checkitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -504,7 +504,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -529,7 +529,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鐐规椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠鐐规椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -544,14 +544,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿鐐规椤�:" + checkitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
@@ -560,7 +560,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -603,7 +603,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -611,7 +611,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -642,7 +642,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犵偣妫�鏍囧噯淇℃伅!";
+ mes.message = "鏃犵偣妫�鏍囧噯淇℃伅!";
mes.data = null;
return mes;
}
@@ -655,14 +655,14 @@
rout.Data = data0;
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = rout;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -709,14 +709,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿鐐规鏍囧噯:" + json.code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -756,14 +756,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿鐐规鏍囧噯:" + json.code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -772,7 +772,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -794,7 +794,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鐐规鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠鐐规鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -814,14 +814,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿鐐规鏍囧噯:" + checkstand_code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "璁惧鐐规鏍囧噯鍒犻櫎鎴愬姛!";
+ mes.message = "璁惧鐐规鏍囧噯鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁惧鐐规鏍囧噯鍒犻櫎澶辫触!";
+ mes.message = "璁惧鐐规鏍囧噯鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -829,7 +829,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -862,13 +862,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "鏃犳ā鍏疯祫鏂�!";
+ mes.message = "鏃犳ā鍏疯祫鏂�!";
mes.data = null;
}
}
@@ -876,7 +876,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -932,14 +932,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿鐐规鏍囧噯鍏宠仈妯″叿", "妯″叿鐐规鏍囧噯:" + checkstand_code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -947,7 +947,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -990,7 +990,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -998,7 +998,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1027,14 +1027,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿淇濆吇椤�:" + maiitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1055,14 +1055,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿淇濆吇椤�:" + maiitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1071,7 +1071,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1096,7 +1096,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠淇濆吇椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠淇濆吇椤圭洰宸插叧鑱旀爣鍑�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -1111,14 +1111,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿淇濆吇椤�:" + maiitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
@@ -1127,7 +1127,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1170,7 +1170,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -1178,7 +1178,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1209,7 +1209,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犵偣妫�鏍囧噯淇℃伅!";
+ mes.message = "鏃犵偣妫�鏍囧噯淇℃伅!";
mes.data = null;
return mes;
}
@@ -1222,14 +1222,14 @@
rout.Data = data0;
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = rout;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1276,14 +1276,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "妯″叿淇濆吇鏍囧噯:" + json.code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1323,14 +1323,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "妯″叿淇濆吇鏍囧噯:" + json.code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1339,7 +1339,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1361,7 +1361,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠淇濆吇鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠淇濆吇鏍囧噯宸茬敓鎴愮偣妫�璁板綍,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -1381,14 +1381,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "妯″叿淇濆吇鏍囧噯:" + repairstand_code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "妯″叿淇濆吇鏍囧噯鍒犻櫎鎴愬姛!";
+ mes.message = "妯″叿淇濆吇鏍囧噯鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "妯″叿淇濆吇鏍囧噯鍒犻櫎澶辫触!";
+ mes.message = "妯″叿淇濆吇鏍囧噯鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -1396,7 +1396,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1429,13 +1429,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "鏃犳ā鍏疯祫鏂�!";
+ mes.message = "鏃犳ā鍏疯祫鏂�!";
mes.data = null;
}
}
@@ -1443,7 +1443,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1499,14 +1499,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿淇濆吇鏍囧噯鍏宠仈妯″叿", "妯″叿淇濆吇鏍囧噯:" + repairstand_code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1514,7 +1514,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1538,13 +1538,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
+ mes.message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
mes.data = data;
}
}
@@ -1552,7 +1552,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1575,13 +1575,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鏈寚瀹氱偣妫�鏍囧噯!";
+ mes.message = "褰撳墠妯″叿鏈寚瀹氱偣妫�鏍囧噯!";
mes.data = data;
}
}
@@ -1589,7 +1589,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1616,13 +1616,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鏈缃偣妫�鏍囧噯缁戝畾鐐规椤圭洰!";
+ mes.message = "褰撳墠妯″叿鏈缃偣妫�鏍囧噯缁戝畾鐐规椤圭洰!";
mes.data = data;
}
}
@@ -1630,7 +1630,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1661,7 +1661,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鐐规椤逛俊鎭笉鑳戒负绌�!";
+ mes.message = "鐐规椤逛俊鎭笉鑳戒负绌�!";
mes.data = null;
return mes;
}
@@ -1711,14 +1711,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿鐐规", "妯″叿:" + json.code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鐐规鎴愬姛!";
+ mes.message = "鐐规鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鐐规澶辫触!";
+ mes.message = "鐐规澶辫触!";
mes.data = null;
}
}
@@ -1726,7 +1726,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1750,13 +1750,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
+ mes.message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
mes.data = data;
}
}
@@ -1764,7 +1764,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1787,13 +1787,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鏈寚瀹氫繚鍏绘爣鍑�!";
+ mes.message = "褰撳墠妯″叿鏈寚瀹氫繚鍏绘爣鍑�!";
mes.data = data;
}
}
@@ -1801,7 +1801,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1828,13 +1828,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鏈缃繚鍏绘爣鍑嗙粦瀹氫繚鍏婚」鐩�!";
+ mes.message = "褰撳墠妯″叿鏈缃繚鍏绘爣鍑嗙粦瀹氫繚鍏婚」鐩�!";
mes.data = data;
}
}
@@ -1842,7 +1842,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1873,7 +1873,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇濆吇椤逛俊鎭笉鑳戒负绌�!";
+ mes.message = "淇濆吇椤逛俊鎭笉鑳戒负绌�!";
mes.data = null;
return mes;
}
@@ -1923,14 +1923,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿淇濆吇", "妯″叿:" + json.code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇濆吇鎴愬姛!";
+ mes.message = "淇濆吇鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇濆吇澶辫触!";
+ mes.message = "淇濆吇澶辫触!";
mes.data = null;
}
}
@@ -1938,7 +1938,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1966,14 +1966,14 @@
if (dt.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = dt;
return mes;
}
else
{
mes.code = "300";
- mes.Message = "鏆傛棤鏁版嵁鎴栨棤鏁堢殑妯″叿浜岀淮鐮佷俊鎭�!";
+ mes.message = "鏆傛棤鏁版嵁鎴栨棤鏁堢殑妯″叿浜岀淮鐮佷俊鎭�!";
mes.data = null;
return mes;
}
@@ -1983,7 +1983,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2052,14 +2052,14 @@
}
list.Add(moud);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = list;
return mes;
}
else
{
mes.code = "300";
- mes.Message = "鏆傛棤鏁版嵁鎴栨棤鏁堢殑妯″叿浜岀淮鐮佷俊鎭�!";
+ mes.message = "鏆傛棤鏁版嵁鎴栨棤鏁堢殑妯″叿浜岀淮鐮佷俊鎭�!";
mes.data = null;
return mes;
}
@@ -2068,7 +2068,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2093,17 +2093,17 @@
{
case "0": //鍦ㄥ簱
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,璇峰厛鍑哄簱鎿嶄綔!";
+ mes.message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,璇峰厛鍑哄簱鎿嶄綔!";
mes.data = null;
return mes;
case "2": //涓婃満
mes.code = "300";
- mes.Message = "褰撳墠妯″叿涓婃満鐘舵��,璇峰厛涓嬫満鎿嶄綔!";
+ mes.message = "褰撳墠妯″叿涓婃満鐘舵��,璇峰厛涓嬫満鎿嶄綔!";
mes.data = null;
return mes;
case "7": //澶栧��
mes.code = "300";
- mes.Message = "褰撳墠妯″叿澶栧�熺姸鎬�,璇峰厛褰掕繕鎿嶄綔!";
+ mes.message = "褰撳墠妯″叿澶栧�熺姸鎬�,璇峰厛褰掕繕鎿嶄綔!";
mes.data = null;
return mes;
default:
@@ -2113,7 +2113,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -2129,13 +2129,13 @@
if (rows.Length > 0)
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿宸茬淮淇敵璇�,寰呯淮淇�!";
+ mes.message = "褰撳墠妯″叿宸茬淮淇敵璇�,寰呯淮淇�!";
mes.data = null;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿宸茬淮淇�,寰呯‘璁ら獙璇�!";
+ mes.message = "褰撳墠妯″叿宸茬淮淇�,寰呯‘璁ら獙璇�!";
mes.data = null;
}
}
@@ -2150,13 +2150,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
+ mes.message = "褰撳墠妯″叿缂栫爜涓嶅瓨鍦ㄦ垨涓嶅彲鐢�!";
mes.data = data;
}
}
@@ -2165,7 +2165,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2259,14 +2259,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿缁翠慨鐢宠", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "缁翠慨鐢宠鎴愬姛!";
+ mes.message = "缁翠慨鐢宠鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "缁翠慨鐢宠澶辫触!";
+ mes.message = "缁翠慨鐢宠澶辫触!";
mes.data = null;
}
}
@@ -2274,7 +2274,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2307,13 +2307,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "鏆傛棤缁翠慨鐢宠璁板綍!";
+ mes.message = "鏆傛棤缁翠慨鐢宠璁板綍!";
mes.data = data;
}
}
@@ -2321,7 +2321,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2419,14 +2419,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿缁翠慨", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "缁翠慨鎴愬姛!";
+ mes.message = "缁翠慨鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "缁翠慨澶辫触!";
+ mes.message = "缁翠慨澶辫触!";
mes.data = null;
}
}
@@ -2434,7 +2434,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2466,13 +2466,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "鏆傛棤缁翠慨璁板綍!";
+ mes.message = "鏆傛棤缁翠慨璁板綍!";
mes.data = data;
}
}
@@ -2480,7 +2480,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2516,13 +2516,13 @@
}
dict.Add("repair_content", data.Rows[0]["repair_content"].ToString()); //缁翠慨鍐呭
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = dict;
}
else
{
mes.code = "300";
- mes.Message = "鏆傛棤缁翠慨璁板綍!";
+ mes.message = "鏆傛棤缁翠慨璁板綍!";
mes.data = null;
}
}
@@ -2530,7 +2530,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2605,14 +2605,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿缁翠慨楠岃瘉", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "缁翠慨楠岃瘉鎴愬姛!";
+ mes.message = "缁翠慨楠岃瘉鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "缁翠慨楠岃瘉澶辫触!";
+ mes.message = "缁翠慨楠岃瘉澶辫触!";
mes.data = null;
}
}
@@ -2620,7 +2620,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2649,22 +2649,22 @@
{
case "0": //鍦ㄥ簱
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堜笂鏈烘搷浣�!";
+ mes.message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堜笂鏈烘搷浣�!";
mes.data = null;
return mes;
case "2": //涓婃満
mes.code = "300";
- mes.Message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堜笂鏈烘搷浣�!";
+ mes.message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堜笂鏈烘搷浣�!";
mes.data = null;
return mes;
case "7": //澶栧��
mes.code = "300";
- mes.Message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堜笂鏈烘搷浣�!";
+ mes.message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堜笂鏈烘搷浣�!";
mes.data = null;
return mes;
default:
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = dt;
break;
}
@@ -2672,7 +2672,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁镐笂鏈�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁镐笂鏈�!";
mes.data = null;
return mes;
}
@@ -2680,7 +2680,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -2690,7 +2690,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2710,14 +2710,14 @@
)";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2760,14 +2760,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿涓婃満", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "妯″叿涓婃満鎴愬姛!";
+ mes.message = "妯″叿涓婃満鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "妯″叿涓婃満澶辫触!";
+ mes.message = "妯″叿涓婃満澶辫触!";
mes.data = null;
}
}
@@ -2775,7 +2775,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2811,14 +2811,14 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
return mes;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鏈笂鏈�,涓嶇鍚堜笅鏈烘搷浣�!";
+ mes.message = "褰撳墠妯″叿鏈笂鏈�,涓嶇鍚堜笅鏈烘搷浣�!";
mes.data = null;
return mes;
}
@@ -2826,7 +2826,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堜笅鏈烘搷浣�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堜笅鏈烘搷浣�!";
mes.data = null;
return mes;
}
@@ -2834,7 +2834,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -2844,7 +2844,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2902,14 +2902,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿涓嬫満", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "妯″叿涓嬫満鎴愬姛!";
+ mes.message = "妯″叿涓嬫満鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "妯″叿涓嬫満澶辫触!";
+ mes.message = "妯″叿涓嬫満澶辫触!";
mes.data = null;
}
}
@@ -2917,7 +2917,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2946,22 +2946,22 @@
{
case "0": //鍦ㄥ簱
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堝鍊熸搷浣�!";
+ mes.message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堝鍊熸搷浣�!";
mes.data = null;
return mes;
case "2": //涓婃満
mes.code = "300";
- mes.Message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堝鍊熸搷浣�!";
+ mes.message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堝鍊熸搷浣�!";
mes.data = null;
return mes;
case "7": //澶栧��
mes.code = "300";
- mes.Message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堝鍊熸搷浣�!";
+ mes.message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堝鍊熸搷浣�!";
mes.data = null;
return mes;
default:
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = dt;
break;
}
@@ -2969,7 +2969,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿鍊�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿鍊�!";
mes.data = null;
return mes;
}
@@ -2977,7 +2977,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -2987,7 +2987,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3030,14 +3030,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿澶栧��", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "妯″叿澶栧�熸垚鍔�!";
+ mes.message = "妯″叿澶栧�熸垚鍔�!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "妯″叿澶栧�熷け璐�!";
+ mes.message = "妯″叿澶栧�熷け璐�!";
mes.data = null;
}
}
@@ -3045,7 +3045,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3080,14 +3080,14 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
return mes;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鏈鍊�,涓嶇鍚堝綊杩樻搷浣�!";
+ mes.message = "褰撳墠妯″叿鏈鍊�,涓嶇鍚堝綊杩樻搷浣�!";
mes.data = null;
return mes;
}
@@ -3095,7 +3095,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝綊杩樻搷浣�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝綊杩樻搷浣�!";
mes.data = null;
return mes;
}
@@ -3103,7 +3103,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -3113,7 +3113,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3160,14 +3160,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿褰掕繕", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "妯″叿褰掕繕鎴愬姛!";
+ mes.message = "妯″叿褰掕繕鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "妯″叿褰掕繕澶辫触!";
+ mes.message = "妯″叿褰掕繕澶辫触!";
mes.data = null;
}
}
@@ -3175,7 +3175,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3204,22 +3204,22 @@
{
case "0": //鍦ㄥ簱
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堝叆搴撴搷浣�!";
+ mes.message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堝叆搴撴搷浣�!";
mes.data = null;
return mes;
case "2": //涓婃満
mes.code = "300";
- mes.Message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堝叆搴撴搷浣�!";
+ mes.message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堝叆搴撴搷浣�!";
mes.data = null;
return mes;
case "7": //澶栧��
mes.code = "300";
- mes.Message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堝叆搴撴搷浣�!";
+ mes.message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堝叆搴撴搷浣�!";
mes.data = null;
return mes;
default:
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = dt;
break;
}
@@ -3227,7 +3227,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿叆搴撴搷浣�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿叆搴撴搷浣�!";
mes.data = null;
return mes;
}
@@ -3235,7 +3235,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -3245,7 +3245,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3290,14 +3290,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿鍏ュ簱", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "妯″叿鍏ュ簱鎴愬姛!";
+ mes.message = "妯″叿鍏ュ簱鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "妯″叿鍏ュ簱澶辫触!";
+ mes.message = "妯″叿鍏ュ簱澶辫触!";
mes.data = null;
}
}
@@ -3305,7 +3305,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3341,14 +3341,14 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
return mes;
}
else
{
mes.code = "300";
- mes.Message = "褰撳墠妯″叿鏈湪搴�,涓嶇鍚堝嚭搴撴搷浣�!";
+ mes.message = "褰撳墠妯″叿鏈湪搴�,涓嶇鍚堝嚭搴撴搷浣�!";
mes.data = null;
return mes;
}
@@ -3356,7 +3356,7 @@
else
{
mes.code = "300";
- mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝嚭搴撴搷浣�!";
+ mes.message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝嚭搴撴搷浣�!";
mes.data = null;
return mes;
}
@@ -3364,7 +3364,7 @@
else
{
mes.code = "300";
- mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
mes.data = null;
return mes;
}
@@ -3374,7 +3374,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3419,14 +3419,14 @@
LogHelper.DbOperateLog(us.usercode, "妯″叿鍑哄簱", "妯″叿:" + mouldcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "妯″叿鍑哄簱鎴愬姛!";
+ mes.message = "妯″叿鍑哄簱鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "妯″叿鍑哄簱澶辫触!";
+ mes.message = "妯″叿鍑哄簱澶辫触!";
mes.data = null;
}
}
@@ -3434,7 +3434,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3501,7 +3501,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -3509,7 +3509,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3531,14 +3531,14 @@
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3635,7 +3635,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "妯″叿鐐规璁板綍鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -3643,7 +3643,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3710,7 +3710,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -3718,7 +3718,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3740,14 +3740,14 @@
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3845,7 +3845,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "妯″叿淇濆吇璁板綍鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -3853,7 +3853,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3931,7 +3931,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -3939,7 +3939,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4001,14 +4001,14 @@
repair.repairimage = data3;
Dict.Add("data2", repair);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = Dict;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4088,7 +4088,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "妯″叿缁翠慨璁板綍鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -4096,7 +4096,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4160,7 +4160,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -4168,7 +4168,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4233,7 +4233,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "妯″叿涓婁笅鏈鸿褰曟姤琛�");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -4241,7 +4241,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4299,7 +4299,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -4307,7 +4307,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4366,7 +4366,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "妯″叿鍊熻繕璁板綍鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -4374,7 +4374,164 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[妯″叿鍑哄叆搴撹褰曟煡璇
+ public static ToMessage MouldInOutMachinesSearch(string mouldcode, string mouldname, string mouldspec, string type, string warehousecode, string locationcode, string operuser, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (mouldcode != "" && mouldcode != null)
+ {
+ search += "and A.mould_code like '%'+@mouldcode+'%' ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ }
+ if (mouldname != "" && mouldname != null)
+ {
+ search += "and M.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and M.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (type != "" && type != null)
+ {
+ search += "and A.type=@type ";
+ dynamicParams.Add("@type", type);
+ }
+ if (warehousecode != "" && warehousecode != null)
+ {
+ search += "and A.warehouse_code=@warehousecode ";
+ dynamicParams.Add("@warehousecode", warehousecode);
+ }
+ if (locationcode != "" && locationcode != null)
+ {
+ search += "and A.location_code=@locationcode ";
+ dynamicParams.Add("@locationcode", locationcode);
+ }
+ if (operuser != "" && operuser != null)
+ {
+ search += "and U.username like '%'+@operuser+'%' ";
+ dynamicParams.Add("@operuser", operuser);
+ }
+ if (opendate != "" && opendate != null)
+ {
+ search += "and A.lm_date between @opendate and @closedate ";
+ dynamicParams.Add("@opendate", opendate + " 00:00:00");
+ dynamicParams.Add("@closedate", closedate + " 23:59:59");
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.mould_code,M.name as mould_name,M.spec as mould_spec,A.warehouse_code,S.name as warehouse_name,
+ A.location_code,L.name as location_name,(case when A.type='OUT' then '鍑哄簱' else '鍏ュ簱' end) as type,
+ A.description,U.username as lm_user,A.lm_date
+ from TMould_InOutReord A
+ left join TMouldInfo M on A.mould_code=M.code
+ left join TSecStck S on A.warehouse_code=S.code
+ left join TSecLoca L on A.location_code=L.code
+ left join TUser U on A.lm_user=U.usercode
+ where 1=1 " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿鍑哄叆搴撹褰曞鍑篯
+ public static ToMessage MouldInOutMachinesOutExcel(string mouldcode, string mouldname, string mouldspec, string type, string warehousecode, string locationcode, string operuser, string opendate, string closedate)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (mouldcode != "" && mouldcode != null)
+ {
+ search += "and A.mould_code like '%'+@mouldcode+'%' ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ }
+ if (mouldname != "" && mouldname != null)
+ {
+ search += "and M.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and M.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (type != "" && type != null)
+ {
+ search += "and A.type=@type ";
+ dynamicParams.Add("@type", type);
+ }
+ if (warehousecode != "" && warehousecode != null)
+ {
+ search += "and A.warehouse_code=@warehousecode ";
+ dynamicParams.Add("@warehousecode", warehousecode);
+ }
+ if (locationcode != "" && locationcode != null)
+ {
+ search += "and A.location_code=@locationcode ";
+ dynamicParams.Add("@locationcode", locationcode);
+ }
+ if (operuser != "" && operuser != null)
+ {
+ search += "and U.username like '%'+@operuser+'%' ";
+ dynamicParams.Add("@operuser", operuser);
+ }
+ if (opendate != "" && opendate != null)
+ {
+ search += "and A.lm_date between @opendate and @closedate ";
+ dynamicParams.Add("@opendate", opendate + " 00:00:00");
+ dynamicParams.Add("@closedate", closedate + " 23:59:59");
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.mould_code as 妯″叿缂栫爜,M.name as 妯″叿鍚嶇О,M.spec as 瑙勬牸鍨嬪彿,A.warehouse_code as 浠撳簱缂栫爜,S.name as 浠撳簱鍚嶇О,
+ A.location_code as 搴撲綅缂栫爜,L.name as 搴撲綅鍚嶇О,(case when A.type='OUT' then '鍑哄簱' else '鍏ュ簱' end) as 鎿嶄綔绫诲瀷,
+ A.description as 鎻忚堪,U.username as 鎿嶄綔浜�,A.lm_date as 鎿嶄綔鏃堕棿
+ from TMould_InOutReord A
+ left join TMouldInfo M on A.mould_code=M.code
+ left join TSecStck S on A.warehouse_code=S.code
+ left join TSecLoca L on A.location_code=L.code
+ left join TUser U on A.lm_user=U.usercode
+ where 1=1 " + search;
+ DataTable data = DapperHelper.selectdata(sql, dynamicParams);
+ data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
+ string msg = DownLoad.DataTableToExcel(data, "妯″叿鍑哄叆搴撹褰曟姤琛�");
+ mes.code = "200";
+ mes.message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = msg;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
diff --git a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
index b739f20..63d1012 100644
--- a/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ProductModelDAL.cs
@@ -32,7 +32,7 @@
sql = @"select code,name,'1' as isGroup,data_sources from TUnitGroup ";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
LogHelper.OperateLog("999", "鏌ヨ", "璁￠噺鍗曚綅缁勬煡璇㈡暟鎹负锛�" + JsonConvert.SerializeObject(data), "PC");
}
@@ -40,7 +40,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -93,7 +93,7 @@
var total = 0; //鎬绘潯鏁�
data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
LogHelper.OperateLog("999", "鏌ヨ", "鏌ヨ浜嗚閲忓崟浣�", "PC");
@@ -102,7 +102,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -123,14 +123,14 @@
dynamicParams.Add("@tunitgroupcode", unitcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -162,7 +162,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁￠噺鍗曚綅鐨勫悕绉颁笉鑳介噸澶�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "璁￠噺鍗曚綅鐨勫悕绉颁笉鑳介噸澶�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -176,7 +176,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁￠噺鍗曚綅缁勭殑鍚嶇О涓嶈兘閲嶅,璇烽噸鏂拌緭鍏�!";
+ mes.message = "璁￠噺鍗曚綅缁勭殑鍚嶇О涓嶈兘閲嶅,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -230,14 +230,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚閲忓崟浣嶏細"+ tunittype == "S" ? ((List<string>)mes.data)[0].ToString() : string.Join(",", listjson[0].children.Select(m => m.unitcode)), us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -253,7 +253,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁￠噺鍗曚綅鐨勫悕绉颁笉鑳介噸澶�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "璁￠噺鍗曚綅鐨勫悕绉颁笉鑳介噸澶�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -286,7 +286,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁￠噺鍗曚綅缁勭殑鍚嶇О涓嶈兘閲嶅,璇烽噸鏂拌緭鍏�!";
+ mes.message = "璁￠噺鍗曚綅缁勭殑鍚嶇О涓嶈兘閲嶅,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -347,14 +347,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗚閲忓崟浣嶏細" + tunittype == "S" ? ((List<string>)mes.data)[0].ToString() : string.Join(",", listjson[0].children.Select(m => m.unitcode)), us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -363,7 +363,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -387,7 +387,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍗曡閲忓崟浣嶅凡琚娇鐢�,涓嶅厑璁稿垹闄�!";
+ mes.message = "鍗曡閲忓崟浣嶅凡琚娇鐢�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -414,7 +414,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶氳閲忓崟浣嶇粍涓湁璁￠噺鍗曚綅琚娇鐢�,涓嶅厑璁稿垹闄�!";
+ mes.message = "澶氳閲忓崟浣嶇粍涓湁璁￠噺鍗曚綅琚娇鐢�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -453,7 +453,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶氳閲忓崟浣嶅凡琚娇鐢�,涓嶅厑璁稿垹闄�!";
+ mes.message = "澶氳閲忓崟浣嶅凡琚娇鐢�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -477,14 +477,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗚閲忓崟浣嶏細" + tunittype == "S" ? tunitcode : tunittype == "M"&& (tunitgroupcode != "" || tunitgroupcode != null) && (tunitcode == "" || tunitcode == null)? tunitgroupcode: tunitgroupcode+"-->"+tunitcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔鎴愬姛!";
+ mes.message = "鍒犻櫎鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔澶辫触!";
+ mes.message = "鍒犻櫎鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -492,7 +492,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -510,7 +510,7 @@
sql = @"select code,name,idparent,data_sources from TMateriel_Class ";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
LogHelper.OperateLog("999", "鏌ヨ", "瀛樿揣鍒嗙被鏌ヨ鏁版嵁涓猴細" + JsonConvert.SerializeObject(data), "PC");
}
@@ -518,7 +518,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -542,7 +542,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "瀛樿揣鍒嗙被涓婄骇涓嶈兘鏄凡鏈夊瓨璐х殑鍒嗙被锛岃閲嶆柊杈撳叆锛�";
+ mes.message = "瀛樿揣鍒嗙被涓婄骇涓嶈兘鏄凡鏈夊瓨璐х殑鍒嗙被锛岃閲嶆柊杈撳叆锛�";
mes.data = null;
return mes;
}
@@ -557,7 +557,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "瀛樿揣鍒嗙被缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "瀛樿揣鍒嗙被缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -569,7 +569,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "瀛樿揣鍒嗙被鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "瀛樿揣鍒嗙被鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -596,14 +596,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗瓨璐у垎绫�:"+ inventoryclasscode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -618,7 +618,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "瀛樿揣鍒嗙被鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "瀛樿揣鍒嗙被鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -644,14 +644,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗瓨璐у垎绫�:"+ inventoryclasscode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -660,7 +660,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -684,7 +684,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠瀛樿揣鍒嗙被鎴栦笅绾ц寮曠敤涓嶅厑璁稿垹闄わ紒";
+ mes.message = "褰撳墠瀛樿揣鍒嗙被鎴栦笅绾ц寮曠敤涓嶅厑璁稿垹闄わ紒";
mes.data = null;
return mes;
}
@@ -705,14 +705,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗瓨璐у垎绫�"+classcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔鎴愬姛!";
+ mes.message = "鍒犻櫎鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔澶辫触!";
+ mes.message = "鍒犻櫎鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -720,7 +720,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -779,7 +779,7 @@
var total = 0; //鎬绘潯鏁�
data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -787,7 +787,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -812,7 +812,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "瀛樿揣妗ｆ缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "瀛樿揣妗ｆ缂栫爜宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -824,7 +824,7 @@
//{
// mes.code = "300";
// mes.count = 0;
- // mes.Message = "瀛樿揣妗ｆ鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ // mes.message = "瀛樿揣妗ｆ鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
// mes.data = null;
// return mes;
//}
@@ -836,7 +836,7 @@
//{
// mes.code = "300";
// mes.count = 0;
- // mes.Message = "瀛樿揣妗ｆ瑙勬牸宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ // mes.message = "瀛樿揣妗ｆ瑙勬牸宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
// mes.data = null;
// return mes;
//}
@@ -881,14 +881,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗瓨璐ф。妗�:"+ partcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -903,7 +903,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "瀛樿揣妗ｆ鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ mes.message = "瀛樿揣妗ｆ鍚嶇О宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
mes.data = null;
return mes;
}
@@ -916,7 +916,7 @@
//{
// mes.code = "300";
// mes.count = 0;
- // mes.Message = "瀛樿揣妗ｆ瑙勬牸鍨嬪彿宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
+ // mes.message = "瀛樿揣妗ｆ瑙勬牸鍨嬪彿宸插瓨鍦�,璇烽噸鏂拌緭鍏�!";
// mes.data = null;
// return mes;
//}
@@ -959,14 +959,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗瓨璐ф。妗�:"+ partcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -975,7 +975,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -998,7 +998,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠瀛樿揣鍒嗗凡琚紩鐢╗鐢熶骇璁㈠崟]涓嶅厑璁稿垹闄わ紒";
+ mes.message = "褰撳墠瀛樿揣鍒嗗凡琚紩鐢╗鐢熶骇璁㈠崟]涓嶅厑璁稿垹闄わ紒";
mes.data = null;
return mes;
}
@@ -1010,7 +1010,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠瀛樿揣宸茶寮曠敤[鐢熶骇宸ュ崟]涓嶅厑璁稿垹闄わ紒";
+ mes.message = "褰撳墠瀛樿揣宸茶寮曠敤[鐢熶骇宸ュ崟]涓嶅厑璁稿垹闄わ紒";
mes.data = null;
return mes;
}
@@ -1032,14 +1032,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗瓨璐ф。妗�:"+partcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔鎴愬姛!";
+ mes.message = "鍒犻櫎鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎鎿嶄綔澶辫触!";
+ mes.message = "鍒犻櫎鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1047,7 +1047,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1071,14 +1071,14 @@
left join TSecStck S on M.idwarehouse=S.code ";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
diff --git a/VueWebCoreApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebCoreApi/DLL/DAL/ProductionManagementDAL.cs
index 8db0dda..dc28dba 100644
--- a/VueWebCoreApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ProductionManagementDAL.cs
@@ -34,7 +34,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -106,7 +106,7 @@
where A.is_delete<>'1' and A.status='START' and A.wotype='PO' and S.bad_qty>0 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -114,7 +114,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -137,14 +137,14 @@
dynamicParams.Add("@torg_code", wkshopcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -186,14 +186,14 @@
dynamicParams.Add("@partcode", partcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -214,14 +214,14 @@
dynamicParams.Add("@partcode", routecode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -239,14 +239,14 @@
dynamicParams.Add("@partnumber", partnumber);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -261,7 +261,7 @@
try
{
mes.code = "200";
- mes.Message = "";
+ mes.message = "";
mes.data = null;
//鍒ゆ柇宸ヨ壓璺嚎瀵瑰簲宸ュ簭鏄惁閮芥湁鍏宠仈宸ヤ綔绔�
sql = @"select B.step_code,C.eqp_code from TFlw_Rout A
@@ -277,7 +277,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ヨ壓璺嚎瀵瑰簲宸ュ簭銆�" + dtck.Rows[i]["step_code"].ToString() + "銆戯紝鏈叧鑱旇澶囷紝璇峰叧鑱旀墍鏈夊伐搴忓搴旇澶�!";
+ mes.message = "褰撳墠宸ヨ壓璺嚎瀵瑰簲宸ュ簭銆�" + dtck.Rows[i]["step_code"].ToString() + "銆戯紝鏈叧鑱旇澶囷紝璇峰叧鑱旀墍鏈夊伐搴忓搴旇澶�!";
mes.data = null;
return mes;
}
@@ -304,7 +304,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ヨ壓璺嚎瀵瑰簲宸ュ簭銆�" + dtck.Rows[i]["step_code"].ToString() + "銆戯紝璁惧涓嶅彲鐢�!";
+ mes.message = "褰撳墠宸ヨ壓璺嚎瀵瑰簲宸ュ簭銆�" + dtck.Rows[i]["step_code"].ToString() + "銆戯紝璁惧涓嶅彲鐢�!";
mes.data = null;
return mes;
}
@@ -331,7 +331,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鑺傛媿宸ヤ环涓細褰撳墠浜у搧銆�" + partcode + "銆戯紝瀵瑰簲宸ヨ壓璺嚎銆�" + routecode + "銆戞湭璁剧疆(鎴栨湭璁剧疆鍏�)鎴栧伐浠峰皬浜庣瓑浜�0!";
+ mes.message = "鑺傛媿宸ヤ环涓細褰撳墠浜у搧銆�" + partcode + "銆戯紝瀵瑰簲宸ヨ壓璺嚎銆�" + routecode + "銆戞湭璁剧疆(鎴栨湭璁剧疆鍏�)鎴栧伐浠峰皬浜庣瓑浜�0!";
mes.data = null;
return mes;
}
@@ -342,7 +342,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -362,14 +362,14 @@
FROM TK_Wrk_Man where wo_code like '%SGPO%'";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data.Rows[0]["numct"].ToString();
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -394,7 +394,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ崟瀵瑰簲宸ヨ壓璺嚎娌℃湁缁戝畾宸ュ簭!";
+ mes.message = "宸ュ崟瀵瑰簲宸ヨ壓璺嚎娌℃湁缁戝畾宸ュ簭!";
mes.data = null;
return mes;
}
@@ -412,7 +412,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ崟瀵瑰簲鐨勪骇鍝佹病鏈夊缓绔婤OM鎴朆OM鏈鏍革紒";
+ mes.message = "宸ュ崟瀵瑰簲鐨勪骇鍝佹病鏈夊缓绔婤OM鎴朆OM鏈鏍革紒";
mes.data = null;
return mes;
}
@@ -505,14 +505,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "MES宸ュ崟鏂板缓娲惧彂鎴愬姛!";
+ mes.message = "MES宸ュ崟鏂板缓娲惧彂鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "MES宸ュ崟鏂板缓娲惧彂澶辫触!";
+ mes.message = "MES宸ュ崟鏂板缓娲惧彂澶辫触!";
mes.data = null;
}
}
@@ -529,7 +529,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ崟瀵瑰簲鐨勪骇鍝佹病鏈夊缓绔婤OM鎴朆OM鏈鏍革紒";
+ mes.message = "宸ュ崟瀵瑰簲鐨勪骇鍝佹病鏈夊缓绔婤OM鎴朆OM鏈鏍革紒";
mes.data = null;
return mes;
}
@@ -625,14 +625,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -641,7 +641,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -699,7 +699,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ崟鎵ц涓垨宸插叧闂紝涓嶅厑璁稿垹闄�!";
+ mes.message = "宸ュ崟鎵ц涓垨宸插叧闂紝涓嶅厑璁稿垹闄�!";
mes.data = null;
}
bool aa = DapperHelper.DoTransaction(list);
@@ -707,14 +707,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -722,7 +722,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -748,14 +748,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "宸ュ崟鍏抽棴鎴愬姛!";
+ mes.message = "宸ュ崟鍏抽棴鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ崟鍏抽棴澶辫触!";
+ mes.message = "宸ュ崟鍏抽棴澶辫触!";
mes.data = null;
}
}
@@ -763,7 +763,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -786,14 +786,14 @@
dynamicParams.Add("@wo_code", wo_code);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -819,7 +819,7 @@
ordercode = arra[0]; //鑾峰彇鎸囧畾瀛楃涓插墠闈㈢殑瀛楃
mes.code = "300";
mes.count = 0;
- mes.Message = "璇锋壂鎻忓伐搴忎簩缁寸爜!";
+ mes.message = "璇锋壂鎻忓伐搴忎簩缁寸爜!";
mes.data = null;
return mes;
}
@@ -841,7 +841,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭浠诲姟涓哄鍗忓伐搴忎换鍔�,璇峰墠寰�澶栧崗鎿嶄綔椤电鎵ц!";
+ mes.message = "褰撳墠宸ュ簭浠诲姟涓哄鍗忓伐搴忎换鍔�,璇峰墠寰�澶栧崗鎿嶄綔椤电鎵ц!";
mes.data = null;
return mes;
}
@@ -860,7 +860,7 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
return mes;
}
@@ -868,7 +868,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭浠诲姟鏃犲彲鎵ц璁惧!";
+ mes.message = "褰撳墠宸ュ簭浠诲姟鏃犲彲鎵ц璁惧!";
mes.data = null;
return mes;
}
@@ -877,7 +877,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -902,7 +902,7 @@
ordercode = arra[0]; //鑾峰彇鎸囧畾瀛楃涓插墠闈㈢殑瀛楃
mes.code = "300";
mes.count = 0;
- mes.Message = "璇锋壂鎻忓伐搴忎簩缁寸爜!";
+ mes.message = "璇锋壂鎻忓伐搴忎簩缁寸爜!";
mes.data = null;
return mes;
}
@@ -924,7 +924,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭浠诲姟涓鸿嚜鍒跺伐搴忎换鍔�,璇峰墠寰�鑷埗鎿嶄綔椤电鎵ц!";
+ mes.message = "褰撳墠宸ュ簭浠诲姟涓鸿嚜鍒跺伐搴忎换鍔�,璇峰墠寰�鑷埗鎿嶄綔椤电鎵ц!";
mes.data = null;
return mes;
}
@@ -943,7 +943,7 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
return mes;
}
@@ -951,7 +951,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭鏃犲彲鎵ц澶栧崗渚涙柟!";
+ mes.message = "褰撳墠宸ュ簭鏃犲彲鎵ц澶栧崗渚涙柟!";
mes.data = null;
return mes;
}
@@ -960,7 +960,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -986,7 +986,7 @@
ordercode = arra[0]; //鑾峰彇鎸囧畾瀛楃涓插墠闈㈢殑瀛楃
mes.code = "300";
mes.count = 0;
- mes.Message = "璇锋壂鎻忓伐搴忎簩缁寸爜!";
+ mes.message = "璇锋壂鎻忓伐搴忎簩缁寸爜!";
mes.data = null;
return mes;
}
@@ -1013,7 +1013,7 @@
//{
// mes.code = "300";
// mes.count = 0;
- // mes.Message = "浜岀淮鐮佷俊鎭负绌�!";
+ // mes.message = "浜岀淮鐮佷俊鎭负绌�!";
// mes.data = null;
// return mes;
//}
@@ -1029,7 +1029,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭浠诲姟涓哄鍗忓伐搴忎换鍔�,璇峰墠寰�澶栧崗鎿嶄綔椤电鎵ц!";
+ mes.message = "褰撳墠宸ュ簭浠诲姟涓哄鍗忓伐搴忎换鍔�,璇峰墠寰�澶栧崗鎿嶄綔椤电鎵ц!";
mes.data = null;
return mes;
}
@@ -1065,7 +1065,7 @@
{
mes.code = "200";
mes.count = total;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data.ToList();
return mes;
}
@@ -1073,7 +1073,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犲彲鎵ц鐨勭敓浜т换鍔�,浠诲姟宸插畬鎴愭垨宸插叧闂�!";
+ mes.message = "鏃犲彲鎵ц鐨勭敓浜т换鍔�,浠诲姟宸插畬鎴愭垨宸插叧闂�!";
mes.data = null;
return mes;
}
@@ -1082,7 +1082,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1108,7 +1108,7 @@
ordercode = arra[0]; //鑾峰彇鎸囧畾瀛楃涓插墠闈㈢殑瀛楃
mes.code = "300";
mes.count = 0;
- mes.Message = "璇锋壂鎻忓伐搴忎簩缁寸爜!";
+ mes.message = "璇锋壂鎻忓伐搴忎簩缁寸爜!";
mes.data = null;
return mes;
}
@@ -1134,7 +1134,7 @@
//{
// mes.code = "300";
// mes.count = 0;
- // mes.Message = "浜岀淮鐮佷俊鎭负绌�!";
+ // mes.message = "浜岀淮鐮佷俊鎭负绌�!";
// mes.data = null;
// return mes;
//}
@@ -1150,7 +1150,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭浠诲姟涓鸿嚜鍒跺伐搴忎换鍔�,璇峰墠寰�鑷埗鎿嶄綔椤电鎵ц!";
+ mes.message = "褰撳墠宸ュ簭浠诲姟涓鸿嚜鍒跺伐搴忎换鍔�,璇峰墠寰�鑷埗鎿嶄綔椤电鎵ц!";
mes.data = null;
return mes;
}
@@ -1186,7 +1186,7 @@
{
mes.code = "200";
mes.count = total;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data.ToList();
return mes;
}
@@ -1194,7 +1194,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犲彲鎵ц鐨勭敓浜т换鍔�,浠诲姟宸插畬鎴愭垨宸插叧闂�!";
+ mes.message = "鏃犲彲鎵ц鐨勭敓浜т换鍔�,浠诲姟宸插畬鎴愭垨宸插叧闂�!";
mes.data = null;
return mes;
}
@@ -1203,7 +1203,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1229,7 +1229,7 @@
ordercode = arra[0]; //鑾峰彇鎸囧畾瀛楃涓插墠闈㈢殑瀛楃
mes.code = "300";
mes.count = 0;
- mes.Message = "璇锋壂鎻忓伐搴忎簩缁寸爜!";
+ mes.message = "璇锋壂鎻忓伐搴忎簩缁寸爜!";
mes.data = null;
return mes;
}
@@ -1262,7 +1262,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭浠诲姟涓嶅瓨鍦�,鏃犳晥鏉＄爜!";
+ mes.message = "褰撳墠宸ュ簭浠诲姟涓嶅瓨鍦�,鏃犳晥鏉＄爜!";
mes.data = null;
return mes;
}
@@ -1297,7 +1297,7 @@
{
mes.code = "200";
mes.count = total;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data.ToList();
return mes;
}
@@ -1305,7 +1305,7 @@
{
mes.code = "301";
mes.count = 0;
- mes.Message = "鏃犲彲鎵ц鐨勭敓浜т换鍔�,浠诲姟宸插畬鎴愭垨宸插叧闂�!";
+ mes.message = "鏃犲彲鎵ц鐨勭敓浜т换鍔�,浠诲姟宸插畬鎴愭垨宸插叧闂�!";
mes.data = null;
return mes;
}
@@ -1314,7 +1314,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1343,7 +1343,7 @@
ordercode = arra[0]; //鑾峰彇鎸囧畾瀛楃涓插墠闈㈢殑瀛楃
mes.code = "300";
mes.count = 0;
- mes.Message = "璇锋壂鎻忓伐搴忎簩缁寸爜!";
+ mes.message = "璇锋壂鎻忓伐搴忎簩缁寸爜!";
mes.data = null;
return mes;
}
@@ -1400,7 +1400,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鎵爜宸ュ簭浠诲姟涓嶅瓨鍦�!";
+ mes.message = "褰撳墠鎵爜宸ュ簭浠诲姟涓嶅瓨鍦�!";
mes.data = null;
return mes;
}
@@ -1416,14 +1416,14 @@
list.Add("data2", dt);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = list;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犲彲鎵ц鐨勭敓浜т换鍔�,浠诲姟宸插畬鎴愭垨宸插叧闂�!";
+ mes.message = "鏃犲彲鎵ц鐨勭敓浜т换鍔�,浠诲姟宸插畬鎴愭垨宸插叧闂�!";
mes.data = null;
}
}
@@ -1431,7 +1431,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1456,7 +1456,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璇锋壂鎻忓伐搴忔潯鐮�!";
+ mes.message = "璇锋壂鎻忓伐搴忔潯鐮�!";
mes.data = null;
return mes;
}
@@ -1481,7 +1481,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "浜岀淮鐮佷俊鎭负绌�!";
+ mes.message = "浜岀淮鐮佷俊鎭负绌�!";
mes.data = null;
return mes;
}
@@ -1490,7 +1490,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1524,7 +1524,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "浜岀淮鐮佷俊鎭负绌�!";
+ mes.message = "浜岀淮鐮佷俊鎭负绌�!";
mes.data = null;
return mes;
}
@@ -1538,14 +1538,14 @@
dynamicParams.Add("@stepcode", stepcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1586,14 +1586,14 @@
where 1=1 " + search;
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1613,14 +1613,14 @@
dynamicParams.Add("@usergroupcode", usergroupcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1645,14 +1645,14 @@
dynamicParams.Add("@usercode", usercode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1685,7 +1685,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "浜岀淮鐮佷俊鎭负绌�!";
+ mes.message = "浜岀淮鐮佷俊鎭负绌�!";
mes.data = null;
return mes;
}
@@ -1696,14 +1696,14 @@
dynamicParams.Add("@stepcode", stepcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1736,7 +1736,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "浜岀淮鐮佷俊鎭负绌�!";
+ mes.message = "浜岀淮鐮佷俊鎭负绌�!";
mes.data = null;
return mes;
}
@@ -1747,14 +1747,14 @@
dynamicParams.Add("@stepcode", stepcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1780,7 +1780,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭浠诲姟宸插紑宸�!";
+ mes.message = "褰撳墠宸ュ簭浠诲姟宸插紑宸�!";
mes.data = null;
return mes;
}
@@ -1805,14 +1805,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "寮�宸ユ垚鍔�!";
+ mes.message = "寮�宸ユ垚鍔�!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "寮�宸ュけ璐�!";
+ mes.message = "寮�宸ュけ璐�!";
mes.data = null;
}
}
@@ -1820,7 +1820,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1863,7 +1863,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触,褰撳墠鎶ュ伐浜х嚎搴斾负锛�" + da.Rows[0]["NAME"].ToString() + "!";
+ mes.message = "鎿嶄綔澶辫触,褰撳墠鎶ュ伐浜х嚎搴斾负锛�" + da.Rows[0]["NAME"].ToString() + "!";
mes.data = null;
return mes;
}
@@ -2005,14 +2005,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2020,7 +2020,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2082,14 +2082,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鍙戞枡鎴愬姛!";
+ mes.message = "鍙戞枡鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍙戞枡澶辫触!";
+ mes.message = "鍙戞枡澶辫触!";
mes.data = null;
}
}
@@ -2097,7 +2097,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2148,7 +2148,7 @@
string wxstring = (string.Join(",", dr.Select(x => x.ToString()).ToArray()));
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触,褰撳墠鏀舵枡澶栧崗渚涙柟涓庡彂鏂欏鍗忎緵搴斿晢涓嶅尮閰�,搴斾负锛氥��" + wxstring + "銆�!";
+ mes.message = "鎿嶄綔澶辫触,褰撳墠鏀舵枡澶栧崗渚涙柟涓庡彂鏂欏鍗忎緵搴斿晢涓嶅尮閰�,搴斾负锛氥��" + wxstring + "銆�!";
mes.data = null;
return mes;
}
@@ -2156,7 +2156,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触,褰撳墠鏀舵枡鏁伴噺+涓嶈壇鏁伴噺,涓嶈兘澶т簬鍙戞枡鏁伴噺:" + da.Rows[0]["FQTY"].ToString() + "!";
+ mes.message = "鎿嶄綔澶辫触,褰撳墠鏀舵枡鏁伴噺+涓嶈壇鏁伴噺,涓嶈兘澶т簬鍙戞枡鏁伴噺:" + da.Rows[0]["FQTY"].ToString() + "!";
mes.data = null;
return mes;
}
@@ -2164,7 +2164,7 @@
//{
// mes.code = "300";
// mes.count = 0;
- // mes.Message = "鎿嶄綔澶辫触,褰撳墠鏀舵枡澶栧崗渚涙柟搴斾负锛�" + da.Rows[0]["NAME"].ToString() + "!";
+ // mes.message = "鎿嶄綔澶辫触,褰撳墠鏀舵枡澶栧崗渚涙柟搴斾负锛�" + da.Rows[0]["NAME"].ToString() + "!";
// mes.data = null;
// return mes;
//}
@@ -2176,7 +2176,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触,褰撳墠鏀舵枡鏁伴噺+涓嶈壇鏁伴噺,涓嶈兘澶т簬寰呮敹鏁伴噺:" + (sum_fqty - sum_sqty) + "!";
+ mes.message = "鎿嶄綔澶辫触,褰撳墠鏀舵枡鏁伴噺+涓嶈壇鏁伴噺,涓嶈兘澶т簬寰呮敹鏁伴噺:" + (sum_fqty - sum_sqty) + "!";
mes.data = null;
return mes;
}
@@ -2274,14 +2274,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鏀舵垚鍔�!";
+ mes.message = "鏀舵垚鍔�!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏀舵枡澶辫触!";
+ mes.message = "鏀舵枡澶辫触!";
mes.data = null;
}
}
@@ -2289,7 +2289,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2444,14 +2444,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2459,7 +2459,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2485,7 +2485,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璇锋壂鎻忓伐搴忔潯鐮�!";
+ mes.message = "璇锋壂鎻忓伐搴忔潯鐮�!";
mes.data = null;
return mes;
}
@@ -2503,7 +2503,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ崟宸插叧闂�,涓嶅厑璁告楠屾搷浣�!";
+ mes.message = "褰撳墠宸ュ崟宸插叧闂�,涓嶅厑璁告楠屾搷浣�!";
mes.data = null;
return mes;
}
@@ -2517,7 +2517,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "涓嶆槸鏈溅闂寸敓浜т换鍔�,涓嶅厑璁告楠屾搷浣�!";
+ mes.message = "涓嶆槸鏈溅闂寸敓浜т换鍔�,涓嶅厑璁告楠屾搷浣�!";
mes.data = null;
return mes;
}
@@ -2552,14 +2552,14 @@
list.Add("chekstand", data1);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = list;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠浜у搧銆�" + data.Rows[0]["partname"].ToString() + "銆�,瀵瑰簲宸ュ簭銆�" + data.Rows[0]["stepname"].ToString() + "銆戯紝鏈寚瀹氳川妫�鏂规!";
+ mes.message = "褰撳墠浜у搧銆�" + data.Rows[0]["partname"].ToString() + "銆�,瀵瑰簲宸ュ簭銆�" + data.Rows[0]["stepname"].ToString() + "銆戯紝鏈寚瀹氳川妫�鏂规!";
mes.data = null;
return mes;
}
@@ -2568,7 +2568,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭浠诲姟鏃犳姤宸ヤ骇鍑�!";
+ mes.message = "褰撳墠宸ュ簭浠诲姟鏃犳姤宸ヤ骇鍑�!";
mes.data = null;
return mes;
}
@@ -2577,7 +2577,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鐢熶骇浠诲姟涓嶅瓨鍦�!";
+ mes.message = "鐢熶骇浠诲姟涓嶅瓨鍦�!";
mes.data = null;
return mes;
}
@@ -2586,7 +2586,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "浜岀淮鐮佷俊鎭负绌�!";
+ mes.message = "浜岀淮鐮佷俊鎭负绌�!";
mes.data = null;
return mes;
}
@@ -2595,7 +2595,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2622,14 +2622,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠璐ㄦ鏂规鏃犳楠岄」!";
+ mes.message = "褰撳墠璐ㄦ鏂规鏃犳楠岄」!";
mes.data = null;
}
}
@@ -2637,7 +2637,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2726,14 +2726,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2741,7 +2741,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2841,7 +2841,7 @@
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -2849,7 +2849,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2878,14 +2878,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "宸ュ崟鍏抽棴鎴愬姛!";
+ mes.message = "宸ュ崟鍏抽棴鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ崟鍏抽棴澶辫触!";
+ mes.message = "宸ュ崟鍏抽棴澶辫触!";
mes.data = null;
}
}
@@ -2893,7 +2893,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2922,14 +2922,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "宸ュ崟鍏抽棴鎴愬姛!";
+ mes.message = "宸ュ崟鍏抽棴鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ崟鍏抽棴澶辫触!";
+ mes.message = "宸ュ崟鍏抽棴澶辫触!";
mes.data = null;
}
}
@@ -2937,7 +2937,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2957,14 +2957,14 @@
from TBas_wkshift_info";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2987,7 +2987,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "缂栫爜宸插瓨鍦�,涓嶈兘閲嶅!";
+ mes.message = "缂栫爜宸插瓨鍦�,涓嶈兘閲嶅!";
mes.data = null;
return mes;
}
@@ -2999,7 +2999,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍚嶇О宸插瓨鍦�,涓嶈兘閲嶅!";
+ mes.message = "鍚嶇О宸插瓨鍦�,涓嶈兘閲嶅!";
mes.data = null;
return mes;
}
@@ -3032,14 +3032,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -3047,7 +3047,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3070,7 +3070,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触锛�,璇ユ柟妗堝凡缁忚浜ц兘瑙勫垝璧勬簮寮曠敤!";
+ mes.message = "鍒犻櫎澶辫触锛�,璇ユ柟妗堝凡缁忚浜ц兘瑙勫垝璧勬簮寮曠敤!";
mes.data = null;
return mes;
}
@@ -3092,14 +3092,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -3107,7 +3107,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3185,7 +3185,7 @@
where C.description='W' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -3193,7 +3193,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3222,14 +3222,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔鎴愬姛!";
+ mes.message = "鏂板鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏂板鎿嶄綔澶辫触!";
+ mes.message = "鏂板鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -3245,14 +3245,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -3261,7 +3261,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3289,14 +3289,14 @@
list.Add(cmp);
}
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = list;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3345,14 +3345,14 @@
list.Add(cmp);
}
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = list;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3372,7 +3372,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "榛樿鏂规閫夋嫨涓嶈兘涓虹┖!";
+ mes.message = "榛樿鏂规閫夋嫨涓嶈兘涓虹┖!";
mes.data = null;
return mes;
}
@@ -3380,7 +3380,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ヤ綔鏃ュ巻閫夋嫨涓嶈兘涓虹┖!";
+ mes.message = "宸ヤ綔鏃ュ巻閫夋嫨涓嶈兘涓虹┖!";
mes.data = null;
return mes;
}
@@ -3406,14 +3406,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
@@ -3476,7 +3476,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼澶辫触锛�,鏃ユ湡锛�" + dt4.Rows[g]["TIME_START"] + "鏈夈��" + dt4.Rows[g]["STATUS"] + "銆戝伐鍗曪細" + dt4.Rows[g]["WO_CODE"] + "";
+ mes.message = "淇敼澶辫触锛�,鏃ユ湡锛�" + dt4.Rows[g]["TIME_START"] + "鏈夈��" + dt4.Rows[g]["STATUS"] + "銆戝伐鍗曪細" + dt4.Rows[g]["WO_CODE"] + "";
mes.data = null;
return mes;
}
@@ -3529,14 +3529,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -3545,7 +3545,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3622,7 +3622,7 @@
where E.isbott = 'Y' and A.status='NOSCHED' and A.isaps='Y' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -3630,7 +3630,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3653,7 +3653,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "瑕佹眰浜や粯鏃堕棿涓嶈兘灏忎簬褰撳墠绯荤粺鏃堕棿锛�";
+ mes.message = "瑕佹眰浜や粯鏃堕棿涓嶈兘灏忎簬褰撳墠绯荤粺鏃堕棿锛�";
mes.data = null;
return list;
}
@@ -3684,7 +3684,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁惧涓嶅彲鐢紒";
+ mes.message = "璁惧涓嶅彲鐢紒";
mes.data = null;
return list;
}
@@ -3693,7 +3693,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ヨ壓璺嚎鏈叧鑱旇澶囷紒";
+ mes.message = "宸ヨ壓璺嚎鏈叧鑱旇澶囷紒";
mes.data = null;
return list;
}
@@ -3727,7 +3727,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎺掍骇璁惧杞﹂棿涓庡伐鍗曞垱寤虹殑杞﹂棿涓嶅悓锛�";
+ mes.message = "鎺掍骇璁惧杞﹂棿涓庡伐鍗曞垱寤虹殑杞﹂棿涓嶅悓锛�";
mes.data = null;
return list;
}
@@ -3745,7 +3745,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎺掔▼璁惧" + listData[j].eqp_id.ToString() + "绋煎姩鐜囦笉鑳戒负0鎴栦负绌猴紒";
+ mes.message = "鎺掔▼璁惧" + listData[j].eqp_id.ToString() + "绋煎姩鐜囦笉鑳戒负0鎴栦负绌猴紒";
mes.data = null;
return list;
}
@@ -3753,7 +3753,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎺掔▼璁惧" + listData[j].eqp_id.ToString() + "鏈缃妭鎷嶏紒";
+ mes.message = "鎺掔▼璁惧" + listData[j].eqp_id.ToString() + "鏈缃妭鎷嶏紒";
mes.data = null;
return list;
}
@@ -3809,7 +3809,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ崟鍔犲伐浜у搧瀵瑰簲宸ヨ壓璺嚎璁惧鏈缃骇鑳芥垨鏈缃敓浜ц妭鎷嶏紒";
+ mes.message = "褰撳墠宸ュ崟鍔犲伐浜у搧瀵瑰簲宸ヨ壓璺嚎璁惧鏈缃骇鑳芥垨鏈缃敓浜ц妭鎷嶏紒";
mes.data = null;
}
}
@@ -3819,7 +3819,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁惧娌℃湁鍏宠仈杞﹂棿锛�";
+ mes.message = "璁惧娌℃湁鍏宠仈杞﹂棿锛�";
mes.data = null;
}
return list;
@@ -3828,7 +3828,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return list;
@@ -3894,7 +3894,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "瑕佹眰浜や粯鏃堕棿涓嶈兘灏忎簬褰撳墠绯荤粺鏃堕棿锛�";
+ mes.message = "瑕佹眰浜や粯鏃堕棿涓嶈兘灏忎簬褰撳墠绯荤粺鏃堕棿锛�";
mes.data = null;
return list;
}
@@ -3925,7 +3925,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁惧涓嶅彲鐢紒";
+ mes.message = "璁惧涓嶅彲鐢紒";
mes.data = null;
return list;
}
@@ -3934,7 +3934,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ヨ壓璺嚎鏈叧鑱旇澶囷紒";
+ mes.message = "宸ヨ壓璺嚎鏈叧鑱旇澶囷紒";
mes.data = null;
return list;
}
@@ -3968,7 +3968,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎺掍骇璁惧杞﹂棿涓庡伐鍗曞垱寤虹殑杞﹂棿涓嶅悓锛�";
+ mes.message = "鎺掍骇璁惧杞﹂棿涓庡伐鍗曞垱寤虹殑杞﹂棿涓嶅悓锛�";
mes.data = null;
return list;
}
@@ -3987,7 +3987,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎺掔▼璁惧" + listData[j].eqp_id.ToString() + "绋煎姩鐜囦笉鑳戒负0鎴栦负绌猴紒";
+ mes.message = "鎺掔▼璁惧" + listData[j].eqp_id.ToString() + "绋煎姩鐜囦笉鑳戒负0鎴栦负绌猴紒";
mes.data = null;
return list;
}
@@ -3995,7 +3995,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎺掔▼璁惧" + listData[j].eqp_id.ToString() + "鏈缃妭鎷嶏紒";
+ mes.message = "鎺掔▼璁惧" + listData[j].eqp_id.ToString() + "鏈缃妭鎷嶏紒";
mes.data = null;
return list;
}
@@ -4051,7 +4051,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ崟鍔犲伐浜у搧瀵瑰簲宸ヨ壓璺嚎璁惧鏈缃骇鑳芥垨鏈缃敓浜ц妭鎷嶏紒";
+ mes.message = "褰撳墠宸ュ崟鍔犲伐浜у搧瀵瑰簲宸ヨ壓璺嚎璁惧鏈缃骇鑳芥垨鏈缃敓浜ц妭鎷嶏紒";
mes.data = null;
}
}
@@ -4061,7 +4061,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁惧娌℃湁鍏宠仈杞﹂棿锛�";
+ mes.message = "璁惧娌℃湁鍏宠仈杞﹂棿锛�";
mes.data = null;
}
}
@@ -4071,7 +4071,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return list;
@@ -4150,7 +4150,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鎺掔▼浠诲姟宸茬粡娲惧彂,鎻愪氦鍙栨秷锛�";
+ mes.message = "褰撳墠鎺掔▼浠诲姟宸茬粡娲惧彂,鎻愪氦鍙栨秷锛�";
mes.data = null;
return mes;
}
@@ -4158,7 +4158,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鎺掔▼浠诲姟宸茬粡鎺掔▼,鎻愪氦鍙栨秷锛�";
+ mes.message = "褰撳墠鎺掔▼浠诲姟宸茬粡鎺掔▼,鎻愪氦鍙栨秷锛�";
mes.data = null;
return mes;
}
@@ -4189,7 +4189,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍏堥鎺�,鍐嶇偣鍑绘彁浜わ紒";
+ mes.message = "鍏堥鎺�,鍐嶇偣鍑绘彁浜わ紒";
mes.data = null;
return mes;
}
@@ -4212,7 +4212,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鐢熸垚璁惧浠诲姟姹囨�昏〃鍑洪敊锛屾帓浜уけ璐ワ紒";
+ mes.message = "鐢熸垚璁惧浠诲姟姹囨�昏〃鍑洪敊锛屾帓浜уけ璐ワ紒";
mes.data = null;
return mes;
}
@@ -4261,13 +4261,13 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎻愪氦鎺掔▼鎴愬姛锛�";
+ mes.message = "鎻愪氦鎺掔▼鎴愬姛锛�";
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎻愪氦鎺掔▼澶辫触锛�";
+ mes.message = "鎻愪氦鎺掔▼澶辫触锛�";
mes.data = null;
}
}
@@ -4275,7 +4275,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4312,14 +4312,14 @@
dynamicParams.Add("@ordercode", ordercode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4369,14 +4369,14 @@
dynamicParams.Add("@wkshopcode", wkshopcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4453,7 +4453,7 @@
) as AA where AA.good_qty>AA.inhouseqty " + search;
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data;
}
@@ -4461,7 +4461,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4684,14 +4684,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
@@ -4700,7 +4700,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -4732,7 +4732,7 @@
if (data0.Rows.Count <= 0)
{
mes.code = "300";
- mes.Message = "鏃犳晥鏉＄爜!";
+ mes.message = "鏃犳晥鏉＄爜!";
mes.data = null;
return mes;
}
@@ -4755,7 +4755,7 @@
if (data1.Rows.Count <= 0)
{
mes.code = "300";
- mes.Message = "褰撳墠鏉＄爜宸插叆搴�!";
+ mes.message = "褰撳墠鏉＄爜宸插叆搴�!";
mes.data = null;
return mes;
}
@@ -4789,13 +4789,13 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
- mes.Message = "鏆傛棤鐗╂枡鏁版嵁!";
+ mes.message = "鏆傛棤鐗╂枡鏁版嵁!";
mes.data = null;
}
}
@@ -4803,7 +4803,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
diff --git a/VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs b/VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs
index 57c9540..5b8bb51 100644
--- a/VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs
@@ -51,7 +51,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -59,7 +59,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -100,14 +100,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "缂洪櫡缂栫爜:" + defectcode + "缂洪櫡鍚嶇О:" + defectname, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "缂洪櫡瀹氫箟鏂板鎴愬姛!";
+ mes.message = "缂洪櫡瀹氫箟鏂板鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "缂洪櫡瀹氫箟鏂板澶辫触!";
+ mes.message = "缂洪櫡瀹氫箟鏂板澶辫触!";
mes.data = null;
}
}
@@ -133,14 +133,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "缂洪櫡缂栫爜:" + defectcode + "缂洪櫡鍚嶇О:" + defectname, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "缂洪櫡瀹氫箟淇敼鎴愬姛!";
+ mes.message = "缂洪櫡瀹氫箟淇敼鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "缂洪櫡瀹氫箟淇敼澶辫触!";
+ mes.message = "缂洪櫡瀹氫箟淇敼澶辫触!";
mes.data = null;
}
}
@@ -149,7 +149,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -171,7 +171,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠缂洪櫡椤瑰凡鐢熸垚鎶ュ伐缂洪櫡璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠缂洪櫡椤瑰凡鐢熸垚鎶ュ伐缂洪櫡璁板綍,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -186,14 +186,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "缂洪櫡缂栫爜:" + defectcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "缂洪櫡鍒犻櫎鎴愬姛!";
+ mes.message = "缂洪櫡鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "缂洪櫡鍒犻櫎澶辫触!";
+ mes.message = "缂洪櫡鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -201,7 +201,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -239,7 +239,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -247,7 +247,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -286,14 +286,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "宸ュ簭妫�楠岄」鐩�:" + checkitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "宸ュ簭妫�楠岄」鐩柊澧炴垚鍔�!";
+ mes.message = "宸ュ簭妫�楠岄」鐩柊澧炴垚鍔�!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ簭妫�楠岄」鐩柊澧炲け璐�!";
+ mes.message = "宸ュ簭妫�楠岄」鐩柊澧炲け璐�!";
mes.data = null;
}
}
@@ -319,14 +319,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "宸ュ簭妫�楠岄」鐩�:" + checkitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "宸ュ簭妫�楠岄」鐩慨鏀规垚鍔�!";
+ mes.message = "宸ュ簭妫�楠岄」鐩慨鏀规垚鍔�!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ簭妫�楠岄」鐩慨鏀瑰け璐�!";
+ mes.message = "宸ュ簭妫�楠岄」鐩慨鏀瑰け璐�!";
mes.data = null;
}
}
@@ -335,7 +335,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -357,7 +357,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠妫�楠岄」椤瑰凡鐢熸垚妫�楠岃褰�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠妫�楠岄」椤瑰凡鐢熸垚妫�楠岃褰�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -372,14 +372,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "宸ュ簭妫�楠岄」鐩�:" + checkitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "宸ュ簭妫�楠屽垹闄ゆ垚鍔�!";
+ mes.message = "宸ュ簭妫�楠屽垹闄ゆ垚鍔�!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ簭妫�楠屽垹闄ゅけ璐�!";
+ mes.message = "宸ュ簭妫�楠屽垹闄ゅけ璐�!";
mes.data = null;
}
}
@@ -387,7 +387,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -460,7 +460,7 @@
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -468,7 +468,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -491,14 +491,14 @@
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -515,14 +515,14 @@
sql = @"select code,name,descr from TStepCheckItem";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -603,7 +603,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼澶辫触,褰撳墠璐ㄦ鏂规宸茬敓鎴愬搴旀楠岃褰�!";
+ mes.message = "淇敼澶辫触,褰撳墠璐ㄦ鏂规宸茬敓鎴愬搴旀楠岃褰�!";
mes.data = null;
return mes;
}
@@ -679,14 +679,14 @@
}
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -694,7 +694,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -717,7 +717,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触,褰撳墠璐ㄦ鏂规宸茬敓鎴愬搴旀楠岃褰�!";
+ mes.message = "鍒犻櫎澶辫触,褰撳墠璐ㄦ鏂规宸茬敓鎴愬搴旀楠岃褰�!";
mes.data = null;
return mes;
}
@@ -735,14 +735,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "璐ㄦ鏂规:" + qualityinsptcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "璐ㄦ鏂规鍒犻櫎鎴愬姛!";
+ mes.message = "璐ㄦ鏂规鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璐ㄦ鏂规鍒犻櫎澶辫触!";
+ mes.message = "璐ㄦ鏂规鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -750,7 +750,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -775,7 +775,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璇锋壂鎻忓伐搴忔潯鐮�!";
+ mes.message = "璇锋壂鎻忓伐搴忔潯鐮�!";
mes.data = null;
return mes;
}
@@ -814,14 +814,14 @@
list.Add("chekstand", data1);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = list;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠浜у搧銆�" + data.Rows[0]["partname"].ToString() + "銆�,瀵瑰簲宸ュ簭銆�" + data.Rows[0]["stepname"].ToString() + "銆戯紝鏈寚瀹氳川妫�鏂规!";
+ mes.message = "褰撳墠浜у搧銆�" + data.Rows[0]["partname"].ToString() + "銆�,瀵瑰簲宸ュ簭銆�" + data.Rows[0]["stepname"].ToString() + "銆戯紝鏈寚瀹氳川妫�鏂规!";
mes.data = null;
return mes;
}
@@ -830,7 +830,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭浠诲姟鏃犳姤宸ヤ骇鍑�!";
+ mes.message = "褰撳墠宸ュ簭浠诲姟鏃犳姤宸ヤ骇鍑�!";
mes.data = null;
return mes;
}
@@ -839,7 +839,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鐢熶骇浠诲姟涓嶅瓨鍦�!";
+ mes.message = "鐢熶骇浠诲姟涓嶅瓨鍦�!";
mes.data = null;
return mes;
}
@@ -848,7 +848,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "浜岀淮鐮佷俊鎭负绌�!";
+ mes.message = "浜岀淮鐮佷俊鎭负绌�!";
mes.data = null;
return mes;
}
@@ -857,7 +857,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -884,14 +884,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠璐ㄦ鏂规鏃犳楠岄」!";
+ mes.message = "褰撳墠璐ㄦ鏂规鏃犳楠岄」!";
mes.data = null;
}
}
@@ -899,7 +899,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -986,14 +986,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1001,7 +1001,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1068,7 +1068,7 @@
where A.check_type in('FirstCheck','PatroCheck','EndCheck') " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -1076,7 +1076,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1098,14 +1098,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = dt;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犳楠屾槑缁嗘暟鎹�!";
+ mes.message = "鏃犳楠屾槑缁嗘暟鎹�!";
mes.data = null;
}
}
@@ -1113,7 +1113,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1223,7 +1223,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "宸ュ簭妫�楠岃褰�");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -1231,7 +1231,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
diff --git a/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs b/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
index 5872621..162caa9 100644
--- a/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
@@ -20,7 +20,7 @@
#region[鐢熶骇杩涘害鎶ヨ〃]
- public static ToMessage ProductionScheduleReportSearch(string status, string wocode,string wkshopcode,string wkshopname, string partcode, string partname, string partspec, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage ProductionScheduleReportSearch(string status, string wkshopcode, string wocode, string partcode, string partname, string partspec, string opendate, string closedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -48,13 +48,8 @@
}
if (wkshopcode != "" && wkshopcode != null)
{
- search += "and AA.wkshp_code like '%'+@wkshopcode+'%' ";
+ search += "and AA.wkshp_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
- }
- if (wkshopname != "" && wkshopname != null)
- {
- search += "and AA.wkshp_name like '%'+@wkshopname+'%' ";
- dynamicParams.Add("@wkshopname", wkshopname);
}
if (partcode != "" && partcode != null)
{
@@ -107,7 +102,7 @@
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -115,7 +110,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -123,7 +118,7 @@
#endregion
#region[鐢熶骇杩涘害鎶ヨ〃瀵煎嚭]
- public static ToMessage ProductionScheduleReportExcelSearch(string status, string wocode, string wkshopcode, string wkshopname, string partcode, string partname, string partspec, string opendate, string closedate)
+ public static ToMessage ProductionScheduleReportExcelSearch(string status, string wkshopcode, string wocode,string partcode, string partname, string partspec, string opendate, string closedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -151,13 +146,8 @@
}
if (wkshopcode != "" && wkshopcode != null)
{
- search += "and AA.wkshp_code like '%'+@wkshopcode+'%' ";
+ search += "and AA.wkshp_code=@wkshopcode ";
dynamicParams.Add("@wkshopcode", wkshopcode);
- }
- if (wkshopname != "" && wkshopname != null)
- {
- search += "and AA.wkshp_name like '%'+@wkshopname+'%' ";
- dynamicParams.Add("@wkshopname", wkshopname);
}
if (partcode != "" && partcode != null)
{
@@ -207,7 +197,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "鐢熶骇杩涘害鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -215,7 +205,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -224,7 +214,7 @@
#region[鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ]
- public static ToMessage GroupSalaryReportSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage GroupSalaryReportSearch(string compute,string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -234,6 +224,11 @@
{
search += "and P.isend=@isend ";
dynamicParams.Add("@isend", "Y");
+ }
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and K.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
}
if (wocode != "" && wocode != null)
{
@@ -283,7 +278,7 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select distinct A.id,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,A.task_qty,G.usergroupcode,G.usergroupname,A.good_qty,
+ var sql = @"select distinct A.id,K.wkshp_code,F.torg_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,A.task_qty,G.usergroupcode,G.usergroupname,A.good_qty,
isnull(P.stepprice,0) as unprice,A.good_qty*isnull(P.stepprice,0) as usermoney,U.username as lm_user,A.lm_date,B.report_date
from TK_Wrk_Record A
inner join TK_Wrk_RecordSub B on A.id=B.m_id
@@ -293,10 +288,11 @@
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on A.lm_user=U.usercode
+ left join TOrganization F on K.wkshp_code=F.torg_code
where B.usergroup_code<>'' and A.style='B' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -304,7 +300,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -329,14 +325,14 @@
dynamicParams.Add("@id", id);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -344,7 +340,7 @@
#endregion
#region[鐝粍宸ヨ祫鎶ヨ〃璁板綍瀵煎嚭]
- public static ToMessage GroupSalaryReportExcelSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate)
+ public static ToMessage GroupSalaryReportExcelSearch(string compute,string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -354,6 +350,11 @@
{
search += "and P.isend=@isend ";
dynamicParams.Add("@isend", "Y");
+ }
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and K.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
}
if (wocode != "" && wocode != null)
{
@@ -402,7 +403,7 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select distinct A.wo_code as 宸ュ崟缂栧彿,M.partcode as 浜у搧缂栫爜,M.partname as 浜у搧鍚嶇О,M.partspec as 浜у搧瑙勬牸,
+ var sql = @"select distinct K.wkshp_code as 杞﹂棿缂栫爜,F.torg_name as 杞﹂棿鍚嶇О, A.wo_code as 宸ュ崟缂栧彿,M.partcode as 浜у搧缂栫爜,M.partname as 浜у搧鍚嶇О,M.partspec as 浜у搧瑙勬牸,
T.stepcode as 宸ュ簭缂栫爜,T.stepname as 宸ュ簭鍚嶇О,A.task_qty as 浠诲姟鏁伴噺,G.usergroupcode as 鐝粍缂栫爜,G.usergroupname as 鐝粍鍚嶇О,
A.good_qty as 鎶ュ伐鏁伴噺,isnull(P.stepprice,0) as 宸ュ簭鍗曚环,A.good_qty*isnull(P.stepprice,0) as 璁′欢宸ヨ祫,U.username as 鎿嶄綔浜哄憳,A.lm_date as 鎿嶄綔鏃堕棿,B.report_date as 鎶ュ伐鏃堕棿
from TK_Wrk_Record A
@@ -413,12 +414,13 @@
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on A.lm_user=U.usercode
+ left join TOrganization F on K.wkshp_code=F.torg_code
where B.usergroup_code<>'' and A.style='B' " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "鐝粍璁′欢宸ヨ祫鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -426,7 +428,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -435,7 +437,7 @@
#region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃]
- public static ToMessage PeopleSalaryReportSearch(string compute, string wocode, string partcode, string partname, string partspec,string stepcode, string stepname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage PeopleSalaryReportSearch(string compute,string wkshopcode, string wocode, string partcode, string partname, string partspec,string stepcode, string stepname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -445,6 +447,11 @@
{
search += "and AA.isend=@isend ";
dynamicParams.Add("@isend", "Y");
+ }
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and AA.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
}
if (wocode != "" && wocode != null)
{
@@ -495,7 +502,7 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select * from(
- select A.wo_code,A.materiel_code as partcode,P.partname,P.partspec,A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,K.isend,
+ select M.wkshp_code,F.torg_name as wkshp_name,A.wo_code,A.materiel_code as partcode,P.partname,P.partspec,A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,K.isend,
A.task_qty,B.report_qty,isnull(A.step_price,0) as step_price,(B.report_qty*isnull(A.step_price,0)) as moneys,
B.report_person as usercode,
STUFF((SELECT ',' + U.username
@@ -509,9 +516,10 @@
left join TK_Wrk_Step K on M.wo_code=K.wo_code and A.step_code=K.step_code
left join TStep S on A.step_code=S.stepcode
left join TMateriel_Info P on A.materiel_code=P.partcode
+ left join TOrganization F on M.wkshp_code=F.torg_code
where A.style='B' and B.style='B' and A.verify='Y' and B.usergroup_code=''
union all
- select A.wo_code,A.materiel_code as partcode,P.partname,P.partspec,A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,K.isend,
+ select M.wkshp_code,F.torg_name as wkshp_name,A.wo_code,A.materiel_code as partcode,P.partname,P.partspec,A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,K.isend,
M.plan_qty as task_qty,B.sqty as report_qty,isnull(A.step_price,0) as step_price,(B.sqty*isnull(A.step_price,0)) as moneys,
B.in_person as usercode,
STUFF((SELECT ',' + U.username
@@ -525,12 +533,13 @@
left join TK_Wrk_Step K on M.wo_code=K.wo_code and A.step_code=K.step_code
left join TStep S on A.step_code = S.stepcode
left join TMateriel_Info P on A.materiel_code = P.partcode
+ left join TOrganization F on M.wkshp_code=F.torg_code
where A.style = 'S' and B.style = 'S' and A.verify='Y'
) as AA
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -538,7 +547,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -546,7 +555,7 @@
#endregion
#region[浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃瀵煎嚭]
- public static ToMessage PeopleSalaryReportSearch(string compute, string wocode, string partcode, string partname, string partspec, string stepcode, string stepname, string reportname, string reportopendate, string reportclosedate)
+ public static ToMessage PeopleSalaryReportSearch(string compute,string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepcode, string stepname, string reportname, string reportopendate, string reportclosedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -556,6 +565,11 @@
{
search += "and AA.isend=@isend ";
dynamicParams.Add("@isend", "Y");
+ }
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and AA.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
}
if (wocode != "" && wocode != null)
{
@@ -605,11 +619,11 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select AA.wo_code as '宸ュ崟鍙�',AA.partcode as '浜у搧缂栫爜',AA.partname '浜у搧鍚嶇О',AA.partspec as '瑙勬牸鍨嬪彿',AA.step_seq as '宸ュ簭搴忓彿',
+ var sql = @"select AA.wkshp_code as 杞﹂棿缂栫爜,AA.wkshp_name as 杞﹂棿鍚嶇О,AA.wo_code as '宸ュ崟鍙�',AA.partcode as '浜у搧缂栫爜',AA.partname '浜у搧鍚嶇О',AA.partspec as '瑙勬牸鍨嬪彿',AA.step_seq as '宸ュ簭搴忓彿',
AA.step_code as '宸ュ簭缂栫爜',AA.stepname as '宸ュ簭鍚嶇О',(case when AA.steptype='Z' then '鑷埗' else '澶栧崗' end) as '宸ュ簭绫诲瀷',AA.task_qty as '浠诲姟鏁伴噺',AA.report_qty as '鎶ュ伐鏁伴噺',
AA.step_price as '宸ュ簭鍗曚环',AA.moneys as '璁′欢宸ヨ祫',AA.usercode as '鎶ュ伐浜哄憳缂栧彿',AA.username as '鎶ュ伐浜哄憳鍚嶇О',AA.report_date as '鎶ュ伐鏃堕棿'
from(
- select A.wo_code,A.materiel_code as partcode,P.partname,P.partspec,A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,K.isend,
+ select M.wkshp_code,F.torg_name as wkshp_name,A.wo_code,A.materiel_code as partcode,P.partname,P.partspec,A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,K.isend,
A.task_qty,B.report_qty,isnull(A.step_price,0) as step_price,(B.report_qty*isnull(A.step_price,0)) as moneys,
B.report_person as usercode,
STUFF((SELECT ',' + U.username
@@ -623,9 +637,10 @@
left join TK_Wrk_Step K on M.wo_code=K.wo_code and A.step_code=K.step_code
left join TStep S on A.step_code=S.stepcode
left join TMateriel_Info P on A.materiel_code=P.partcode
+ left join TOrganization F on M.wkshp_code=F.torg_code
where A.style='B' and B.style='B' and A.verify='Y' and B.usergroup_code=''
union all
- select A.wo_code,A.materiel_code as partcode,P.partname,P.partspec,A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,K.isend,
+ select M.wkshp_code,F.torg_name as wkshp_name,A.wo_code,A.materiel_code as partcode,P.partname,P.partspec,A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,K.isend,
M.plan_qty as task_qty,B.sqty as report_qty,isnull(A.step_price,0) as step_price,(B.sqty*isnull(A.step_price,0)) as moneys,
B.in_person as usercode,
STUFF((SELECT ',' + U.username
@@ -639,6 +654,7 @@
left join TK_Wrk_Step K on M.wo_code=K.wo_code and A.step_code=K.step_code
left join TStep S on A.step_code = S.stepcode
left join TMateriel_Info P on A.materiel_code = P.partcode
+ left join TOrganization F on M.wkshp_code=F.torg_code
where A.style = 'S' and B.style = 'S' and A.verify='Y'
) as AA
where " + search;
@@ -646,7 +662,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "浜哄憳宸ヨ祫鏄庣粏鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -654,7 +670,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -663,12 +679,17 @@
#region[濮斿鎶ヨ〃璁板綍鏌ヨ]
- public static ToMessage OutSourceReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage OutSourceReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and P.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wocode != "" && wocode != null)
{
search += "and A.wo_code like '%'+@wocode+'%' ";
@@ -733,10 +754,12 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,C.code,C.name,(case when A.style='F' then '鍙戞枡' when A.style='S' then '鏀舵枡' end) as style,
+ var sql = @"select P.wkshp_code,G.torg_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,C.code,C.name,(case when A.style='F' then '鍙戞枡' when A.style='S' then '鏀舵枡' end) as style,
A.fqty,A.sqty,A.ng_qty,A.laborbad_qty,A.materielbad_qty,U.username as out_person,B.out_time,T.username as in_person,B.in_time
from TK_Wrk_OutRecord A
inner join TK_Wrk_OutRecordSub B on A.id=B.m_id
+ left join TK_Wrk_Man P on A.wo_code=P.wo_code
+ left join TOrganization G on P.wkshp_code=G.torg_code
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep S on A.step_code=S.stepcode
left join TCustomer C on A.wx_code=C.code
@@ -745,7 +768,7 @@
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -753,7 +776,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -761,12 +784,17 @@
#endregion
#region[濮斿鎶ヨ〃璁板綍瀵煎嚭]
- public static ToMessage OutSourceReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate)
+ public static ToMessage OutSourceReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and P.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wocode != "" && wocode != null)
{
search += "and A.wo_code like '%'+@wocode+'%' ";
@@ -831,12 +859,14 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.wo_code as '宸ュ崟缂栧彿',M.partcode as '浜у搧缂栫爜',M.partname as '浜у搧鍚嶇О',M.partspec as '浜у搧瑙勬牸',S.stepcode as '宸ュ簭缂栫爜',S.stepname as '宸ュ簭鍚嶇О',
+ var sql = @"select P.wkshp_code as 杞﹂棿缂栫爜,G.torg_name as 杞﹂棿鍚嶇О,A.wo_code as '宸ュ崟缂栧彿',M.partcode as '浜у搧缂栫爜',M.partname as '浜у搧鍚嶇О',M.partspec as '浜у搧瑙勬牸',S.stepcode as '宸ュ簭缂栫爜',S.stepname as '宸ュ簭鍚嶇О',
C.code as '澶栧崗渚涙柟缂栫爜',C.name as '澶栧崗渚涙柟鍚嶇О',(case when A.style='F' then '鍙戞枡' when A.style='S' then '鏀舵枡' end) as '鎿嶄綔绫诲瀷',
A.fqty as '鍙戞枡鏁伴噺',A.sqty as '鏀舵枡鏁伴噺',A.ng_qty as '涓嶈壇鏁伴噺',A.laborbad_qty as '宸ュ簾鏁伴噺',A.materielbad_qty as '鏂欏簾鏁伴噺',U.username as '鍙戞枡浜哄憳',B.out_time as '鍙戞枡鏃堕棿',
T.username as '鏀舵枡浜哄憳',B.in_time as '鏀舵枡鏃堕棿'
from TK_Wrk_OutRecord A
inner join TK_Wrk_OutRecordSub B on A.id=B.m_id
+ left join TK_Wrk_Man P on A.wo_code=P.wo_code
+ left join TOrganization G on P.wkshp_code=G.torg_code
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep S on A.step_code=S.stepcode
left join TCustomer C on A.wx_code=C.code
@@ -847,7 +877,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "濮斿鎶ュ伐璁板綍鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -855,7 +885,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -864,12 +894,17 @@
#region[涓嶈壇鏄庣粏鎶ヨ〃]
- public static ToMessage DefectDetailsReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage DefectDetailsReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and AA.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wocode != "" && wocode != null)
{
search += "and AA.wo_code like '%'+@wocode+'%' ";
@@ -925,7 +960,7 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select * from(
- select A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,P.plan_qty,A.defect_qty,
+ select W.wkshp_code,G.torg_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,P.plan_qty,A.defect_qty,
A.defect_code,
STUFF((SELECT ',' + F.name
FROM TDefect F
@@ -934,6 +969,8 @@
A.style,U.username as lm_user,A.lm_date
from CSR_WorkRecord_Defect A
inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
+ left join TK_Wrk_Man W on A.wo_code=W.wo_code
+ left join TOrganization G on W.wkshp_code=G.torg_code
left join TMateriel_Info M on A.partnumber=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on A.lm_user=U.usercode
@@ -941,7 +978,7 @@
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -949,7 +986,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -957,12 +994,17 @@
#endregion
#region[涓嶈壇鏄庣粏鎶ヨ〃瀵煎嚭]
- public static ToMessage DefectDetailsReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate)
+ public static ToMessage DefectDetailsReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string defectcode, string defectname, string reportname, string reportopendate, string reportclosedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and AA.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wocode != "" && wocode != null)
{
search += "and AA.wo_code like '%'+@wocode+'%' ";
@@ -1017,11 +1059,11 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select AA.wo_code as 宸ュ崟缂栧彿,AA.partcode as 浜у搧缂栫爜,AA.partname as 浜у搧鍚嶇О,AA.partspec as 浜у搧瑙勬牸,AA.stepcode as 宸ュ簭缂栫爜,
+ var sql = @"select AA.wkshp_code as 杞﹂棿缂栫爜,AA.wkshp_name as 杞﹂棿鍚嶇О,AA.wo_code as 宸ュ崟缂栧彿,AA.partcode as 浜у搧缂栫爜,AA.partname as 浜у搧鍚嶇О,AA.partspec as 浜у搧瑙勬牸,AA.stepcode as 宸ュ簭缂栫爜,
AA.stepname as 宸ュ簭鍚嶇О,AA.plan_qty as 浠诲姟鏁伴噺,AA.defect_qty as 涓嶈壇鏁伴噺,AA.defect_code as 缂洪櫡浠ｇ爜,AA.defect_name as 缂洪櫡鍚嶇О,
(case when AA.style='B' then '鎶ュ伐' when AA.style='S' then '鏀舵枡' end) as '鎿嶄綔绫诲瀷',AA.lm_user as 鎿嶄綔浜哄憳,AA.lm_date as 鎿嶄綔鏃堕棿
from(
- select A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,P.plan_qty,A.defect_qty,
+ select W.wkshp_code,G.torg_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,P.plan_qty,A.defect_qty,
A.defect_code,
STUFF((SELECT ',' + F.name
FROM TDefect F
@@ -1030,6 +1072,8 @@
A.style,U.username as lm_user,A.lm_date
from CSR_WorkRecord_Defect A
inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
+ left join TK_Wrk_Man W on A.wo_code=W.wo_code
+ left join TOrganization G on W.wkshp_code=G.torg_code
left join TMateriel_Info M on A.partnumber=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on A.lm_user=U.usercode
@@ -1039,7 +1083,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "涓嶈壇鏄庣粏鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -1047,7 +1091,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1056,12 +1100,17 @@
#region[缁翠慨鏄庣粏鎶ヨ〃]
- public static ToMessage MaintenanceDetailsReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage MaintenanceDetailsReportSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and AA.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wocode != "" && wocode != null)
{
search += "and AA.wo_code like '%'+@wocode+'%' ";
@@ -1116,10 +1165,10 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select AA.wo_code,AA.partcode,AA.partname,AA.partspec,AA.stepcode,AA.stepname,(case when AA.style='B' then '鎶ュ伐' when AA.style='S' then '鏀舵枡' end) as style,
+ var sql = @"select AA.wkshp_code,AA.wkshp_name,AA.wo_code,AA.partcode,AA.partname,AA.partspec,AA.stepcode,AA.stepname,(case when AA.style='B' then '鎶ュ伐' when AA.style='S' then '鏀舵枡' end) as style,
AA.plan_qty,AA.repair_qty,AA.laborbad_qty,AA.materielbad_qty,AA.defect_code,AA.defect_name,AA.lm_user,AA.lm_date
from(
- select F.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,F.style,P.plan_qty,F.repair_qty,F.laborbad_qty,F.materielbad_qty,F.defect_code,
+ select W.wkshp_code,G.torg_name as wkshp_name,F.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,F.style,P.plan_qty,F.repair_qty,F.laborbad_qty,F.materielbad_qty,F.defect_code,
defect_name = STUFF(( SELECT ',' + T.name
FROM TDefect as T
where PATINDEX('%,' + RTRIM(T.code) + ',%',',' + F.defect_code + ',')>0
@@ -1127,6 +1176,8 @@
FOR XML PATH('')), 1, 1,''),U.username as lm_user,F.lm_date
from CSR_WorkRecord_DefectHandle as F
inner join TK_Wrk_Step P on F.wo_code=P.wo_code and F.step_code=P.step_code
+ left join TK_Wrk_Man W on F.wo_code=W.wo_code
+ left join TOrganization G on W.wkshp_code=G.torg_code
left join TMateriel_Info M on F.partnumber=M.partcode
left join TStep S on F.step_code=S.stepcode
left join TUser U on F.lm_user=U.usercode
@@ -1134,7 +1185,7 @@
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -1142,7 +1193,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1150,12 +1201,17 @@
#endregion
#region[缁翠慨鏄庣粏鎶ヨ〃瀵煎嚭]
- public static ToMessage MaintenanceDetailsReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate)
+ public static ToMessage MaintenanceDetailsReportExcelSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, string stepname, string style, string defectname, string repairname, string repairopendate, string repairclosedate)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and AA.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wocode != "" && wocode != null)
{
search += "and AA.wo_code like '%'+@wocode+'%' ";
@@ -1210,11 +1266,11 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select AA.wo_code as 宸ュ崟缂栧彿,AA.partcode as 浜у搧缂栫爜,AA.partname as 浜у搧鍚嶇О,AA.partspec as 浜у搧瑙勬牸,AA.stepcode as 宸ュ簭缂栫爜,AA.stepname as 宸ュ簭鍚嶇О,
+ var sql = @"select AA.wkshp_code as 杞﹂棿缂栫爜,AA.wkshp_name as 杞﹂棿鍚嶇О,AA.wo_code as 宸ュ崟缂栧彿,AA.partcode as 浜у搧缂栫爜,AA.partname as 浜у搧鍚嶇О,AA.partspec as 浜у搧瑙勬牸,AA.stepcode as 宸ュ簭缂栫爜,AA.stepname as 宸ュ簭鍚嶇О,
(case when AA.style='B' then '鎶ュ伐' when AA.style='S' then '鏀舵枡' end) as 鎿嶄綔绫诲瀷,
AA.plan_qty as 浠诲姟鏁伴噺,AA.repair_qty as 缁翠慨鏁伴噺,AA.laborbad_qty as 宸ュ簾鏁伴噺,AA.materielbad_qty as 鏂欏簾鏁伴噺,AA.defect_name as 缂洪櫡鍚嶇О,AA.lm_user as 缁翠慨浜哄憳,AA.lm_date as 缁翠慨鏃堕棿
from(
- select F.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,F.style,P.plan_qty,F.repair_qty,F.laborbad_qty,F.materielbad_qty,F.defect_code,
+ select W.wkshp_code,G.torg_name as wkshp_name,F.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,F.style,P.plan_qty,F.repair_qty,F.laborbad_qty,F.materielbad_qty,F.defect_code,
defect_name = STUFF(( SELECT ',' + T.name
FROM TDefect as T
where PATINDEX('%,' + RTRIM(T.code) + ',%',',' + F.defect_code + ',')>0
@@ -1222,6 +1278,8 @@
FOR XML PATH('')), 1, 1,''),U.username as lm_user,F.lm_date
from CSR_WorkRecord_DefectHandle as F
inner join TK_Wrk_Step P on F.wo_code=P.wo_code and F.step_code=P.step_code
+ left join TK_Wrk_Man W on F.wo_code=W.wo_code
+ left join TOrganization G on W.wkshp_code=G.torg_code
left join TMateriel_Info M on F.partnumber=M.partcode
left join TStep S on F.step_code=S.stepcode
left join TUser U on F.lm_user=U.usercode
@@ -1231,7 +1289,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "缁翠慨鏄庣粏鎶ヨ〃");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -1239,7 +1297,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
diff --git a/VueWebCoreApi/DLL/DAL/SystemSettingDAL.cs b/VueWebCoreApi/DLL/DAL/SystemSettingDAL.cs
index f9015be..0d27c5b 100644
--- a/VueWebCoreApi/DLL/DAL/SystemSettingDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/SystemSettingDAL.cs
@@ -40,14 +40,14 @@
if (data.Rows.Count > 0)
{
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犲彲璁剧疆鍔熻兘瑙勫垯!";
+ mes.message = "鏃犲彲璁剧疆鍔熻兘瑙勫垯!";
mes.data = null;
}
}
@@ -55,7 +55,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -92,7 +92,7 @@
where " + search + "";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -100,7 +100,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -145,14 +145,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗙紪鐮佽鍒�", us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -183,14 +183,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗙紪鐮佽鍒�", us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -199,7 +199,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -222,14 +222,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗙紪鐮佽鍒�", us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
@@ -238,7 +238,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -270,14 +270,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
return mes;
@@ -337,7 +337,7 @@
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = list;
}
@@ -345,7 +345,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
diff --git a/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs b/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
index 6fb784c..13bc56c 100644
--- a/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
@@ -7,6 +7,7 @@
using System.Linq;
using System.Threading.Tasks;
using VueWebCoreApi.Models;
+using VueWebCoreApi.Models.ErpOrder;
using VueWebCoreApi.Models.ReportVerify;
using VueWebCoreApi.Models.UpdateReport;
using VueWebCoreApi.Models.WorkData;
@@ -26,7 +27,7 @@
#region[ERP璁㈠崟鏌ヨ]
- public static ToMessage ErpOrderSearch(string erporderstus, string erpordercode, string saleordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
+ public static ToMessage ErpOrderSearch(string erporderstus,string wkshopcode, string erpordercode, string saleordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -36,6 +37,11 @@
{
search += "and A.status=@erporderstus ";
dynamicParams.Add("@erporderstus", erporderstus);
+ }
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and A.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
}
if (erpordercode != "" && erpordercode != null)
{
@@ -96,7 +102,7 @@
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -104,7 +110,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -242,14 +248,14 @@
LogHelper.DbOperateLog(us.usercode, "涓嬭揪", "涓嬭揪浜嗗伐鍗�:" + wo, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "涓嬭揪MES宸ュ崟鎴愬姛!";
+ mes.message = "涓嬭揪MES宸ュ崟鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "涓嬭揪MES宸ュ崟鎴愬姛澶辫触!";
+ mes.message = "涓嬭揪MES宸ュ崟鎴愬姛澶辫触!";
mes.data = null;
}
}
@@ -257,7 +263,108 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[璁㈠崟鎵归噺涓嬭揪]
+ public static ToMessage MarkBatchSaveErpOrder(List<ErpOrderBatch> obj, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+
+ try
+ {
+ list.Clear();
+ string result = "";
+ var groupedModels = obj.GroupBy(m => m.erpordercode);
+ foreach (var group in groupedModels)
+ {
+ string erpordercode = group.Key;
+ int count = 1;
+ foreach (var model in group)
+ {
+ //鑾峰彇褰撳墠鏈�澶у伐鍗曞彿
+ sql = @"select isnull(max(cast(substring(wo_code,charindex('_',wo_code)+1,len(wo_code)-charindex('_',wo_code)) as numeric)),0) as worknumb
+ from TK_Wrk_Man where m_po=@erpordercode";
+ dynamicParams.Add("@erpordercode", model.erpordercode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ int num = Convert.ToInt32(data.Rows[0]["WORKNUMB"].ToString());
+ string wo = model.erpordercode + "_" + (num + count);
+ result += wo.ToString() + ",";
+ //鍐欏叆宸ュ崟琛�
+ sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,sbid,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate,data_sources,isstep) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@sbid,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate,@data_sources,@isstep)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wo_code = wo,
+ wotype = "PO",
+ status = "NEW",
+ wkshp_code = model.wkshopcode,
+ plan_qty = decimal.Parse(model.erpqty), //璁㈠崟鏁伴噺
+ stck_code = model.warehousecode,
+ sbid = model.sbid,
+ materiel_code = model.partcode,
+ sourceid = model.erporderid,
+ m_po = model.erpordercode,
+ username = us.usercode,
+ CreateDate = DateTime.Now.ToString(),
+ saleOrderCode = model.saleordercode,
+ saleOrderDeliveryDate = Convert.ToDateTime(model.saleOrderDeliveryDate),
+ data_sources = "ERP",
+ isstep = "N" //鏄惁鍏宠仈宸ュ簭
+ }
+ });
+
+ //鏇存柊璁㈠崟鐘舵��
+ sql = @"update TKimp_Ewo set status='CREATED',saleOrderDeliveryDate=@saleOrderDeliveryDate,relse_qty=relse_qty+@sumqty where wo=@wo and id=@erporderid";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ wo = model.erpordercode,
+ erporderid = model.erporderid,
+ sumqty = decimal.Parse(model.markqty),
+ saleOrderDeliveryDate = Convert.ToDateTime(model.saleOrderDeliveryDate)
+ }
+ });
+ count++;
+ }
+ }
+
+
+
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "鎵归噺涓嬭揪", "鎵归噺涓嬭揪浜嗗伐鍗�:" + result.TrimEnd(','), us.usertype);
+ mes.code = "200";
+ mes.count = 0;
+ mes.message = "鎵归噺涓嬭揪MES宸ュ崟鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "鎵归噺涓嬭揪MES宸ュ崟鎴愬姛澶辫触!";
+ mes.data = null;
+ }
+
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -279,7 +386,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠璁㈠崟鏈変笅杈炬湭鍏抽棴鐨凪ES宸ュ崟,璁㈠崟涓嶅厑璁稿叧闂�,璇峰厛鍒犻櫎鎴栧叧闂浉鍏冲伐鍗�!";
+ mes.message = "褰撳墠璁㈠崟鏈変笅杈炬湭鍏抽棴鐨凪ES宸ュ崟,璁㈠崟涓嶅厑璁稿叧闂�,璇峰厛鍒犻櫎鎴栧叧闂浉鍏冲伐鍗�!";
mes.data = null;
}
else
@@ -303,14 +410,14 @@
LogHelper.DbOperateLog(us.usercode, "鍏抽棴", "鍏抽棴浜嗚鍗�:" + erpordercode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "璁㈠崟鍏抽棴鎴愬姛!";
+ mes.message = "璁㈠崟鍏抽棴鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁㈠崟鍏抽棴澶辫触!";
+ mes.message = "璁㈠崟鍏抽棴澶辫触!";
mes.data = null;
}
}
@@ -318,7 +425,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -341,7 +448,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠璁㈠崟涓嬫湁宸ュ崟宸叉淳鍙戞垨宸插紑宸ユ垨宸插畬宸�(鍏抽棴),涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠璁㈠崟涓嬫湁宸ュ崟宸叉淳鍙戞垨宸插紑宸ユ垨宸插畬宸�(鍏抽棴),涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -378,14 +485,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗚鍗�:" + erpordercode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "璁㈠崟鍒犻櫎鎴愬姛!";
+ mes.message = "璁㈠崟鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璁㈠崟鍒犻櫎澶辫触!";
+ mes.message = "璁㈠崟鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -393,7 +500,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -403,7 +510,7 @@
#region[MES宸ュ崟鏌ヨ]
- public static ToMessage MesOrderSearch(string mesorderstus, string mesordercode, string sourceorder, string saleordercode, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
+ public static ToMessage MesOrderSearch(string mesorderstus,string wkshopcode, string mesordercode, string sourceorder, string saleordercode, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -413,6 +520,11 @@
{
search += "and A.status=@mesorderstus ";
dynamicParams.Add("@mesorderstus", mesorderstus);
+ }
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and A.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
}
if (mesordercode != "" && mesordercode != null)
{
@@ -478,7 +590,7 @@
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -486,7 +598,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -494,12 +606,17 @@
#endregion
#region[MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ]
- public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder, string saleordercode, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
+ public static ToMessage MesBadOrderSearch(string wkshopcode, string mesordercode, string sourceorder, string saleordercode, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and A.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (mesordercode != "" && mesordercode != null)
{
search += "and A.wo_code like '%'+@mesordercode+'%' ";
@@ -559,7 +676,7 @@
where A.is_delete<>'1' and (S.laborbad_qty+S.materielbad_qty)>0 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -567,7 +684,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -587,14 +704,14 @@
FROM TK_Wrk_Man where wo_code like '%SGPO%'";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data.Rows[0]["numct"].ToString();
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -656,14 +773,14 @@
dir.Add("stepdata", data1);
mes.code = "200";
mes.count = data1.Rows.Count;
- mes.Message = "鏌ヨ鎴愬姛";
+ mes.message = "鏌ヨ鎴愬姛";
mes.data = dir;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -735,14 +852,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "鏂板浜嗗伐鍗�:" + json.wocode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "MES宸ュ崟鏂板缓鎴愬姛!";
+ mes.message = "MES宸ュ崟鏂板缓鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "MES宸ュ崟鏂板缓澶辫触!";
+ mes.message = "MES宸ュ崟鏂板缓澶辫触!";
mes.data = null;
}
}
@@ -811,14 +928,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "淇敼浜嗗伐鍗�:" + json.wocode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔鎴愬姛!";
+ mes.message = "淇敼鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎿嶄綔澶辫触!";
+ mes.message = "淇敼鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -827,7 +944,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -885,7 +1002,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ崟鎵ц涓垨宸插叧闂紝涓嶅厑璁稿垹闄�!";
+ mes.message = "宸ュ崟鎵ц涓垨宸插叧闂紝涓嶅厑璁稿垹闄�!";
mes.data = null;
}
bool aa = DapperHelper.DoTransaction(list);
@@ -895,14 +1012,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "鍒犻櫎浜嗗伐鍗�:" + wocode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍒犻櫎鎴愬姛!";
+ mes.message = "鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触!";
+ mes.message = "鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -910,7 +1027,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -954,14 +1071,14 @@
LogHelper.DbOperateLog(us.usercode, "娲惧彂", "娲惧彂浜嗗伐鍗�:" + string.Join(",", wocodelist), us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "MES宸ュ崟娲惧彂鎴愬姛!";
+ mes.message = "MES宸ュ崟娲惧彂鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "MES宸ュ缓娲惧彂澶辫触!";
+ mes.message = "MES宸ュ缓娲惧彂澶辫触!";
mes.data = null;
}
@@ -970,7 +1087,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -979,7 +1096,7 @@
#region[宸ュ崟鍏抽棴鍒楄〃鏌ヨ]
- public static ToMessage MesOrderClosedSearch(string mesorderstus, string mesordercode, string sourceorder, string saleordercode, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
+ public static ToMessage MesOrderClosedSearch(string mesorderstus,string wkshopcode, string mesordercode, string sourceorder, string saleordercode, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -994,6 +1111,11 @@
{
search += "and A.status<>@mesorderstus ";
dynamicParams.Add("@mesorderstus", "CLOSED");
+ }
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and A.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
}
if (mesordercode != "" && mesordercode != null)
{
@@ -1059,7 +1181,7 @@
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -1067,7 +1189,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1098,14 +1220,14 @@
LogHelper.DbOperateLog(us.usercode, "鍏抽棴", "鍏抽棴浜嗗伐鍗�:" + string.Join(",", wocodelist), us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "宸ュ崟鍏抽棴鎴愬姛!";
+ mes.message = "宸ュ崟鍏抽棴鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ崟鍏抽棴澶辫触!";
+ mes.message = "宸ュ崟鍏抽棴澶辫触!";
mes.data = null;
}
}
@@ -1113,7 +1235,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1122,7 +1244,7 @@
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(鑷埗)]
- public static ToMessage MesOrderStepSearch(string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderStepSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
{
var sql = "";
string search = "";
@@ -1132,6 +1254,11 @@
var total = 0; //鎬绘潯鏁�
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and B.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wocode != "" && wocode != null)
{
string[] arra = wocode.Split(';');
@@ -1170,7 +1297,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭浠诲姟涓哄鍗忓伐搴忎换鍔�,璇峰墠寰�澶栧崗鎿嶄綔椤电鎵ц!";
+ mes.message = "褰撳墠宸ュ簭浠诲姟涓哄鍗忓伐搴忎换鍔�,璇峰墠寰�澶栧崗鎿嶄綔椤电鎵ц!";
mes.data = null;
return mes;
}
@@ -1192,17 +1319,18 @@
dynamicParams.Add("@partspec", partspec);
}
//鏍规嵁鏉′欢鏌ヨ宸ュ崟宸ュ簭浠诲姟(鑷埗宸ュ簭)
- sql = @"select A.id,A.status,A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
+ sql = @"select A.id,A.status,B.wkshp_code,T.torg_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.laborbad_qty,A.materielbad_qty,B.lm_date
from TK_Wrk_Step A
left join TK_Wrk_Man B on A.wo_code=B.wo_code
left join TMateriel_Info M on B.materiel_code=M.partcode
left join TStep S on A.step_code=S.stepcode
+ left join TOrganization T on B.wkshp_code=T.torg_code
where A.status in('ALLO','START') and S.flwtype='Z' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.count = total;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data.ToList();
return mes;
}
@@ -1210,7 +1338,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1218,7 +1346,7 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(澶栧崗)]
- public static ToMessage MesOrderWxStepSearch(string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderWxStepSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
{
var sql = "";
string search = "";
@@ -1228,6 +1356,11 @@
var total = 0; //鎬绘潯鏁�
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and B.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wocode != "" && wocode != null)
{
string[] arra = wocode.Split(';');
@@ -1266,7 +1399,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭浠诲姟涓鸿嚜鍒跺伐搴忎换鍔�,璇峰墠寰�鑷埗鎿嶄綔椤电鎵ц!";
+ mes.message = "褰撳墠宸ュ簭浠诲姟涓鸿嚜鍒跺伐搴忎换鍔�,璇峰墠寰�鑷埗鎿嶄綔椤电鎵ц!";
mes.data = null;
return mes;
}
@@ -1288,7 +1421,7 @@
dynamicParams.Add("@partspec", partspec);
}
//鏍规嵁鏉′欢鏌ヨ宸ュ崟宸ュ簭浠诲姟(鑷埗宸ュ簭)
- sql = @"select A.id,A.status,A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
+ sql = @"select A.id,A.status,B.wkshp_code,T.torg_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,
(select isnull(sum(fqty),0) as fqty from TK_Wrk_OutRecord where wo_code=A.wo_code and step_code=A.step_code and style='F') as fqty,
A.laborbad_qty,A.materielbad_qty,A.plan_startdate,A.plan_enddate,B.lm_date
@@ -1296,11 +1429,12 @@
left join TK_Wrk_Man B on A.wo_code=B.wo_code
left join TMateriel_Info M on B.materiel_code=M.partcode
left join TStep S on A.step_code=S.stepcode
+ left join TOrganization T on B.wkshp_code=T.torg_code
where A.status in('ALLO','START') and S.flwtype='W' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.count = total;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data.ToList();
return mes;
@@ -1309,7 +1443,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1317,7 +1451,7 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(涓嶈壇)]
- public static ToMessage MesOrderNgStepSearch(string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderNgStepSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
{
var sql = "";
string search = "";
@@ -1327,6 +1461,11 @@
var total = 0; //鎬绘潯鏁�
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and B.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wocode != "" && wocode != null)
{
string[] arra = wocode.Split(';');
@@ -1364,7 +1503,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭浠诲姟涓嶅瓨鍦�,鏃犳晥鏉＄爜!";
+ mes.message = "褰撳墠宸ュ簭浠诲姟涓嶅瓨鍦�,鏃犳晥鏉＄爜!";
mes.data = null;
return mes;
}
@@ -1385,17 +1524,18 @@
dynamicParams.Add("@partspec", partspec);
}
//鏍规嵁鏉′欢鏌ヨ宸ュ崟宸ュ簭浠诲姟(鑷埗宸ュ簭)
- sql = @"select A.id,A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isend,
+ sql = @"select A.id,B.wkshp_code,T.torg_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isend,
S.stepcode,S.stepname,S.descr,A.plan_qty,A.good_qty,A.ng_qty,A.laborbad_qty,A.materielbad_qty,B.lm_date
from TK_Wrk_Step A
left join TK_Wrk_Man B on A.wo_code=B.wo_code
left join TMateriel_Info M on B.materiel_code=M.partcode
left join TStep S on A.step_code=S.stepcode
+ left join TOrganization T on B.wkshp_code=T.torg_code
where A.status in('ALLO','START') and A.ng_qty>0 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.count = total;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data.ToList();
return mes;
}
@@ -1403,7 +1543,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1468,7 +1608,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭浠诲姟涓嶅瓨鍦�!";
+ mes.message = "褰撳墠宸ュ簭浠诲姟涓嶅瓨鍦�!";
mes.data = null;
return mes;
}
@@ -1484,14 +1624,14 @@
list.Add("data2", dt);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = list;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犲彲鎵ц鐨勭敓浜т换鍔�,浠诲姟宸插畬鎴愭垨宸插叧闂�!";
+ mes.message = "鏃犲彲鎵ц鐨勭敓浜т换鍔�,浠诲姟宸插畬鎴愭垨宸插叧闂�!";
mes.data = null;
}
}
@@ -1499,7 +1639,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1528,7 +1668,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1588,14 +1728,14 @@
LogHelper.DbOperateLog(us.usercode, "寮�宸�", "寮�宸ヤ簡宸ュ崟:" + mesordercode + "宸ュ簭:" + stepcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1617,7 +1757,7 @@
//{
// mes.code = "300";
// mes.count = 0;
- // mes.Message = "鎿嶄綔澶辫触,褰撳墠鎶ュ伐浜х嚎搴斾负锛�" + da.Rows[0]["NAME"].ToString() + "!";
+ // mes.message = "鎿嶄綔澶辫触,褰撳墠鎶ュ伐浜х嚎搴斾负锛�" + da.Rows[0]["NAME"].ToString() + "!";
// mes.data = null;
// return mes;
//}
@@ -1731,14 +1871,14 @@
LogHelper.DbOperateLog(us.usercode, "鎶ュ伐", "鎶ュ伐浜嗗伐鍗�:" + mesordercode + "宸ュ簭:" + stepcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -1746,7 +1886,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1810,14 +1950,14 @@
LogHelper.DbOperateLog(us.usercode, "澶栧崗鍙戞枡", "澶栧崗鍙戞枡宸ュ崟:" + mesordercode + "宸ュ簭:" + stepcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鍙戞枡鎴愬姛!";
+ mes.message = "鍙戞枡鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍙戞枡澶辫触!";
+ mes.message = "鍙戞枡澶辫触!";
mes.data = null;
}
}
@@ -1825,7 +1965,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1883,7 +2023,7 @@
string wxstring = (string.Join(",", dr.Select(x => x.ToString()).ToArray()));
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触,褰撳墠鏀舵枡澶栧崗渚涙柟涓庡彂鏂欏鍗忎緵搴斿晢涓嶅尮閰�,搴斾负锛氥��" + wxstring + "銆�!";
+ mes.message = "鎿嶄綔澶辫触,褰撳墠鏀舵枡澶栧崗渚涙柟涓庡彂鏂欏鍗忎緵搴斿晢涓嶅尮閰�,搴斾负锛氥��" + wxstring + "銆�!";
mes.data = null;
return mes;
}
@@ -1891,7 +2031,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触,褰撳墠鏀舵枡鏁伴噺+涓嶈壇鏁伴噺,涓嶈兘澶т簬鍙戞枡鏁伴噺:" + da.Rows[0]["FQTY"].ToString() + "!";
+ mes.message = "鎿嶄綔澶辫触,褰撳墠鏀舵枡鏁伴噺+涓嶈壇鏁伴噺,涓嶈兘澶т簬鍙戞枡鏁伴噺:" + da.Rows[0]["FQTY"].ToString() + "!";
mes.data = null;
return mes;
}
@@ -1899,7 +2039,7 @@
//{
// mes.code = "300";
// mes.count = 0;
- // mes.Message = "鎿嶄綔澶辫触,褰撳墠鏀舵枡澶栧崗渚涙柟搴斾负锛�" + da.Rows[0]["NAME"].ToString() + "!";
+ // mes.message = "鎿嶄綔澶辫触,褰撳墠鏀舵枡澶栧崗渚涙柟搴斾负锛�" + da.Rows[0]["NAME"].ToString() + "!";
// mes.data = null;
// return mes;
//}
@@ -1911,7 +2051,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触,褰撳墠鏀舵枡鏁伴噺+涓嶈壇鏁伴噺,涓嶈兘澶т簬寰呮敹鏁伴噺:" + (sum_fqty - sum_sqty) + "!";
+ mes.message = "鎿嶄綔澶辫触,褰撳墠鏀舵枡鏁伴噺+涓嶈壇鏁伴噺,涓嶈兘澶т簬寰呮敹鏁伴噺:" + (sum_fqty - sum_sqty) + "!";
mes.data = null;
return mes;
}
@@ -1989,14 +2129,14 @@
LogHelper.DbOperateLog(us.usercode, "澶栧崗鏀舵枡", "澶栧崗鏀舵枡宸ュ崟:" + mesordercode + "宸ュ簭:" + stepcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏀舵垚鍔�!";
+ mes.message = "鏀舵垚鍔�!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏀舵枡澶辫触!";
+ mes.message = "鏀舵枡澶辫触!";
mes.data = null;
}
}
@@ -2004,7 +2144,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2259,14 +2399,14 @@
LogHelper.DbOperateLog(us.usercode, "涓嶈壇澶勭悊", "宸ュ崟:" + json.Data.Rows[0]["WO_CODE"].ToString() + "宸ュ簭:" + json.Data.Rows[0]["STEP_CODE"].ToString(), us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -2274,7 +2414,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2284,12 +2424,17 @@
#region[鐢熶骇鎵ц,鎶ュ伐璋冩暣鏁版嵁鏌ヨ鎺ュ彛]
- public static ToMessage MesOrderStepVerifySearch(string wo_code, string partnumber, string partname, string partspec, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderStepVerifySearch(string wkshopcode, string wo_code, string partnumber, string partname, string partspec, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and AA.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wo_code != "" && wo_code != null)
{
search += "and AA.wo_code like '%'+@wo_code+'%' ";
@@ -2371,7 +2516,7 @@
) as AA where" + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -2379,7 +2524,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2410,7 +2555,7 @@
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
@@ -2430,7 +2575,7 @@
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
}
@@ -2438,7 +2583,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -2505,7 +2650,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠棣栭亾宸ュ簭淇敼鎶ュ伐鎬绘暟閲忥細銆�" + updatereportsumqty + "銆戜笉鑳藉ぇ浜庡伐鍗曚换鍔℃暟閲忥細銆�" + json[0].task_qty.ToString() + "銆�!";
+ mes.message = "褰撳墠棣栭亾宸ュ簭淇敼鎶ュ伐鎬绘暟閲忥細銆�" + updatereportsumqty + "銆戜笉鑳藉ぇ浜庡伐鍗曚换鍔℃暟閲忥細銆�" + json[0].task_qty.ToString() + "銆�!";
mes.data = null;
return mes;
}
@@ -2533,7 +2678,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠棣栭亾宸ュ簭淇敼鎶ュ伐鎬诲悎鏍兼暟閲忥細銆�" + (notthis_reportqty + this_reportqty) + "銆戜笉鑳藉皬浜庝笅閬撹嚜鍒跺伐搴忔姤宸ユ�绘暟閲忥細銆�" + last_updatereportsumqty + "銆�!";
+ mes.message = "褰撳墠棣栭亾宸ュ簭淇敼鎶ュ伐鎬诲悎鏍兼暟閲忥細銆�" + (notthis_reportqty + this_reportqty) + "銆戜笉鑳藉皬浜庝笅閬撹嚜鍒跺伐搴忔姤宸ユ�绘暟閲忥細銆�" + last_updatereportsumqty + "銆�!";
mes.data = null;
return mes;
}
@@ -2556,7 +2701,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠棣栭亾宸ュ簭淇敼鎶ュ伐鎬诲悎鏍兼暟閲忥細銆�" + (notthis_reportqty + this_reportqty) + "銆戜笉鑳藉皬浜庝笅閬撳鍗忓伐搴忓彂鏂欐�绘暟閲忥細銆�" + last_reportqty + "銆�!";
+ mes.message = "褰撳墠棣栭亾宸ュ簭淇敼鎶ュ伐鎬诲悎鏍兼暟閲忥細銆�" + (notthis_reportqty + this_reportqty) + "銆戜笉鑳藉皬浜庝笅閬撳鍗忓伐搴忓彂鏂欐�绘暟閲忥細銆�" + last_reportqty + "銆�!";
mes.data = null;
return mes;
}
@@ -2605,7 +2750,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鏈亾宸ュ簭淇敼鎶ュ伐鎬绘暟閲忥細銆�" + updatereportsumqty + "銆戜笉鑳藉ぇ浜庝笂閬撳伐搴忔姤宸ユ�诲悎鏍兼暟閲忥細銆�" + last_reportqty + "銆�!";
+ mes.message = "褰撳墠鏈亾宸ュ簭淇敼鎶ュ伐鎬绘暟閲忥細銆�" + updatereportsumqty + "銆戜笉鑳藉ぇ浜庝笂閬撳伐搴忔姤宸ユ�诲悎鏍兼暟閲忥細銆�" + last_reportqty + "銆�!";
mes.data = null;
return mes;
}
@@ -2628,7 +2773,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鏈亾宸ュ簭淇敼鎶ュ伐鎬绘暟閲忥細銆�" + updatereportsumqty + "銆戜笉鑳藉ぇ浜庝笂閬撳伐搴忔敹鏂欐�诲悎鏍兼暟閲忥細銆�" + last_reportqty + "銆�!";
+ mes.message = "褰撳墠鏈亾宸ュ簭淇敼鎶ュ伐鎬绘暟閲忥細銆�" + updatereportsumqty + "銆戜笉鑳藉ぇ浜庝笂閬撳伐搴忔敹鏂欐�诲悎鏍兼暟閲忥細銆�" + last_reportqty + "銆�!";
mes.data = null;
return mes;
}
@@ -2675,7 +2820,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭淇敼鎶ュ伐鎬绘暟閲忥細銆�" + updatereportsumqty + "銆戜笉鑳藉ぇ浜庝笂閬撳伐搴忔姤宸ユ�诲悎鏍兼暟閲忥細銆�" + last_reportqty + "銆�!";
+ mes.message = "褰撳墠宸ュ簭淇敼鎶ュ伐鎬绘暟閲忥細銆�" + updatereportsumqty + "銆戜笉鑳藉ぇ浜庝笂閬撳伐搴忔姤宸ユ�诲悎鏍兼暟閲忥細銆�" + last_reportqty + "銆�!";
mes.data = null;
return mes;
}
@@ -2698,7 +2843,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭淇敼鎶ュ伐鎬绘暟閲忥細銆�" + updatereportsumqty + "銆戜笉鑳藉ぇ浜庝笂閬撳伐搴忔敹鏂欐�诲悎鏍兼暟閲忥細銆�" + last_reportqty + "銆�!";
+ mes.message = "褰撳墠宸ュ簭淇敼鎶ュ伐鎬绘暟閲忥細銆�" + updatereportsumqty + "銆戜笉鑳藉ぇ浜庝笂閬撳伐搴忔敹鏂欐�诲悎鏍兼暟閲忥細銆�" + last_reportqty + "銆�!";
mes.data = null;
return mes;
}
@@ -2728,7 +2873,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭淇敼鎶ュ伐鎬诲悎鏍兼暟閲忥細銆�" + (notthis_reportqty + this_reportqty) + "銆戜笉鑳藉皬浜庝笅閬撳伐搴忔姤宸ユ�绘暟閲忥細銆�" + last_updatereportsumqty + "銆�!";
+ mes.message = "褰撳墠宸ュ簭淇敼鎶ュ伐鎬诲悎鏍兼暟閲忥細銆�" + (notthis_reportqty + this_reportqty) + "銆戜笉鑳藉皬浜庝笅閬撳伐搴忔姤宸ユ�绘暟閲忥細銆�" + last_updatereportsumqty + "銆�!";
mes.data = null;
return mes;
}
@@ -2751,7 +2896,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭淇敼鎶ュ伐鎬绘暟閲忥細銆�" + (notthis_reportqty + this_reportqty) + "銆戜笉鑳藉ぇ浜庝笅閬撳伐搴忓彂鏂欐�绘暟閲忥細銆�" + last_reportqty + "銆�!";
+ mes.message = "褰撳墠宸ュ簭淇敼鎶ュ伐鎬绘暟閲忥細銆�" + (notthis_reportqty + this_reportqty) + "銆戜笉鑳藉ぇ浜庝笅閬撳伐搴忓彂鏂欐�绘暟閲忥細銆�" + last_reportqty + "銆�!";
mes.data = null;
return mes;
}
@@ -2907,7 +3052,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠棣栭亾宸ュ簭瀵瑰簲渚涘簲鍟嗘敹鏂欐�绘暟閲忥細銆�" + updatereportsumqty + "銆戜笉鑳藉ぇ浜庡彂鏂欐暟閲忥細銆�" + decimal.Parse(dt_0.Rows[0]["fqty"].ToString()) + "銆�!";
+ mes.message = "褰撳墠棣栭亾宸ュ簭瀵瑰簲渚涘簲鍟嗘敹鏂欐�绘暟閲忥細銆�" + updatereportsumqty + "銆戜笉鑳藉ぇ浜庡彂鏂欐暟閲忥細銆�" + decimal.Parse(dt_0.Rows[0]["fqty"].ToString()) + "銆�!";
mes.data = null;
return mes;
}
@@ -2935,7 +3080,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠棣栭亾宸ュ簭鏀舵枡鏁伴噺锛氥��" + (notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) + "銆戜笉鑳藉皬浜庝笅閬撹嚜鍒跺伐搴忔姤宸ユ�绘暟閲忥細銆�" + last_updatereportsumqty + "銆�!";
+ mes.message = "褰撳墠棣栭亾宸ュ簭鏀舵枡鏁伴噺锛氥��" + (notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) + "銆戜笉鑳藉皬浜庝笅閬撹嚜鍒跺伐搴忔姤宸ユ�绘暟閲忥細銆�" + last_updatereportsumqty + "銆�!";
mes.data = null;
return mes;
}
@@ -2958,7 +3103,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠棣栭亾宸ュ簭鏀舵枡鎬绘暟閲忥細銆�" + (notthis_reportqty + this_reportqty) + "銆戜笉鑳藉皬浜庝笅閬撳鍗忓伐搴忓彂鏂欐�绘暟閲忥細銆�" + last_reportqty + "銆�!";
+ mes.message = "褰撳墠棣栭亾宸ュ簭鏀舵枡鎬绘暟閲忥細銆�" + (notthis_reportqty + this_reportqty) + "銆戜笉鑳藉皬浜庝笅閬撳鍗忓伐搴忓彂鏂欐�绘暟閲忥細銆�" + last_reportqty + "銆�!";
mes.data = null;
return mes;
}
@@ -2988,7 +3133,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭渚涘簲鍟嗘敹鏂欐�绘暟閲忥細銆�" + updatereportsumqty + "銆戜笉鑳藉ぇ浜庡伐搴忎緵搴斿晢鍙戞枡鎬绘暟閲忥細銆�" + decimal.Parse(dt_0.Rows[0]["fqty"].ToString()) + "銆�!";
+ mes.message = "褰撳墠宸ュ簭渚涘簲鍟嗘敹鏂欐�绘暟閲忥細銆�" + updatereportsumqty + "銆戜笉鑳藉ぇ浜庡伐搴忎緵搴斿晢鍙戞枡鎬绘暟閲忥細銆�" + decimal.Parse(dt_0.Rows[0]["fqty"].ToString()) + "銆�!";
mes.data = null;
return mes;
}
@@ -3015,7 +3160,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠棣栭亾宸ュ簭瀵瑰簲渚涘簲鍟嗘敹鏂欐�绘暟閲忥細銆�" + updatereportsumqty + "銆戜笉鑳藉ぇ浜庡彂鏂欐暟閲忥細銆�" + decimal.Parse(dt_0.Rows[0]["fqty"].ToString()) + "銆�!";
+ mes.message = "褰撳墠棣栭亾宸ュ簭瀵瑰簲渚涘簲鍟嗘敹鏂欐�绘暟閲忥細銆�" + updatereportsumqty + "銆戜笉鑳藉ぇ浜庡彂鏂欐暟閲忥細銆�" + decimal.Parse(dt_0.Rows[0]["fqty"].ToString()) + "銆�!";
mes.data = null;
return mes;
}
@@ -3043,7 +3188,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠棣栭亾宸ュ簭鏀舵枡鏁伴噺锛氥��" + (notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) + "銆戜笉鑳藉皬浜庝笅閬撹嚜鍒跺伐搴忔姤宸ユ�绘暟閲忥細銆�" + last_updatereportsumqty + "銆�!";
+ mes.message = "褰撳墠棣栭亾宸ュ簭鏀舵枡鏁伴噺锛氥��" + (notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) + "銆戜笉鑳藉皬浜庝笅閬撹嚜鍒跺伐搴忔姤宸ユ�绘暟閲忥細銆�" + last_updatereportsumqty + "銆�!";
mes.data = null;
return mes;
}
@@ -3066,7 +3211,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠棣栭亾宸ュ簭鏀舵枡鎬绘暟閲忥細銆�" + (notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) + "銆戜笉鑳藉皬浜庝笅閬撳鍗忓伐搴忓彂鏂欐�绘暟閲忥細銆�" + last_reportqty + "銆�!";
+ mes.message = "褰撳墠棣栭亾宸ュ簭鏀舵枡鎬绘暟閲忥細銆�" + (notthis_reportqty + this_reportqty + decimal.Parse(dt_c.Rows[0]["sqty"].ToString())) + "銆戜笉鑳藉皬浜庝笅閬撳鍗忓伐搴忓彂鏂欐�绘暟閲忥細銆�" + last_reportqty + "銆�!";
mes.data = null;
return mes;
}
@@ -3185,14 +3330,14 @@
LogHelper.DbOperateLog(us.usercode, "鎶ュ伐璋冩暣", "宸ュ崟:" + json[0].wo_code + "宸ュ簭:" + json[0].step_code, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "淇敼鎶ュ伐鎴愬姛!";
+ mes.message = "淇敼鎶ュ伐鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼鎶ュ伐澶辫触!";
+ mes.message = "淇敼鎶ュ伐澶辫触!";
mes.data = null;
}
}
@@ -3200,7 +3345,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3210,12 +3355,17 @@
#region[鐢熶骇鎵ц,鎶ュ伐瀹℃牳鍒楄〃鏁版嵁鏌ヨ鎺ュ彛]
- public static ToMessage MesOrderStepReportVerifySearch(string wo_code, string partnumber, string partname, string partspec, string stepname, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderStepReportVerifySearch(string wkshopcode, string wo_code, string partnumber, string partname, string partspec, string stepname, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ if (wkshopcode != "" && wkshopcode != null)
+ {
+ search += "and AA.wkshp_code=@wkshopcode ";
+ dynamicParams.Add("@wkshopcode", wkshopcode);
+ }
if (wo_code != "" && wo_code != null)
{
search += "and AA.wo_code like '%'+@wo_code+'%' ";
@@ -3302,7 +3452,7 @@
) as AA where" + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -3310,7 +3460,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -3351,14 +3501,14 @@
LogHelper.DbOperateLog(us.usercode, "鎶ュ伐瀹℃牳", "澶栧崗鏀舵枡璁板綍id:" + string.Join(",", json.wdata), us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "瀹℃牳鎴愬姛!";
+ mes.message = "瀹℃牳鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "瀹℃牳澶辫触!";
+ mes.message = "瀹℃牳澶辫触!";
mes.data = null;
}
}
@@ -3366,7 +3516,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
diff --git a/VueWebCoreApi/Models/ErpOrder/ErpOrderBatch.cs b/VueWebCoreApi/Models/ErpOrder/ErpOrderBatch.cs
new file mode 100644
index 0000000..08950de
--- /dev/null
+++ b/VueWebCoreApi/Models/ErpOrder/ErpOrderBatch.cs
@@ -0,0 +1,59 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace VueWebCoreApi.Models.ErpOrder
+{
+ public class ErpOrderBatch
+ {
+ /// <summary>
+ /// 璁㈠崟id
+ /// </summary>
+ public string erporderid { get; set; }
+ /// <summary>
+ /// 璁㈠崟鏄庣粏id
+ /// </summary>
+ public string sbid { get; set; }
+ /// <summary>
+ /// 璁㈠崟缂栧彿
+ /// </summary>
+ public string erpordercode { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗曠紪鍙�
+ /// </summary>
+ public string saleordercode { get; set; }
+ /// <summary>
+ /// 浜у搧缂栫爜
+ /// </summary>
+ public string partcode { get; set; }
+ /// <summary>
+ /// 杞﹂棿缂栫爜
+ /// </summary>
+ public string wkshopcode { get; set; }
+ /// <summary>
+ /// 浠撳簱缂栫爜
+ /// </summary>
+ public string warehousecode { get; set; }
+ /// <summary>
+ /// 璁㈠崟鏁伴噺
+ /// </summary>
+ public string erpqty { get; set; }
+ /// <summary>
+ /// 涓嬪崟鏁伴噺
+ /// </summary>
+ public string markqty { get; set; }
+ /// <summary>
+ /// 涓嬪崟鍗曟暟
+ /// </summary>
+ public string ordernum { get; set; }
+ /// <summary>
+ /// 宸蹭笅鍗曟暟閲�
+ /// </summary>
+ public string relse_qty { get; set; }
+ /// <summary>
+ /// 浜や粯鏃堕棿
+ /// </summary>
+ public string saleOrderDeliveryDate { get; set; }
+ }
+}
diff --git a/VueWebCoreApi/Quartz/QuartzNETExtension.cs b/VueWebCoreApi/Quartz/QuartzNETExtension.cs
index 977eb5c..51e3bdf 100644
--- a/VueWebCoreApi/Quartz/QuartzNETExtension.cs
+++ b/VueWebCoreApi/Quartz/QuartzNETExtension.cs
@@ -126,7 +126,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = ex.Message + ex.StackTrace;
+ mes.message = ex.Message + ex.StackTrace;
mes.data = null;
FileQuartz.WriteStartLog("鑾峰彇浣滀笟寮傚父锛�" + ex.Message + ex.StackTrace);
}
@@ -216,14 +216,14 @@
FileQuartz.WriteJobAction(JobAction.鏂板, taskOptions.TaskName, taskOptions.GroupName);
mes.code = "200";
mes.count = 0;
- mes.Message ="鎵ц鎴愬姛锛�";
+ mes.message ="鎵ц鎴愬姛锛�";
mes.data = null;
}
catch (Exception ex)
{
mes.code = "300";
mes.count = 0;
- mes.Message = ex.Message;
+ mes.message = ex.Message;
mes.data = null;
return new { status = false, msg = ex.Message };
}
@@ -440,7 +440,7 @@
}
mes.code = "200";
mes.count = 0;
- mes.Message = $"浣滀笟{action.ToString()}鎴愬姛";
+ mes.message = $"浣滀笟{action.ToString()}鎴愬姛";
mes.data = null;
return result ?? mes;
//return result ?? new { status = true, msg = $"浣滀笟{action.ToString()}鎴愬姛" };
@@ -450,7 +450,7 @@
errorMsg = ex.Message;
mes.code = "300";
mes.count = 0;
- mes.Message = errorMsg;
+ mes.message = errorMsg;
mes.data = null;
return mes;
//return new { status = false, msg = ex.Message };
diff --git a/VueWebCoreApi/Startup.cs b/VueWebCoreApi/Startup.cs
index 748a1a7..0248770 100644
--- a/VueWebCoreApi/Startup.cs
+++ b/VueWebCoreApi/Startup.cs
@@ -17,6 +17,7 @@
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.OpenApi.Models;
+using Newtonsoft.Json.Serialization;
using Quartz;
using Quartz.Impl;
using Quartz.Spi;
@@ -55,6 +56,13 @@
{
op.SerializerSettings.ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver();
op.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
+ // 返回数据首字母不小写，CamelCasePropertyNamesContractResolver是小写
+ op.SerializerSettings.ContractResolver = new DefaultContractResolver();
+ });
+ //解决文档中首字母被小写的问题
+ services.AddControllers().AddJsonOptions(config =>
+ {
+ config.JsonSerializerOptions.PropertyNamingPolicy = null;
});
#region Swagger 第二种方式
services.AddSwaggerGen(c =>
@@ -75,6 +83,7 @@
});
#endregion
+
// 设置配置
AppSetting.SetAppSetting(Configuration.GetSection("ConnectionStrings"));
//log4net配置
diff --git a/VueWebCoreApi/Tools/AppLableBarCode.cs b/VueWebCoreApi/Tools/AppLableBarCode.cs
index 8c2e403..874f1c9 100644
--- a/VueWebCoreApi/Tools/AppLableBarCode.cs
+++ b/VueWebCoreApi/Tools/AppLableBarCode.cs
@@ -77,14 +77,14 @@
if (stf)
{
mes.code = "200";
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = lab;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶辫触!";
+ mes.message = "澶辫触!";
mes.data = null;
}
}
@@ -93,7 +93,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏈缃紪鐮佽鍒�,鐢熸垚鍗曞彿澶辫触,璇疯缃紪鐮佷负銆�" + rightcode + "銆戠殑缂栫爜瑙勫垯!";
+ mes.message = "鏈缃紪鐮佽鍒�,鐢熸垚鍗曞彿澶辫触,璇疯缃紪鐮佷负銆�" + rightcode + "銆戠殑缂栫爜瑙勫垯!";
mes.data = null;
}
}
@@ -101,7 +101,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
diff --git a/VueWebCoreApi/Tools/ChannelActionFilterAttribute.cs b/VueWebCoreApi/Tools/ChannelActionFilterAttribute.cs
index 38e208c..539a592 100644
--- a/VueWebCoreApi/Tools/ChannelActionFilterAttribute.cs
+++ b/VueWebCoreApi/Tools/ChannelActionFilterAttribute.cs
@@ -38,7 +38,7 @@
{
mes.code = "303";
mes.count = 0;
- mes.Message = "token宸茶繃鏈�,璇烽噸鏂扮櫥褰�!";
+ mes.message = "token宸茶繃鏈�,璇烽噸鏂扮櫥褰�!";
context.Result = new JsonResult(mes);
}
else
@@ -51,7 +51,7 @@
{
mes.code = "303";
mes.count = 0;
- mes.Message = "鐧诲綍宸茶秴鏃�,璇烽噸鏂扮櫥褰�!";
+ mes.message = "鐧诲綍宸茶秴鏃�,璇烽噸鏂扮櫥褰�!";
context.Result = new JsonResult(mes);
}
// 灏嗚繃婊ゅ櫒涓殑鍊煎瓨鍌ㄥ湪HttpContext.Items涓紝浠ヤ究鍦ㄦ帶鍒跺櫒涓闂�
@@ -62,7 +62,7 @@
{
LogHelper.WriteLog(e);
mes.code = "303";
- mes.Message = e.Message;
+ mes.message = e.Message;
context.Result = new JsonResult(mes);
}
}
diff --git a/VueWebCoreApi/Tools/ChannelActionFilterAttributeApp.cs b/VueWebCoreApi/Tools/ChannelActionFilterAttributeApp.cs
index 7a9681a..4ec6258 100644
--- a/VueWebCoreApi/Tools/ChannelActionFilterAttributeApp.cs
+++ b/VueWebCoreApi/Tools/ChannelActionFilterAttributeApp.cs
@@ -23,14 +23,14 @@
{
mes.code = "303";
- mes.Message = "鐧诲綍宸茶秴鏃�,璇烽噸鏂扮櫥褰�!";
+ mes.message = "鐧诲綍宸茶秴鏃�,璇烽噸鏂扮櫥褰�!";
context.Result = new JsonResult(mes);
}
catch (Exception)
{
mes.code = "303";
- mes.Message = "鐧诲綍宸茶秴鏃�,璇烽噸鏂扮櫥褰�!";
+ mes.message = "鐧诲綍宸茶秴鏃�,璇烽噸鏂扮櫥褰�!";
context.Result = new JsonResult(mes);
}
}
diff --git a/VueWebCoreApi/Tools/DapperHelper.cs b/VueWebCoreApi/Tools/DapperHelper.cs
index 695fe58..ea6d910 100644
--- a/VueWebCoreApi/Tools/DapperHelper.cs
+++ b/VueWebCoreApi/Tools/DapperHelper.cs
@@ -185,9 +185,9 @@
StringBuilder sb = new StringBuilder();
sb.AppendFormat("SELECT COUNT(1) FROM ({0}) AS Result;", sql);
sb.AppendFormat(@"SELECT *
- FROM(SELECT *,ROW_NUMBER() OVER(ORDER BY {1} {2}) AS RowNum
+ FROM(SELECT *,ROW_NUMBER() OVER(ORDER BY {1} {2}) AS rowNum
FROM ({0}) AS Temp) AS Result
- WHERE RowNum >= {3} AND RowNum <= {4}
+ WHERE rowNum >= {3} AND rowNum <= {4}
ORDER BY {1} {2}", sql, orderBy, sort, pageIndex, pageSize); //skip, pageIndex * pageSize
using (IDbConnection conn = sqlConnection())
@@ -236,9 +236,9 @@
StringBuilder sb = new StringBuilder();
sb.AppendFormat("{0} SELECT COUNT(1) FROM ({1}) AS Result;",withsql, sql);
sb.AppendFormat(@"{0} SELECT *
- FROM(SELECT *,ROW_NUMBER() OVER(ORDER BY {2} {3}) AS RowNum
+ FROM(SELECT *,ROW_NUMBER() OVER(ORDER BY {2} {3}) AS rowNum
FROM ({1}) AS Temp) AS Result
- WHERE RowNum >= {4} AND RowNum <= {5}
+ WHERE rowNum >= {4} AND rowNum <= {5}
ORDER BY {2} {3}",withsql, sql, orderBy, sort, pageIndex, pageSize); //skip, pageIndex * pageSize
using (IDbConnection conn = sqlConnection())
@@ -320,11 +320,11 @@
JOIN CTE c ON o.{torg_code} = c.{parent_id}
)
SELECT * FROM(
- SELECT ROW_NUMBER() OVER (ORDER BY {prop} {order}) AS RowNum,*
+ SELECT ROW_NUMBER() OVER (ORDER BY {prop} {order}) AS rowNum,*
FROM (
SELECT DISTINCT *
from CTE
- ) AS subquery) AS AA WHERE RowNum >= {startRow} AND RowNum <={endRow}";
+ ) AS subquery) AS AA WHERE rowNum >= {startRow} AND rowNum <={endRow}";
total = totalRecords;
return conn.Query<T>(query, parm);
}
diff --git a/VueWebCoreApi/Tools/ExcelList.cs b/VueWebCoreApi/Tools/ExcelList.cs
index 081886c..a8556a7 100644
--- a/VueWebCoreApi/Tools/ExcelList.cs
+++ b/VueWebCoreApi/Tools/ExcelList.cs
@@ -18,8 +18,8 @@
new ScoreReport("3","浜哄憳绠＄悊"),
new ScoreReport("4","瑙掕壊绠＄悊"),
new ScoreReport("5","寰�鏉ュ崟浣�"),
- new ScoreReport("6","浠撳簱璁剧疆"),
- new ScoreReport("7","搴撲綅璁剧疆"),
+ //new ScoreReport("6","浠撳簱璁剧疆"),
+ //new ScoreReport("7","搴撲綅璁剧疆"),
new ScoreReport("8","瀛樿揣妗ｆ"),
new ScoreReport("9","璁惧娓呭崟"),
//new ScoreReport("10","璁惧鐐规椤圭洰"),
diff --git a/VueWebCoreApi/Tools/ImportExcel.cs b/VueWebCoreApi/Tools/ImportExcel.cs
index 50f3967..ef19619 100644
--- a/VueWebCoreApi/Tools/ImportExcel.cs
+++ b/VueWebCoreApi/Tools/ImportExcel.cs
@@ -1148,7 +1148,7 @@
{
mes.code = "300";
- mes.Message = "鏂囦欢鏁版嵁涓嶈兘涓虹┖锛�";
+ mes.message = "鏂囦欢鏁版嵁涓嶈兘涓虹┖锛�";
}
}
@@ -1211,7 +1211,7 @@
if (table.Rows.Count <= 0)
{
mes.code = "300";
- mes.Message = "涓诲瓙琛ㄦ枃浠朵腑鏁版嵁涓嶈兘涓虹┖锛�";
+ mes.message = "涓诲瓙琛ㄦ枃浠朵腑鏁版嵁涓嶈兘涓虹┖锛�";
}
}
}
diff --git a/VueWebCoreApi/Tools/JwtTools.cs b/VueWebCoreApi/Tools/JwtTools.cs
index 37950a4..6320443 100644
--- a/VueWebCoreApi/Tools/JwtTools.cs
+++ b/VueWebCoreApi/Tools/JwtTools.cs
@@ -32,7 +32,7 @@
//娣诲姞涓�涓狫wt鏃舵晥涓�
payLoad.Add("timeout", DateTime.Now.AddSeconds(time));
mes.code = "200";
- mes.Message = "鑾峰彇token鎴愬姛!";
+ mes.message = "鑾峰彇token鎴愬姛!";
mes.data= encoder.Encode(payLoad, key);
return mes;
}
diff --git a/VueWebCoreApi/Tools/ScanStartReport.cs b/VueWebCoreApi/Tools/ScanStartReport.cs
index c549b08..779e32b 100644
--- a/VueWebCoreApi/Tools/ScanStartReport.cs
+++ b/VueWebCoreApi/Tools/ScanStartReport.cs
@@ -40,7 +40,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ崟宸插叧闂�,涓嶅厑璁稿紑鎶ュ伐鎿嶄綔!";
+ mes.message = "褰撳墠宸ュ崟宸插叧闂�,涓嶅厑璁稿紑鎶ュ伐鎿嶄綔!";
mes.data = null;
return mes;
}
@@ -99,7 +99,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭浠诲姟涓嶅瓨鍦�!";
+ mes.message = "褰撳墠宸ュ簭浠诲姟涓嶅瓨鍦�!";
mes.data = null;
return mes;
}
@@ -125,7 +125,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭鏃犲彲鎶ュ伐鏁伴噺!";
+ mes.message = "褰撳墠宸ュ簭鏃犲彲鎶ュ伐鏁伴噺!";
mes.data = null;
return mes;
}
@@ -136,7 +136,7 @@
rt.reportqty = good_qty + ng_qty + laborbad_qty+ materielbad_qty; //宸叉姤鏁伴噺=鎶ュ伐鏁伴噺+涓嶈壇鏁伴噺+宸ュ簾鏁伴噺+鏂欏簾鏁伴噺
mes.code = "200";
mes.count = 1;
- mes.Message = "鏌ユ壘鎴愬姛!";
+ mes.message = "鏌ユ壘鎴愬姛!";
mes.data = rt;
}
}
@@ -147,7 +147,7 @@
rt.reportqty = 0; //宸叉姤鏁伴噺
mes.code = "200";
mes.count = 1;
- mes.Message = "鏌ユ壘鎴愬姛!";
+ mes.message = "鏌ユ壘鎴愬姛!";
mes.data = rt;
}
@@ -190,7 +190,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + "鏃犲彲鎶ユ暟閲�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + "鏃犲彲鎶ユ暟閲�!";
mes.data = null;
return mes;
}
@@ -200,7 +200,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鍚堟牸浜у嚭涓�0,鏈亾涓嶅厑璁告姤宸�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鍚堟牸浜у嚭涓�0,鏈亾涓嶅厑璁告姤宸�!";
mes.data = null;
return mes;
}
@@ -209,7 +209,7 @@
rt.reportqty = good_qty + ng_qty + laborbad_qty+ materielbad_qty;//宸叉姤鏁伴噺=鏈亾鎶ュ伐鎬绘暟閲�+鏈亾鎶ュ伐鎬讳笉鑹�+鏈亾宸ュ簾鎬绘暟+鏈亾鏂欏簾鎬绘暟
mes.code = "200";
mes.count = 1;
- mes.Message = "寮圭獥鎶ュ伐鐣岄潰!";
+ mes.message = "寮圭獥鎶ュ伐鐣岄潰!";
mes.data = rt;
}
}
@@ -217,7 +217,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鏈姤宸�,鏈亾涓嶅厑璁告姤宸�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鏈姤宸�,鏈亾涓嶅厑璁告姤宸�!";
mes.data = null;
return mes;
}
@@ -242,7 +242,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + "鏃犲彲鎶ユ暟閲�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + "鏃犲彲鎶ユ暟閲�!";
mes.data = null;
return mes;
}
@@ -252,7 +252,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鍚堟牸鏀舵枡涓�0,鏈亾涓嶅厑璁稿紑鎶ュ伐!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鍚堟牸鏀舵枡涓�0,鏈亾涓嶅厑璁稿紑鎶ュ伐!";
mes.data = null;
return mes;
}
@@ -261,7 +261,7 @@
rt.reportqty = good_qty + ng_qty + laborbad_qty+materielbad_qty; //宸叉姤鏁伴噺=鏈亾鎶ュ伐鎬绘暟閲�+鏈亾鎶ュ伐鎬讳笉鑹�+鏈亾鎬诲伐搴熸暟+鏈亾鎬绘枡搴熸暟
mes.code = "200";
mes.count = 1;
- mes.Message = "鏌ユ壘鎴愬姛!";
+ mes.message = "鏌ユ壘鎴愬姛!";
mes.data = rt;
}
}
@@ -269,7 +269,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鏈敹鏂�,鏈亾涓嶅厑璁稿紑鎶ュ伐,璇峰墠寰�澶栧崗鎿嶄綔椤垫墽琛�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鏈敹鏂�,鏈亾涓嶅厑璁稿紑鎶ュ伐,璇峰墠寰�澶栧崗鎿嶄綔椤垫墽琛�!";
mes.data = null;
return mes;
}
@@ -292,7 +292,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鍚堟牸浜у嚭涓�0,鏈亾涓嶅厑璁稿紑鎶ュ伐!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鍚堟牸浜у嚭涓�0,鏈亾涓嶅厑璁稿紑鎶ュ伐!";
mes.data = null;
return mes;
}
@@ -301,14 +301,14 @@
rt.reportqty = 0; //宸叉姤鏁伴噺
mes.code = "200";
mes.count = 1;
- mes.Message = "鏌ユ壘鎴愬姛!";
+ mes.message = "鏌ユ壘鎴愬姛!";
mes.data = rt;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鏈姤宸�,鏈亾涓嶅厑璁告姤宸�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鏈姤宸�,鏈亾涓嶅厑璁告姤宸�!";
mes.data = null;
return mes;
}
@@ -328,7 +328,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鍚堟牸鏀舵枡涓�0,鏈亾涓嶅厑璁稿紑鎶ュ伐!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鍚堟牸鏀舵枡涓�0,鏈亾涓嶅厑璁稿紑鎶ュ伐!";
mes.data = null;
return mes;
}
@@ -337,14 +337,14 @@
rt.reportqty = 0; //宸叉姤鏁伴噺
mes.code = "200";
mes.count = 1;
- mes.Message = "鏌ユ壘鎴愬姛!";
+ mes.message = "鏌ユ壘鎴愬姛!";
mes.data = rt;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鏈敹鏂�,鏈亾涓嶅厑璁告姤宸�,璇峰墠寰�澶栧崗鎿嶄綔椤垫墽琛�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鏈敹鏂�,鏈亾涓嶅厑璁告姤宸�,璇峰墠寰�澶栧崗鎿嶄綔椤垫墽琛�!";
mes.data = null;
return mes;
}
@@ -355,7 +355,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏈壘鍒板綋鍓嶅伐搴忕殑涓婇亾宸ュ簭淇℃伅,璇疯仈绯荤鐞嗗憳鏍稿疄!";
+ mes.message = "鏈壘鍒板綋鍓嶅伐搴忕殑涓婇亾宸ュ簭淇℃伅,璇疯仈绯荤鐞嗗憳鏍稿疄!";
mes.data = null;
return mes;
}
@@ -365,7 +365,7 @@
case "W": //澶栧崗宸ュ簭
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ崟宸ュ簭浠诲姟涓哄鍗�,璇峰墠寰�澶栧崗鎿嶄綔鏍囩椤垫搷浣�!";
+ mes.message = "褰撳墠宸ュ崟宸ュ簭浠诲姟涓哄鍗�,璇峰墠寰�澶栧崗鎿嶄綔鏍囩椤垫搷浣�!";
mes.data = null;
break;
default: //鑷埗+澶栧崗宸ュ簭
@@ -377,7 +377,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
return mes;
}
@@ -413,7 +413,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ崟宸插叧闂�,涓嶅厑璁稿紑鎶ュ伐鎿嶄綔!";
+ mes.message = "褰撳墠宸ュ崟宸插叧闂�,涓嶅厑璁稿紑鎶ュ伐鎿嶄綔!";
mes.data = null;
return mes;
}
@@ -471,7 +471,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鎵爜宸ュ簭浠诲姟涓嶅瓨鍦�!";
+ mes.message = "褰撳墠鎵爜宸ュ簭浠诲姟涓嶅瓨鍦�!";
mes.data = null;
return mes;
}
@@ -483,7 +483,7 @@
case "Z":
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鏍囩涓鸿嚜鍒舵爣绛�,璇峰墠寰�鑷埗鎿嶄綔鏍囩椤垫壂鐮�!";
+ mes.message = "褰撳墠鏍囩涓鸿嚜鍒舵爣绛�,璇峰墠寰�鑷埗鎿嶄綔鏍囩椤垫壂鐮�!";
mes.data = null;
break;
case "W":
@@ -507,7 +507,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭鏃犲彲鍙戞枡鏁伴噺!";
+ mes.message = "褰撳墠宸ュ簭鏃犲彲鍙戞枡鏁伴噺!";
mes.data = null;
return mes;
}
@@ -519,7 +519,7 @@
rt.startqty = kfqty; //鍙戞枡鏁伴噺=鍓╀綑鍙彂鏁伴噺
mes.code = "200";
mes.count = 2;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = rt;
}
}
@@ -531,7 +531,7 @@
rt.startqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //鍙戞枡鏁伴噺=浠诲姟鏁伴噺
mes.code = "200";
mes.count = 2;
- mes.Message = "寮圭獥鍙戞枡鐣岄潰!";
+ mes.message = "寮圭獥鍙戞枡鐣岄潰!";
mes.data = rt;
}
}
@@ -575,7 +575,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + "鏃犲彲鍙戞暟閲�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + "鏃犲彲鍙戞暟閲�!";
mes.data = null;
return mes;
}
@@ -585,7 +585,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鍚堟牸浜у嚭涓�0,鏈亾涓嶅厑璁稿彂鏂�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鍚堟牸浜у嚭涓�0,鏈亾涓嶅厑璁稿彂鏂�!";
mes.data = null;
return mes;
}
@@ -596,7 +596,7 @@
mes.code = "200";
mes.count = 2;
- mes.Message = "寮圭獥鍙戞枡鐣岄潰!";
+ mes.message = "寮圭獥鍙戞枡鐣岄潰!";
mes.data = rt;
}
}
@@ -604,7 +604,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鏈姤宸�,鏈亾涓嶅厑璁稿彂鏂�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鏈姤宸�,鏈亾涓嶅厑璁稿彂鏂�!";
mes.data = null;
return mes;
}
@@ -629,7 +629,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + "鏃犲彲鍙戞暟閲�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + "鏃犲彲鍙戞暟閲�!";
mes.data = null;
return mes;
}
@@ -639,7 +639,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鍚堟牸鏀舵枡涓�0,鏈亾涓嶅厑璁稿彂鏂�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鍚堟牸鏀舵枡涓�0,鏈亾涓嶅厑璁稿彂鏂�!";
mes.data = null;
return mes;
}
@@ -650,7 +650,7 @@
mes.code = "200";
mes.count = 2;
- mes.Message = "寮圭獥鍙戞枡鐣岄潰!";
+ mes.message = "寮圭獥鍙戞枡鐣岄潰!";
mes.data = rt;
}
}
@@ -658,7 +658,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鏈彂鏂�,鏈亾涓嶅厑璁稿彂鏂�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鏈彂鏂�,鏈亾涓嶅厑璁稿彂鏂�!";
mes.data = null;
return mes;
}
@@ -682,7 +682,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鍚堟牸浜у嚭涓�0,鏈亾涓嶅厑璁稿彂鏂�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鍚堟牸浜у嚭涓�0,鏈亾涓嶅厑璁稿彂鏂�!";
mes.data = null;
return mes;
}
@@ -693,7 +693,7 @@
mes.code = "200";
mes.count = 2;
- mes.Message = "寮圭獥鍙戞枡鐣岄潰!";
+ mes.message = "寮圭獥鍙戞枡鐣岄潰!";
mes.data = rt;
}
@@ -701,7 +701,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鏈姤宸�,鏈亾涓嶅厑璁稿彂鏂�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鏈姤宸�,鏈亾涓嶅厑璁稿彂鏂�!";
mes.data = null;
return mes;
}
@@ -722,7 +722,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + "鏃犲彲鍙戞暟閲�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + "鏃犲彲鍙戞暟閲�!";
mes.data = null;
return mes;
}
@@ -732,7 +732,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鍚堟牸鏀舵枡涓�0,鏈亾涓嶅厑璁稿彂鏂�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鍚堟牸鏀舵枡涓�0,鏈亾涓嶅厑璁稿彂鏂�!";
mes.data = null;
return mes;
}
@@ -743,7 +743,7 @@
mes.code = "200";
mes.count = 2;
- mes.Message = "寮圭獥鍙戞枡鐣岄潰!";
+ mes.message = "寮圭獥鍙戞枡鐣岄潰!";
mes.data = rt;
}
}
@@ -751,7 +751,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鏈敹鏂�,鏈亾涓嶅厑璁稿彂鏂�!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鐨勪笂閬撳伐搴忥細" + data0.Rows[0]["STEPNAME"].ToString() + " 鏈敹鏂�,鏈亾涓嶅厑璁稿彂鏂�!";
mes.data = null;
return mes;
}
@@ -762,7 +762,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏈壘鍒板綋鍓嶅伐搴忕殑涓婇亾宸ュ簭淇℃伅,璇疯仈绯荤鐞嗗憳鏍稿疄!";
+ mes.message = "鏈壘鍒板綋鍓嶅伐搴忕殑涓婇亾宸ュ簭淇℃伅,璇疯仈绯荤鐞嗗憳鏍稿疄!";
mes.data = null;
return mes;
}
@@ -778,7 +778,7 @@
case "Z"://鑷埗
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鏍囩涓鸿嚜鍒舵爣绛�,璇峰墠寰�鑷埗鎿嶄綔鏍囩椤垫壂鐮�!";
+ mes.message = "褰撳墠鏍囩涓鸿嚜鍒舵爣绛�,璇峰墠寰�鑷埗鎿嶄綔鏍囩椤垫壂鐮�!";
mes.data = null;
break;
case "W":
@@ -820,7 +820,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鏃犲彲鏀舵枡鏁伴噺!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鏃犲彲鏀舵枡鏁伴噺!";
mes.data = null;
return mes;
}
@@ -851,7 +851,7 @@
mes.code = "200";
mes.count = 3;
- mes.Message = "寮圭獥鏀舵枡鐣岄潰!";
+ mes.message = "寮圭獥鏀舵枡鐣岄潰!";
mes.data = rt;
}
@@ -884,7 +884,7 @@
mes.code = "200";
mes.count = 3;
- mes.Message = "寮圭獥鏀舵枡鐣岄潰!";
+ mes.message = "寮圭獥鏀舵枡鐣岄潰!";
mes.data = rt;
}
}
@@ -892,7 +892,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鏈彂鏂�,璇峰厛鍙戞枡!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鏈彂鏂�,璇峰厛鍙戞枡!";
mes.data = null;
return mes;
}
@@ -943,7 +943,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鏃犲彲鏀舵枡鏁伴噺!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鏃犲彲鏀舵枡鏁伴噺!";
mes.data = null;
return mes;
}
@@ -974,7 +974,7 @@
mes.code = "200";
mes.count = 3;
- mes.Message = "寮圭獥鏀舵枡鐣岄潰!";
+ mes.message = "寮圭獥鏀舵枡鐣岄潰!";
mes.data = rt;
}
}
@@ -1004,7 +1004,7 @@
}).ToList();
mes.code = "200";
mes.count = 3;
- mes.Message = "寮圭獥鏀舵枡鐣岄潰!";
+ mes.message = "寮圭獥鏀舵枡鐣岄潰!";
mes.data = rt;
}
}
@@ -1012,7 +1012,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鏈彂鏂�,璇峰厛鍙戞枡!";
+ mes.message = "褰撳墠宸ュ簭锛�" + data.Rows[0]["STEPNAME"].ToString() + " 鏈彂鏂�,璇峰厛鍙戞枡!";
mes.data = null;
return mes;
}
@@ -1021,7 +1021,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏈壘鍒板綋鍓嶅伐搴忕殑涓婇亾宸ュ簭淇℃伅,璇疯仈绯荤鐞嗗憳鏍稿疄!";
+ mes.message = "鏈壘鍒板綋鍓嶅伐搴忕殑涓婇亾宸ュ簭淇℃伅,璇疯仈绯荤鐞嗗憳鏍稿疄!";
mes.data = null;
return mes;
}
@@ -1039,7 +1039,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
return mes;
}
diff --git a/VueWebCoreApi/Tools/SeachEncode.cs b/VueWebCoreApi/Tools/SeachEncode.cs
index b6da739..138d232 100644
--- a/VueWebCoreApi/Tools/SeachEncode.cs
+++ b/VueWebCoreApi/Tools/SeachEncode.cs
@@ -78,14 +78,14 @@
listdt.Add(Encode);
listdt.Add(cunm2);
mes.code = "200";
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = listdt;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶辫触!";
+ mes.message = "澶辫触!";
mes.data = null;
}
break;
@@ -127,14 +127,14 @@
listdt.Add(Encode);
listdt.Add(cunm2);
mes.code = "200";
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = listdt;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶辫触!";
+ mes.message = "澶辫触!";
mes.data = null;
}
break;
@@ -174,14 +174,14 @@
listdt.Add(Encode);
listdt.Add(cunm2);
mes.code = "200";
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = listdt;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶辫触!";
+ mes.message = "澶辫触!";
mes.data = null;
}
@@ -232,14 +232,14 @@
listdt.Add(Encode);
listdt.Add(cunm2);
mes.code = "200";
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = listdt;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶辫触!";
+ mes.message = "澶辫触!";
mes.data = null;
}
break;
@@ -281,14 +281,14 @@
listdt.Add(Encode);
listdt.Add(cunm2);
mes.code = "200";
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = listdt;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶辫触!";
+ mes.message = "澶辫触!";
mes.data = null;
}
break;
@@ -328,14 +328,14 @@
listdt.Add(Encode);
listdt.Add(cunm2);
mes.code = "200";
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = listdt;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶辫触!";
+ mes.message = "澶辫触!";
mes.data = null;
}
break;
@@ -348,7 +348,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏈缃紪鐮佽鍒�,鐢熸垚鍗曞彿澶辫触,璇疯缃紪鐮佷负銆�" + rightcode + "銆戠殑缂栫爜瑙勫垯!";
+ mes.message = "鏈缃紪鐮佽鍒�,鐢熸垚鍗曞彿澶辫触,璇疯缃紪鐮佷负銆�" + rightcode + "銆戠殑缂栫爜瑙勫垯!";
mes.data = null;
}
}
@@ -356,7 +356,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
diff --git a/VueWebCoreApi/Tools/SeachEncodeJob.cs b/VueWebCoreApi/Tools/SeachEncodeJob.cs
index 7c645e8..a43eb2b 100644
--- a/VueWebCoreApi/Tools/SeachEncodeJob.cs
+++ b/VueWebCoreApi/Tools/SeachEncodeJob.cs
@@ -65,7 +65,7 @@
listdt.Add(Encode);
listdt.Add(cunm2);
mes.code = "200";
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = listdt;
break;
case "骞存湀":
@@ -93,7 +93,7 @@
listdt.Add(Encode);
listdt.Add(cunm2);
mes.code = "200";
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = listdt;
break;
case "骞�":
@@ -121,7 +121,7 @@
listdt.Add(Encode);
listdt.Add(cunm2);
mes.code = "200";
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = listdt;
break;
@@ -160,7 +160,7 @@
listdt.Add(Encode);
listdt.Add(cunm2);
mes.code = "200";
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = listdt;
break;
case "骞存湀":
@@ -190,7 +190,7 @@
listdt.Add(Encode);
listdt.Add(cunm2);
mes.code = "200";
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = listdt;
break;
case "骞�":
@@ -218,7 +218,7 @@
listdt.Add(Encode);
listdt.Add(cunm2);
mes.code = "200";
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = listdt;
break;
default:
@@ -230,7 +230,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏈缃紪鐮佽鍒�,鐢熸垚鍗曞彿澶辫触,璇疯缃紪鐮佷负銆�" + rightcode + "銆戠殑缂栫爜瑙勫垯!";
+ mes.message = "鏈缃紪鐮佽鍒�,鐢熸垚鍗曞彿澶辫触,璇疯缃紪鐮佷负銆�" + rightcode + "銆戠殑缂栫爜瑙勫垯!";
mes.data = null;
}
}
@@ -238,7 +238,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
diff --git a/VueWebCoreApi/Tools/ToMessage.cs b/VueWebCoreApi/Tools/ToMessage.cs
index 43b0af7..f881491 100644
--- a/VueWebCoreApi/Tools/ToMessage.cs
+++ b/VueWebCoreApi/Tools/ToMessage.cs
@@ -12,7 +12,7 @@
{
public string code { get; set; }
public int count { get; set; }
- public string Message { get; set; }
+ public string message { get; set; }
public object data { get; set; }
public HttpResponseMessage ResponseMess(ToMessage mes)
--
Gitblit v1.9.3