From 14a48ba934fabee90b5d52471ca47883f6007732 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 20 七月 2022 11:40:39 +0800
Subject: [PATCH] Excel 角色清单导入，工序检验扫码
---
VueWebApi/DLL/DAL/ErpSyncMesDAL.cs | 46 +
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache | 2
VueWebApi/DLL/DAL/BasicSettingDAL.cs | 96 +++
VueWebApi/DLL/BLL/QualityManagementBLL.cs | 7
VueWebApi/Controllers/QualityManagementController.cs | 16
VueWebApi/Logs/2022-07-19.TXT | 29 +
.vs/VueWebApi/v16/.suo | 0
VueWebApi/obj/Release/Package/PackageTmp/Excel/用户清单.xls | 0
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 227 +++++++++
VueWebApi/Models/StepCheck.cs | 16
VueWebApi/Tools/ImportExcelData.cs | 272 ++++++++++--
VueWebApi/DLL/DAL/LoginDAL.cs | 6
VueWebApi/VueWebApi.csproj | 1
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/Controllers/ProductionManagementController.cs | 102 +++
VueWebApi/DLL/DAL/MaterialManagerDAL.cs | 18
VueWebApi/Logs/2022-07-18.TXT | 0
VueWebApi/bin/VueWebApi.pdb | 0
VueWebApi/DLL/BLL/ProductModelBLL.cs | 4
VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache | 2
VueWebApi/Controllers/ErpSyncMesController.cs | 25
VueWebApi/Excel/角色清单.xls | 0
VueWebApi/DLL/DAL/ProductModelDAL.cs | 101 +++-
VueWebApi/Models/TreeDM.cs | 3
VueWebApi/DLL/DAL/SystemSettingDAL.cs | 2
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user | 6
VueWebApi/Tools/SeachEncode.cs | 18
VueWebApi/DLL/BLL/ProductionManagementBLL.cs | 33 +
VueWebApi/DLL/BLL/ErpSyncMesBLL.cs | 17
VueWebApi/bin/VueWebApi.xml | 64 ++
VueWebApi/Tools/ScanStartReport.cs | 43 +
VueWebApi/Excel/用户清单.xls | 0
VueWebApi/obj/Debug/VueWebApi.pdb | 0
VueWebApi/Controllers/BasicSettingController.cs | 3
VueWebApi/Tools/DapperHelper.cs | 34 +
VueWebApi/Controllers/ProductModelController.cs | 5
VueWebApi/DLL/DAL/QualityManagementDAL.cs | 112 ++++
VueWebApi/Controllers/LoginController.cs | 2
VueWebApi/DLL/DAL/DeviceManagerDAL.cs | 3
40 files changed, 1,101 insertions(+), 214 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index b65966c..29c85e9 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/BasicSettingController.cs b/VueWebApi/Controllers/BasicSettingController.cs
index a10fd79..8be5193 100644
--- a/VueWebApi/Controllers/BasicSettingController.cs
+++ b/VueWebApi/Controllers/BasicSettingController.cs
@@ -239,7 +239,7 @@
/// <returns></returns>
[Route(template: "ImportUserExcel")]
[HttpPost]
- public HttpResponseMessage ImportUserExcel(HttpPostedFileBase files)
+ public HttpResponseMessage ImportUserExcel(HttpPostedFileBase files,string username)
{
string savePath;
if (files == null || files.ContentLength <= 0)
@@ -249,7 +249,6 @@
}
else
{
- var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鐧诲綍鐢ㄦ埛鍚�
string filename = Path.GetFileName(files.FileName);
int filesize = files.ContentLength;//鑾峰彇涓婁紶鏂囦欢鐨勫ぇ灏忓崟浣嶄负瀛楄妭byte
string fileEx = System.IO.Path.GetExtension(filename);//鑾峰彇涓婁紶鏂囦欢鐨勬墿灞曞悕
diff --git a/VueWebApi/Controllers/ErpSyncMesController.cs b/VueWebApi/Controllers/ErpSyncMesController.cs
index bdcccf3..54cfa77 100644
--- a/VueWebApi/Controllers/ErpSyncMesController.cs
+++ b/VueWebApi/Controllers/ErpSyncMesController.cs
@@ -18,6 +18,21 @@
ToMessage mes = new ToMessage();
RedisHelper redis = new RedisHelper();
+ #region[鍒堕�犳ā鍨嬶細鍗曚綅鍚屾]
+ /// <summary>
+ /// 鍒堕�犳ā鍨嬶細鍗曚綅鍚屾
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "SeaveSearchUnit")]
+ [HttpPost]
+ public HttpResponseMessage SeaveSearchUnit()
+ {
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ErpSyncMesBLL.SeaveSearchUnit(username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[鍒堕�犳ā鍨嬶細瀛樿揣鍒嗙被鍚屾]
/// <summary>
/// 鍒堕�犳ā鍨嬶細瀛樿揣鍒嗙被鍚屾
@@ -27,8 +42,7 @@
[HttpPost]
public HttpResponseMessage SeaveSearchInventoryClass()
{
- var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ErpSyncMesBLL.SeaveSearchInventoryClass(username);
+ mes = ErpSyncMesBLL.SeaveSearchInventoryClass();
return TJson.toJson(mes);
}
#endregion
@@ -79,12 +93,15 @@
#endregion
#region[鐢熶骇绠＄悊锛氱敓浜ц鍗曞悓姝
+ /// <summary>
+ /// 鐢熶骇绠＄悊锛氱敓浜ц鍗曞悓姝�
+ /// </summary>
+ /// <returns></returns>
[Route(template: "SeaveSearchErpOrder")]
[HttpPost]
public HttpResponseMessage SeaveSearchErpOrder()
{
- var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ErpSyncMesBLL.SeaveSearchErpOrder(username);
+ mes = ErpSyncMesBLL.SeaveSearchErpOrder();
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/Controllers/LoginController.cs b/VueWebApi/Controllers/LoginController.cs
index f8e7f58..011d134 100644
--- a/VueWebApi/Controllers/LoginController.cs
+++ b/VueWebApi/Controllers/LoginController.cs
@@ -24,7 +24,7 @@
/// <summary>
/// 鐢ㄦ埛鐧诲綍
/// </summary>
- /// <param name="username">鐢ㄦ埛鍚�</param>
+ /// <param name="username">鐢ㄦ埛缂栫爜</param>
/// <param name="password">瀵嗙爜</param>
/// <returns></returns>
[Route(template: "LoginSave")]
diff --git a/VueWebApi/Controllers/ProductModelController.cs b/VueWebApi/Controllers/ProductModelController.cs
index 26a4d52..90e51e8 100644
--- a/VueWebApi/Controllers/ProductModelController.cs
+++ b/VueWebApi/Controllers/ProductModelController.cs
@@ -282,14 +282,15 @@
/// 瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦
/// </summary>
/// <param name="partcode">鐗╂枡缂栫爜</param>
+ /// <param name="defaultroute_code">榛樿宸ヨ壓璺嚎缂栫爜</param>
/// <param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
/// <returns></returns>
[Route(template: "SaveInventoryFile")]
[HttpPost]
- public HttpResponseMessage SaveInventoryFile(string partcode, List<ObjectData> json)
+ public HttpResponseMessage SaveInventoryFile(string partcode, List<ObjectData> json, string defaultroute_code = null)
{
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductModelBLL.SaveInventoryFile(partcode, username, json);
+ mes = ProductModelBLL.SaveInventoryFile(partcode, defaultroute_code, username, json);
return TJson.toJson(mes);
}
#endregion
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 9b9be5e..e2d3bbc 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -7,6 +8,7 @@
using System.Web;
using System.Web.Http;
using VueWebApi.DLL.BLL;
+using VueWebApi.Models;
using VueWebApi.Tools;
namespace VueWebApi.Controllers
@@ -30,9 +32,9 @@
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">浜у搧瑙勬牸</param>
- /// <param name="paydate">浜や粯鏃堕棿</param>
+ /// <param name="paystartdate">棰勮寮�宸ユ椂闂�</param>
+ /// <param name="payenddate">棰勮瀹屽伐鏃堕棿</param>
/// <param name="creatuser">鍒涘缓浜哄憳</param>
- /// <param name="createdate">鍒涘缓鏃堕棿</param>
/// <param name="page">椤电爜</param>
/// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
/// <param name="prop">鎺掑簭瀛楁</param>
@@ -40,25 +42,25 @@
/// <returns></returns>
[Route(template: "ErpOrderSearch")]
[HttpGet]
- public HttpResponseMessage ErpOrderSearch(string erporderstus = null, string erpordercode = null, string partcode = null, string partname = null, string partspec = null, string paydate = null, string creatuser = null, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage ErpOrderSearch(string erporderstus = null, string erpordercode = 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)
{
- string paydatestartdate = ""; //浜や粯寮�濮嬫椂闂�
- string paydateenddate = ""; //浜や粯缁撴潫鏃堕棿
- string createstartdate = ""; //鎿嶄綔寮�濮嬫椂闂�
- string createenddate = ""; //鎿嶄綔缁撴潫鏃堕棿
- if (paydate != "" && paydate != null)
+ string paydatestartdate = ""; //棰勮寮�宸ュ紑濮嬫椂闂�
+ string paydateenddate = ""; //棰勮寮�宸ョ粨鏉熸椂闂�
+ string paydatestartdate1 = ""; //棰勮瀹屽伐寮�濮嬫椂闂�
+ string paydateenddate2 = ""; //棰勮瀹屽伐缁撴潫鏃堕棿
+ if (paystartdate != "" && paystartdate != null)
{
- paydatestartdate = paydate.Split('~')[0].ToString();
- paydateenddate = paydate.Split('~')[1].ToString();
+ paydatestartdate = paystartdate.Split('~')[0].ToString();
+ paydateenddate = paystartdate.Split('~')[1].ToString();
}
- if (createdate != "" && createdate != null)
+ if (payenddate != "" && payenddate != null)
{
- createstartdate = createdate.Split('~')[0].ToString();
- createenddate = createdate.Split('~')[1].ToString();
+ paydatestartdate1 = payenddate.Split('~')[0].ToString();
+ paydateenddate2 = payenddate.Split('~')[1].ToString();
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductionManagementBLL.ErpOrderSearch(erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, creatuser, createstartdate, createenddate, endNum, prop, order);
+ mes = ProductionManagementBLL.ErpOrderSearch(erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -504,5 +506,75 @@
}
#endregion
+ #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭痌
+ /// <summary>
+ /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭�
+ /// </summary>
+ /// <param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepCheckSearch")]
+ [HttpGet]
+ public HttpResponseMessage MesOrderStepCheckSearch(string orderstepqrcode)
+ {
+ mes = ProductionManagementBLL.MesOrderStepCheckSearch(orderstepqrcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠岃幏鍙栨楠屾爣鍑嗕笅鎷夋鏁版嵁]
+ /// <summary>
+ /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠岃幏鍙栨楠屾爣鍑嗕笅鎷夋鏁版嵁
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepCheckSelect")]
+ [HttpGet]
+ public HttpResponseMessage MesOrderStepCheckSelect()
+ {
+ mes = ProductionManagementBLL.MesOrderStepCheckSelect();
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾牴鎹楠屾爣鍑嗚幏鍙栨楠岄」鐩垪琛╙
+ /// <summary>
+ /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾牴鎹楠屾爣鍑嗚幏鍙栨楠岄」鐩垪琛�
+ /// </summary>
+ /// <param name="checkstandcode">妫�楠屾爣鍑嗙紪鐮�</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepCheckItemList")]
+ [HttpGet]
+ public HttpResponseMessage MesOrderStepCheckItemList(string checkstandcode)
+ {
+ mes = ProductionManagementBLL.MesOrderStepCheckItemList(checkstandcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾彁浜や繚瀛榏
+ /// <summary>
+ /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾彁浜や繚瀛�
+ /// </summary>
+ /// <param name="obj">鎻愪氦淇℃伅</param>
+ /// <returns></returns>
+ [Route(template: "SaveMesOrderStepCheckItem")]
+ [HttpPost]
+ public HttpResponseMessage SaveMesOrderStepCheckItem([FromBody] JObject obj)
+ {
+ string mesordercode = obj["mesordercode"].ToString(); //宸ュ崟缂栧彿
+ string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
+ string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
+ string checkstanedcode = obj["checkstanedcode"].ToString(); //妫�楠屾爣鍑嗙紪鐮�
+ string checkuser = obj["checkuser"].ToString(); //妫�楠屼汉鍛�
+ string checktypecode = obj["checktypecode"].ToString(); //妫�楠岀被鍨嬬紪鐮�
+ string checkresult = obj["checkresult"].ToString(); //妫�楠岀粨鏋�
+ string checkdescr = obj["checkdescr"].ToString(); //妫�楠屾弿杩�
+ string data = obj["data"].ToString();
+ List<StepCheck> json = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StepCheck>>(data);
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(mesordercode, partcode, stepcode, checkstanedcode, checkuser, checktypecode, checkresult, checkdescr, username,json);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
}
}
diff --git a/VueWebApi/Controllers/QualityManagementController.cs b/VueWebApi/Controllers/QualityManagementController.cs
index eebad04..96141d0 100644
--- a/VueWebApi/Controllers/QualityManagementController.cs
+++ b/VueWebApi/Controllers/QualityManagementController.cs
@@ -133,6 +133,21 @@
}
#endregion
+ #region[宸ュ簭妫�楠屾爣鍑嗗垹闄
+ /// <summary>
+ /// 宸ュ簭妫�楠屾爣鍑嗗垹闄�
+ /// </summary>
+ /// <param name="stanedcode">stanedcode</param>
+ /// <returns></returns>
+ [Route(template: "DeleteStepCheckStaned")]
+ [HttpPost]
+ public HttpResponseMessage DeleteStepCheckStaned(string stanedcode)
+ {
+ mes = QualityManagementBLL.DeleteStepCheckStaned(stanedcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
#region[宸ュ簭妫�楠屾爣鍑嗘柊澧炪�佺紪杈戞彁浜
/// <summary>
/// 宸ュ簭妫�楠屾爣鍑嗘柊澧炪�佺紪杈戞彁浜�
@@ -150,6 +165,7 @@
}
#endregion
+
#region[宸ュ簭妫�楠岄」鐩垪琛ㄦ煡璇
diff --git a/VueWebApi/DLL/BLL/ErpSyncMesBLL.cs b/VueWebApi/DLL/BLL/ErpSyncMesBLL.cs
index 937aebf..439b8c0 100644
--- a/VueWebApi/DLL/BLL/ErpSyncMesBLL.cs
+++ b/VueWebApi/DLL/BLL/ErpSyncMesBLL.cs
@@ -9,10 +9,17 @@
{
public class ErpSyncMesBLL
{
- #region[鍒堕�犳ā鍨嬶細瀛樿揣鍒嗙被鍚屾]
- public static ToMessage SeaveSearchInventoryClass(string username)
+ #region[鍒堕�犳ā鍨嬶細鍗曚綅鍚屾]
+ public static ToMessage SeaveSearchUnit(string username)
{
- return ErpSyncMesDAL.SeaveSearchInventoryClass(username);
+ return ErpSyncMesDAL.SeaveSearchUnit(username);
+ }
+ #endregion
+
+ #region[鍒堕�犳ā鍨嬶細瀛樿揣鍒嗙被鍚屾]
+ public static ToMessage SeaveSearchInventoryClass()
+ {
+ return ErpSyncMesDAL.SeaveSearchInventoryClass();
}
#endregion
@@ -38,9 +45,9 @@
#endregion
#region[鐢熶骇绠＄悊锛氱敓浜ц鍗曞悓姝
- public static ToMessage SeaveSearchErpOrder(string username)
+ public static ToMessage SeaveSearchErpOrder()
{
- return ErpSyncMesDAL.SeaveSearchErpOrder(username);
+ return ErpSyncMesDAL.SeaveSearchErpOrder();
}
#endregion
diff --git a/VueWebApi/DLL/BLL/ProductModelBLL.cs b/VueWebApi/DLL/BLL/ProductModelBLL.cs
index faacbc8..9ba16d7 100644
--- a/VueWebApi/DLL/BLL/ProductModelBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductModelBLL.cs
@@ -105,9 +105,9 @@
#endregion
#region[瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦]
- public static ToMessage SaveInventoryFile(string partcode,string username, List<ObjectData> json)
+ public static ToMessage SaveInventoryFile(string partcode,string defaultroute_code, string username, List<ObjectData> json)
{
- return ProductModelDAL.SaveInventoryFile(partcode, username, json);
+ return ProductModelDAL.SaveInventoryFile(partcode, defaultroute_code, username, json);
}
#endregion
diff --git a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
index bc4ba2d..574a8e1 100644
--- a/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
+++ b/VueWebApi/DLL/BLL/ProductionManagementBLL.cs
@@ -3,6 +3,7 @@
using System.Linq;
using System.Web;
using VueWebApi.DLL.DAL;
+using VueWebApi.Models;
using VueWebApi.Tools;
namespace VueWebApi.DLL.BLL
@@ -10,9 +11,9 @@
public class ProductionManagementBLL
{
#region[ERP璁㈠崟鏌ヨ]
- public static ToMessage ErpOrderSearch(string erporderstus, string erpordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string creatuser, string createstartdate, string createenddate, int endNum, string prop, string order)
+ public static ToMessage ErpOrderSearch(string erporderstus, string erpordercode, 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 ProductionManagementDAL.ErpOrderSearch(erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, creatuser, createstartdate, createenddate, endNum, prop, order);
+ return ProductionManagementDAL.ErpOrderSearch(erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
}
#endregion
@@ -182,5 +183,33 @@
return ProductionManagementDAL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inuser, taskqty, sqty, ngqty, badcode, username);
}
#endregion
+
+ #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭痌
+ public static ToMessage MesOrderStepCheckSearch(string orderstepqrcode)
+ {
+ return ProductionManagementDAL.MesOrderStepCheckSearch(orderstepqrcode);
+ }
+ #endregion
+
+ #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠岃幏鍙栨楠屾爣鍑嗕笅鎷夋鏁版嵁]
+ public static ToMessage MesOrderStepCheckSelect()
+ {
+ return ProductionManagementDAL.MesOrderStepCheckSelect();
+ }
+ #endregion
+
+ #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾牴鎹楠屾爣鍑嗚幏鍙栨楠岄」鐩垪琛╙
+ public static ToMessage MesOrderStepCheckItemList(string checkstandcode)
+ {
+ return ProductionManagementDAL.MesOrderStepCheckItemList(checkstandcode);
+ }
+ #endregion
+
+ #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾彁浜や繚瀛榏
+ public static ToMessage SaveMesOrderStepCheckItem(string mesordercode, string partcode, string stepcode, string checkstanedcode, string checkuser, string checktypecode, string checkresult, string checkdescr, string username, List<StepCheck> json)
+ {
+ return ProductionManagementDAL.SaveMesOrderStepCheckItem(mesordercode, partcode, stepcode, checkstanedcode, checkuser, checktypecode, checkresult, checkdescr, username, json);
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/BLL/QualityManagementBLL.cs b/VueWebApi/DLL/BLL/QualityManagementBLL.cs
index 1c913db..e5708a5 100644
--- a/VueWebApi/DLL/BLL/QualityManagementBLL.cs
+++ b/VueWebApi/DLL/BLL/QualityManagementBLL.cs
@@ -55,6 +55,13 @@
}
#endregion
+ #region[宸ュ簭妫�楠屾爣鍑嗗垹闄
+ public static ToMessage DeleteStepCheckStaned(string stanedcode)
+ {
+ return QualityManagementDAL.DeleteStepCheckStaned(stanedcode);
+ }
+ #endregion
+
#region[宸ュ簭妫�楠屾爣鍑嗘柊澧炪�佺紪杈戞彁浜
public static ToMessage AddUpdateStepCheckStaned(string opertype, RoutEdit json, string username)
{
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index 94c473a..711a850 100644
--- a/VueWebApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -154,7 +154,19 @@
{
if (operType == "Add")
{
- sql = @"insert into TOrganization(parent_id,org_code,org_name,lm_user,lm_date,description)
+ sql = @"select * from TOrganization where org_code=@organCode";
+ dynamicParams.Add("@organCode", organCode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏂板鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
+
+ sql = @"insert into TOrganization(parent_id,org_code,org_name,lm_user,lm_date,description)
values(@supUnit,@organCode,@organName,@Operator,@CreateDate,@organType)";
list.Add(new { str = sql, parm = new { supUnit = supUnit, organCode= organCode, organName= organName, Operator= Operator, CreateDate= DateTime.Now.ToString(), organType= organType } });
//sql = @"update T_CodeRules set value=@cunm2 where rightcode=@RightCode";
@@ -423,6 +435,18 @@
{
if (OperType == "Add")
{
+ var sql0 = @"select * from TUser where usercode=@UserCode";
+ dynamicParams.Add("@UserCode", UserCode);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏂板鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
+
var sql = @"insert into TUser(usercode,username,password,enable,mobile,lm_date,email,lm_user,stu_torgcode,wagetype,usergroup_code)
values(@UserCode,@UserName,@password,@Enable,@Mobile,@CreateDate,@Email,@Operator,@StuOrg,@wagetype,@groupcode)";
dynamicParams.Add("@UserCode", UserCode);
@@ -761,6 +785,17 @@
//寰幆鍐欏叆鐢ㄦ埛缁勮〃
for (int i = 0; i < json.Count; i++)
{
+ var sql0 = @"select * from TGroup where group_code=@group_code";
+ dynamicParams.Add("@group_code", json[i].code);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
sql = @"insert into TGroup(group_code,group_name,description,lm_user,lm_date) values(@groupcode,@groupename,@description,@lm_user,@lm_date)";
list.Add(new
{
@@ -896,6 +931,17 @@
//寰幆鍐欏叆瑙掕壊绫诲瀷琛�
for (int i = 0; i < json.Count; i++)
{
+ var sql0 = @"select * from TRoleType where roletype_code=@roletype_code";
+ dynamicParams.Add("@roletype_code", json[i].code);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
sql = @"insert into TRoleType(roletype_code,roletype_name) values(@roletypecode,@roletypename)";
list.Add(new
{
@@ -1021,7 +1067,7 @@
}
if (CreateUser != "" && CreateUser != null)
{
- search += "and A.lm_user like '%'+@CreateUser+'%' ";
+ search += "and T.username like '%'+@CreateUser+'%' ";
dynamicParams.Add("@CreateUser", CreateUser);
}
if (search == "")
@@ -1031,9 +1077,10 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.id,A.role_code,A.role_name,b.roletype_code,B.roletype_name,A.description,A.lm_user,A.lm_date,A.is_user,A.is_right
+ var sql = @"select A.id,A.role_code,A.role_name,b.roletype_code,B.roletype_name,A.description,T.username as lm_user,A.lm_date,A.is_user,A.is_right
from TRole A
left join TRoleType B on A.roletype_code=B.roletype_code
+ left join TUser T on A.lm_user=T.usercode
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -1060,6 +1107,17 @@
{
if (OperType == "Add")
{
+ var sql0 = @"select * from TRole where role_code=@role_code";
+ dynamicParams.Add("@role_code", RoleCode);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
var sql = @"insert into TRole(role_code,role_name,lm_user,lm_date,roletype_code,description)
values(@RoleCode,@RoleName,@Usercode,@CreateDate,@RoleTypeCode,@description)";
dynamicParams.Add("@RoleCode", RoleCode);
@@ -1428,12 +1486,12 @@
{
if (cuntUnitCode != "" && cuntUnitCode != null)
{
- search += "and code like '%'+@cuntUnitCode+'%' ";
+ search += "and A.code like '%'+@cuntUnitCode+'%' ";
dynamicParams.Add("@cuntUnitCode", cuntUnitCode);
}
if (cuntUnitName != "" && cuntUnitName != null)
{
- search += "and name like '%'+@cuntUnitName+'%' ";
+ search += "and A.name like '%'+@cuntUnitName+'%' ";
dynamicParams.Add("@cuntUnitName", cuntUnitName);
}
if (unitAttr != "" && unitAttr != null)
@@ -1441,22 +1499,22 @@
switch (unitAttr)
{
case "WG": //澶栬喘
- search += "and mtype=@unitAttr ";
+ search += "and A.mtype=@unitAttr ";
dynamicParams.Add("@unitAttr", unitAttr);
break;
case "WX": //澶栧崗
- search += "and btype=@unitAttr ";
+ search += "and A.btype=@unitAttr ";
dynamicParams.Add("@unitAttr", unitAttr);
break;
default: //瀹㈡埛
- search += "and htype=@unitAttr ";
+ search += "and A.htype=@unitAttr ";
dynamicParams.Add("@unitAttr", unitAttr);
break;
}
}
if (createUser != "" && createUser != null)
{
- search += "and lm_user like '%'+@createUser+'%' ";
+ search += "and T.username like '%'+@createUser+'%' ";
dynamicParams.Add("@createUser", createUser);
}
if (search == "")
@@ -1465,8 +1523,9 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select id,code,name,mtype,btype,htype,conttacts,conttphone,addr,lm_user,lm_date from TCustomer
- where is_delete<>'1' " + search;
+ var sql = @"select A.id,A.code,A.name,A.mtype,A.btype,A.htype,A.conttacts,A.conttphone,A.addr,T.username as lm_user,A.lm_date from TCustomer A
+ left join TUser T on A.lm_user=T.usercode
+ where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -1492,6 +1551,17 @@
{
if (OperType == "Add")
{
+ var sql0 = @"select * from TCustomer where code=@code";
+ dynamicParams.Add("@unitcode", unitcode);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
var sql = @"insert into TCustomer(code,name,mtype,btype,htype,conttacts,conttphone,addr,lm_user,lm_date)
values(@unitcode,@unitname,@mtypecode,@btypecode,@htypecode,@person,@contact,@description,@usercode,@CreateDate)";
dynamicParams.Add("@unitcode", unitcode);
@@ -1581,8 +1651,8 @@
mes.data = null;
return mes;
}
- //鍒犻櫎(鏇存柊鐘舵��)寰�鏉ュ崟浣嶈〃
- sql = @"update TCustomer set is_delete='1' where code=@unitcode";
+ //鍒犻櫎寰�鏉ュ崟浣嶈〃
+ sql = @"delete TCustomer where code=@unitcode";
list.Add(new { str = sql, parm = new { unitcode = unitcode } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
diff --git a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
index 4e5559c..34171f1 100644
--- a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -454,12 +454,13 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select A.id,A.code,A.name,A.eqptype_code,B.name as eqptype_name,A.eqpgroup_code,G.name as eqpgroup_name,A.enable,
- A.input_date,A.wksp_code,T.org_name as wksp_name,A.Line_code,L.org_name as Line_name,A.opc_uom,A.operation_ration,A.lm_user,A.lm_date
+ A.input_date,A.wksp_code,T.org_name as wksp_name,A.Line_code,L.org_name as Line_name,A.opc_uom,A.operation_ration,U.username as lm_user,A.lm_date
from TEqpInfo A
left join TEqpType B on A.eqptype_code=B.code
left join TEqpGroup G on A.eqpgroup_code=G.code
left join TOrganization T on A.wksp_code=T.org_code
left join TOrganization L on A.Line_code=L.org_code
+ left join TUser U on A.lm_user=U.usercode
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
diff --git a/VueWebApi/DLL/DAL/ErpSyncMesDAL.cs b/VueWebApi/DLL/DAL/ErpSyncMesDAL.cs
index e0747f4..1206d10 100644
--- a/VueWebApi/DLL/DAL/ErpSyncMesDAL.cs
+++ b/VueWebApi/DLL/DAL/ErpSyncMesDAL.cs
@@ -11,8 +11,45 @@
{
public static ToMessage mes = new ToMessage(); //瀹氫箟鍏ㄥ眬杩斿洖淇℃伅瀵硅薄
+ #region[鍒堕�犳ā鍨嬶細鍗曚綅鍚屾]
+ public static ToMessage SeaveSearchUnit(string username)
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //瀛樺偍杩囩▼鍚�
+ sql = @"h_p_IFCLD_ERPUnit";
+ dynamicParams.Add("@username", username);
+ bool a = DapperHelper.IsProcedure(sql, dynamicParams);
+ if (a)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鍚屾鍗曚綅鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鍚屾鍗曚綅澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
#region[鍒堕�犳ā鍨嬶細瀛樿揣鍒嗙被鍚屾]
- public static ToMessage SeaveSearchInventoryClass(string username)
+ public static ToMessage SeaveSearchInventoryClass()
{
var sql = "";
var dynamicParams = new DynamicParameters();
@@ -20,7 +57,7 @@
{
//瀛樺偍杩囩▼鍚�
sql = @"h_p_IFCLD_ERPInventory_Class";
- bool a = DapperHelper.IsProcedure(sql, dynamicParams);
+ bool a = DapperHelper.IsProcedureNo(sql);
if (a)
{
mes.code = "200";
@@ -159,7 +196,7 @@
#endregion
#region[鐢熶骇绠＄悊锛氱敓浜ц鍗曞悓姝
- public static ToMessage SeaveSearchErpOrder(string username)
+ public static ToMessage SeaveSearchErpOrder()
{
var sql = "";
var dynamicParams = new DynamicParameters();
@@ -167,8 +204,7 @@
{
//瀛樺偍杩囩▼鍚�
sql = @"h_p_IFCLD_ERPMO";
- dynamicParams.Add("@username", username);
- bool a = DapperHelper.IsProcedure(sql, dynamicParams);
+ bool a = DapperHelper.IsProcedureNo(sql);
if (a)
{
mes.code = "200";
diff --git a/VueWebApi/DLL/DAL/LoginDAL.cs b/VueWebApi/DLL/DAL/LoginDAL.cs
index a243bb9..1379bdb 100644
--- a/VueWebApi/DLL/DAL/LoginDAL.cs
+++ b/VueWebApi/DLL/DAL/LoginDAL.cs
@@ -25,7 +25,7 @@
{
//鎵цsql
- strProcName = "select * from [dbo].[TUser] where username=@username and password=@password";
+ strProcName = "select * from [dbo].[TUser] where usercode=@username and password=@password";
//鍒涘缓鍙傛暟
listStr.Add(new SqlParameter("@username", username));
listStr.Add(new SqlParameter("@password", password));
@@ -114,7 +114,7 @@
try
{
//鑾峰彇鑿滃崟闆嗗悎(鏍规嵁鐧诲綍鐢ㄦ埛缂栫爜鏌ヨ鏉冮檺鍙嶆帹鑿滃崟)
- sql = @"select distinct rt.right_code as code,rt.right_name as name,rt.right_seq from TRight rt where rt.right_code in(
+ sql = @"select distinct rt.right_code as code,rt.right_name as name,rt.right_seq,rt.is_delete as flag from TRight rt where rt.right_code in(
select A.parent_id from TRight A
left join TRoleRightRelation B on B.right_code=A.right_code
left join TRole C on C.role_code=B.role_code
@@ -125,7 +125,7 @@
var data = DapperHelper.select<TreeObejct>(sql, dynamicParams);
for (int i = 0; i < data.Count; i++)
{
- sql = @"select distinct mu.right_code as code,mu.right_name as name,mu.right_seq
+ sql = @"select distinct mu.right_code as code,mu.right_name as name,mu.right_seq,mu.is_delete as flag
from TRight mu
inner join TRoleRightRelation rl on mu.right_code=rl.right_code
inner join TUserRoleRelation ro on rl.role_code=ro.role_code
diff --git a/VueWebApi/DLL/DAL/MaterialManagerDAL.cs b/VueWebApi/DLL/DAL/MaterialManagerDAL.cs
index 61c8a7c..f93a04f 100644
--- a/VueWebApi/DLL/DAL/MaterialManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/MaterialManagerDAL.cs
@@ -28,22 +28,22 @@
{
if (warehousecode != "" && warehousecode != null)
{
- search += "and code like '%'+@warehousecode+'%' ";
+ search += "and A.code like '%'+@warehousecode+'%' ";
dynamicParams.Add("@warehousecode", warehousecode);
}
if (warehousename != "" && warehousename != null)
{
- search += "and name like '%'+@warehousename+'%' ";
+ search += "and A.name like '%'+@warehousename+'%' ";
dynamicParams.Add("@warehousename", warehousename);
}
if (description != "" && description != null)
{
- search += "and description like '%'+@description+'%' ";
+ search += "and A.description like '%'+@description+'%' ";
dynamicParams.Add("@description", description);
}
if (createuser != "" && createuser != null)
{
- search += "and lm_user like '%'+@createuser+'%' ";
+ search += "and T.username like '%'+@createuser+'%' ";
dynamicParams.Add("@createuser", createuser);
}
if (search == "")
@@ -52,8 +52,9 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select id,code,name,description,lm_user,lm_date from T_Sec_Stck
- where is_delete<>'1' " + search;
+ var sql = @"select A.id,A.code,A.name,A.description,T.username as lm_user,A.lm_date from T_Sec_Stck A
+ left join TUser T on A.lm_user=T.usercode
+ where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -244,7 +245,7 @@
}
if (createuser != "" && createuser != null)
{
- search += "and A.lm_user like '%'+@createuser+'%' ";
+ search += "and U.username like '%'+@createuser+'%' ";
dynamicParams.Add("@createuser", createuser);
}
if (stockcode != "" && stockcode != null)
@@ -258,9 +259,10 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.id,A.code,A.name,A.description,A.stock_code,B.name as stock_name,A.lm_user,A.lm_date
+ var sql = @"select A.id,A.code,A.name,A.description,A.stock_code,B.name as stock_name,U.username as lm_user,A.lm_date
from T_Sec_Loca A
left join T_Sec_Stck B on A.stock_code=B.code
+ left join TUser U on A.lm_user=U.usercode
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 3ab2f66..0d6b0f3 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -72,9 +72,10 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.id,A.code,A.name,A.dict_code as stockcode,B.name as stockname,A.lm_user,A.lm_date
+ var sql = @"select A.id,A.code,A.name,A.dict_code as stockcode,B.name as stockname,U.username as lm_user,A.lm_date
from TMateriel_Type A
left join T_Dict B on A.dict_code=B.code and B.dict_type='CHLX'
+ left join TUser U on A.lm_user=U.usercode
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -101,6 +102,17 @@
{
if (operType == "Add")
{
+ var sql0 = @"select * from TMateriel_Type where code=@materialtypecode";
+ dynamicParams.Add("@materialtypecode", materialtypecode);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
var sql = @"insert into TMateriel_Type(dict_code,code,name,lm_user,lm_date)
values(@stocktypecode,@materialtypecode,@materialtypename,@username,@CreateDate)";
dynamicParams.Add("@stocktypecode", stocktypecode);
@@ -257,6 +269,17 @@
//寰幆鍐欏叆鍗曚綅琛�
for (int i = 0; i < json.Count; i++)
{
+ var sql0 = @"select * from TUom where code=@code";
+ dynamicParams.Add("@code", json[i].code);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
sql = @"insert into TUom(code,name,digdect,r_ule,lm_user,lm_date) values(@code,@name,@digdect,@r_ule,@username,@CreateDate)";
list.Add(new
{
@@ -441,13 +464,14 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select A.id,A.partcode,A.partname,A.partspec,A.uom_code,B.name as uom_name,D.code as stocktypecode,D.name as stocktypename,
- C.code as materialtypecode,C.name as materialtypename,A.stck_code,T.name as stck_name,A.maxqty,A.minqty,A.lm_user,
+ C.code as materialtypecode,C.name as materialtypename,A.stck_code,T.name as stck_name,A.maxqty,A.minqty,U.username as lm_user,A.default_route,
A.lm_date,A.proute_id
from TMateriel_Info A
left join TUom B on A.uom_code=B.code
left join TMateriel_Type C on A.materieltype_code=C.code
left join T_Dict D on A.stocktype_code=D.code and D.dict_type='CHLX'
left join T_Sec_Stck T on A.stck_code=T.code
+ left join TUser U on A.lm_user=U.usercode
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -474,6 +498,17 @@
{
if (operType == "Add")
{
+ var sql0 = @"select * from TMateriel_Info where partcode=@materialcode";
+ dynamicParams.Add("@materialcode", materialcode);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
var sql = @"insert into TMateriel_Info(partcode,partname,partspec,uom_code,stocktype_code,materieltype_code,stck_code,maxqty,minqty,lm_user,lm_date)
values(@materialcode,@materialname,@materialspec,@uomcode,@stocktypecode,@materialtypecode,@warehousecode,@maxstockqty,@minstockqty,@username,@CreateDate)";
dynamicParams.Add("@materialcode", materialcode);
@@ -612,7 +647,7 @@
//鏈夋病鏈夎宸ュ崟寮曠敤
//鍒犻櫎鐗╂枡
- sql = @"update TMateriel_Info set is_delete='1' where partcode=@materialcode";
+ sql = @"delete TMateriel_Info where partcode=@materialcode";
list.Add(new { str = sql, parm = new { materialcode = materialcode } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -691,7 +726,7 @@
#endregion
#region[瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦]
- public static ToMessage SaveInventoryFile(string partcode, string username, List<ObjectData> json)
+ public static ToMessage SaveInventoryFile(string partcode,string defaultroute_code, string username, List<ObjectData> json)
{
var sql = "";
List<object> list = new List<object>();
@@ -704,7 +739,7 @@
sql = @"delete TMateriel_Route where materiel_code=@partcode";
list.Add(new { str = sql, parm = new { partcode = partcode } });
//鏍囪鐗╂枡琛ㄥ叧鑱斿伐鑹鸿矾绾挎爣璇�
- sql = @"update TMateriel_Info set proute_id='N' where partcode=@partcode";
+ sql = @"update TMateriel_Info set proute_id='N',default_route='' where partcode=@partcode";
list.Add(new { str = sql, parm = new { partcode = partcode } });
}
else
@@ -729,8 +764,8 @@
});
}
//鏍囪鐗╂枡琛ㄥ叧鑱斿伐鑹鸿矾绾挎爣璇�
- sql = @"update TMateriel_Info set proute_id='Y' where partcode=@partcode";
- list.Add(new { str = sql, parm = new { partcode = partcode } });
+ sql = @"update TMateriel_Info set proute_id='Y',default_route=@defaultroute_code where partcode=@partcode";
+ list.Add(new { str = sql, parm = new { partcode = partcode, defaultroute_code= defaultroute_code } });
}
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -770,22 +805,22 @@
{
if (routecode != "" && routecode != null)
{
- search += "and code like '%'+@partcode+'%' ";
+ search += "and A.code like '%'+@partcode+'%' ";
dynamicParams.Add("@routecode", routecode);
}
if (routename != "" && routename != null)
{
- search += "and name like '%'+@routename+'%' ";
+ search += "and A.name like '%'+@routename+'%' ";
dynamicParams.Add("@routename", routename);
}
if (description != "" && description != null)
{
- search += "and description=@description ";
+ search += "and A.description=@description ";
dynamicParams.Add("@description", description);
}
if (createuser != "" && createuser != null)
{
- search += "and lm_user=@createuser ";
+ search += "and U.username=@createuser ";
dynamicParams.Add("@createuser", createuser);
}
if (search == "")
@@ -794,9 +829,9 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select id,code,name,description,enable,lm_user,lm_date
- from TFlw_Rout
- where is_delete<>'1' " + search;
+ var sql = @"select A.id,A.code,A.name,A.description,A.enable,U.username as lm_user,A.lm_date from TFlw_Rout A
+ left join TUser U on A.lm_user=U.usercode
+ where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -871,6 +906,17 @@
{
if (opertype == "Add")
{
+ var sql0 = @"select * from TFlw_Rout where code=@code";
+ dynamicParams.Add("@code", json.code);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
//鏂板宸ヨ壓璺嚎琛�
sql = @"insert into TFlw_Rout(code,name,description,enable,lm_user,lm_date) values(@code,@name,@description,@enable,@lm_user,@lm_date)";
list.Add(new { str = sql, parm = new { code = json.code, name = json.name, description = json.description, enable = json.enable, lm_user = username, lm_date = DateTime.Now.ToString() } });
@@ -1026,27 +1072,27 @@
{
if (stepcode != "" && stepcode != null)
{
- search += "and stepcode like '%'+@stepcode+'%' ";
+ search += "and A.stepcode like '%'+@stepcode+'%' ";
dynamicParams.Add("@stepcode", stepcode);
}
if (stepname != "" && stepname != null)
{
- search += "and stepname like '%'+@stepname+'%' ";
+ search += "and A.stepname like '%'+@stepname+'%' ";
dynamicParams.Add("@stepname", stepname);
}
if (enable != "" && enable != null)
{
- search += "and enable=@enable ";
+ search += "and A.enable=@enable ";
dynamicParams.Add("@enable", enable);
}
if (steptypecode != "" && steptypecode != null)
{
- search += "and flwtype=@steptypecode ";
+ search += "and A.flwtype=@steptypecode ";
dynamicParams.Add("@steptypecode", steptypecode);
}
if (createuser != "" && createuser != null)
{
- search += "and lm_user=@createuser ";
+ search += "and U.username=@createuser ";
dynamicParams.Add("@createuser", createuser);
}
if (search == "")
@@ -1055,9 +1101,9 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select id,stepcode,stepname,flwtype,enable,descr,lm_user,lm_date,is_eqp,is_defect
- from TStep
- where is_delete<>'1' " + search;
+ var sql = @"select A.id,A.stepcode,A.stepname,A.flwtype,A.enable,A.descr,U.username as lm_user,A.lm_date,A.is_eqp,A.is_defect from TStep A
+ left join TUser U on A.lm_user=U.usercode
+ where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -1083,6 +1129,17 @@
{
if (operType == "Add")
{
+ var sql0 = @"select * from TStep where stepcode=@stepcode";
+ dynamicParams.Add("@stepcode", stepcode);
+ var data = DapperHelper.selectdata(sql0, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触,缂栫爜閲嶅!";
+ mes.data = null;
+ return mes;
+ }
var sql = @"insert into TStep(stepcode,stepname,flwtype,enable,descr,lm_user,lm_date)
values(@stepcode,@stepname,@steptypecode,@enable,@description,@username,@CreateDate)";
dynamicParams.Add("@stepcode", stepcode);
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index 2f7a694..8041161 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -5,6 +5,7 @@
using System.Data.SqlClient;
using System.Linq;
using System.Web;
+using VueWebApi.Models;
using VueWebApi.Tools;
namespace VueWebApi.DLL.DAL
@@ -20,7 +21,7 @@
#region[ERP璁㈠崟鏌ヨ]
- public static ToMessage ErpOrderSearch(string erporderstus, string erpordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string creatuser, string createstartdate, string createenddate, int endNum, string prop, string order)
+ public static ToMessage ErpOrderSearch(string erporderstus, string erpordercode, 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 = "";
@@ -53,19 +54,19 @@
}
if (paydatestartdate != "" && paydatestartdate != null)
{
- search += "and A.paydate between @paydatestartdate and @paydateenddate ";
- dynamicParams.Add("@paydatestartdate", paydatestartdate+" 00:00:00");
+ search += "and A.planstartdate between @paydatestartdate and @paydateenddate ";
+ dynamicParams.Add("@paydatestartdate", paydatestartdate + " 00:00:00");
dynamicParams.Add("@paydateenddate", paydateenddate + " 23:59:59");
}
- if (createstartdate != "" && createstartdate != null)
+ if (paydatestartdate1 != "" && paydatestartdate1 != null)
{
- search += "and A.createdate between @createstartdate and @createenddate ";
- dynamicParams.Add("@createstartdate", createstartdate);
- dynamicParams.Add("@createenddate", createenddate + " 23:59:59");
+ search += "and A.planenddate between @paydatestartdate1 and @paydateenddate2 ";
+ dynamicParams.Add("@paydatestartdate1", paydatestartdate1);
+ dynamicParams.Add("@paydateenddate2", paydateenddate2 + " 23:59:59");
}
if (creatuser != "" && creatuser != null)
{
- search += "and A.createuser like '%'+@creatuser+'%' ";
+ search += "and U.username like '%'+@creatuser+'%' ";
dynamicParams.Add("@creatuser", creatuser);
}
@@ -76,11 +77,13 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select A.status,A.wo,A.materiel_code as partcode,B.partname,B.partspec,A.qty,A.relse_qty,A.wkshp_code,C.org_name as wkshp_name,
- A.stck_code,D.name as stck_name,A.paydate,A.createuser,A.createdate
+ A.stck_code,D.name as stck_name,A.planstartdate,A.planenddate,U.username as createuser,A.createdate
from TKimp_Ewo A
left join TMateriel_Info B on A.materiel_code=B.partcode
left join TOrganization C on A.wkshp_code=C.org_code
- left join T_Sec_Stck D on A.stck_code=D.code where A.is_delete<>'1' " + search;
+ left join T_Sec_Stck D on A.stck_code=D.code
+ left join TUser U on A.createuser=U.usercode
+ where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -328,7 +331,7 @@
}
if (creatuser != "" && creatuser != null)
{
- search += "and A.lm_user like '%'+@creatuser+'%' ";
+ search += "and U.username like '%'+@creatuser+'%' ";
dynamicParams.Add("@creatuser", creatuser);
}
@@ -339,13 +342,15 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select A.status,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.plan_qty,A.wkshp_code,C.org_name as wkshp_name,
- A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.m_po,A.lm_user,A.lm_date
+ A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.m_po,U.username as lm_user,A.lm_date
from TK_Wrk_Man A
left join TMateriel_Info B on A.materiel_code=B.partcode
left join TOrganization C on A.wkshp_code=C.org_code
left join T_Sec_Stck D on A.stck_code=D.code
left join TFlw_Rout E on A.route_code=E.code
- left join T_Sec_Stck F on A.stck_code=F.code where A.is_delete<>'1' " + search;
+ left join T_Sec_Stck F on A.stck_code=F.code
+ left join TUser U on A.lm_user=U.usercode
+ where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -567,7 +572,7 @@
planenddate = planenddate,
status = "ALLO", //娲惧彂
username = username,
- routecode= routecode,
+ routecode = routecode,
CreateDate = DateTime.Now.ToString()
}
});
@@ -802,9 +807,9 @@
sql = @"select * from TStep where stepcode=@stepcode";
dynamicParams.Add("@stepcode", stepcode);
var data0 = DapperHelper.selectdata(sql, dynamicParams);
- if (data0.Rows.Count > 0)
+ if (data0.Rows.Count > 0)
{
- if (data0.Rows[0]["FLWTYPE"].ToString() == "W")
+ if (data0.Rows[0]["FLWTYPE"].ToString() == "W")
{
mes.code = "300";
mes.count = 0;
@@ -1130,7 +1135,7 @@
dynamicParams.Add("@usercode", usercode);
}
//鐝粍鑾峰彇浜哄憳鍒楄〃
- sql = @"select usercode,username from TUser where is_delete<>'1' "+search;
+ sql = @"select usercode,username from TUser where is_delete<>'1' " + search;
dynamicParams.Add("@usercode", usercode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
@@ -1183,7 +1188,7 @@
left join TCustomer C on A.eqp_code=C.code
where A.step_code=@stepcode and A.style='W'";
dynamicParams.Add("@stepcode", stepcode);
- var data = DapperHelper.selectdata(sql,dynamicParams);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -1353,7 +1358,7 @@
list.Add(new { str = sql, parm = new { m_id = int.Parse(data.Rows[0]["ID"].ToString()), eqp_code = eqpcode, report_person = arra[i], report_date = date, report_qty = reportqty, usergroup_code = usergroupcode, ng_qty = ngqty, style = "B", lm_user = username, lm_date = date } });
}
- if (badcode != "" && ngqty != "0")
+ if (badcode != "" && ngqty != "0")
{
//鍐欏叆缂洪櫡璁板綍琛�
for (int i = 0; i < arra1.Length; i++)
@@ -1399,7 +1404,7 @@
//鍥炲啓宸ュ崟宸ュ簭琛ㄥ悎鏍兼暟閲忋�佷笉鑹暟閲�
sql = @"update TK_Wrk_Step set good_qty=good_qty+@reportqty,ng_qty=ng_qty+@ngqty where wo_code=@mesordercode and step_code=@stepcode";
- list.Add(new { str = sql, parm = new { mesordercode = mesordercode, stepcode = stepcode,reportqty=reportqty,ngqty=ngqty } });
+ list.Add(new { str = sql, parm = new { mesordercode = mesordercode, stepcode = stepcode, reportqty = reportqty, ngqty = ngqty } });
//鍥炲啓宸ュ崟琛ㄥ悎鏍兼暟閲忋�佷笉鑹暟閲�
sql = @"update TK_Wrk_Man set good_qty=good_qty+@reportqty,ng_qty=ng_qty+@ngqty where wo_code=@mesordercode";
@@ -1617,5 +1622,187 @@
}
#endregion'
+ #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭痌
+ public static ToMessage MesOrderStepCheckSearch(string orderstepqrcode)
+ {
+ var sql = "";
+ string ordercode = "";
+ string stepcode = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ if (orderstepqrcode != "" && orderstepqrcode != null)
+ {
+ string[] arra = orderstepqrcode.Split(';');
+ if (arra.Length == 1) //宸ュ崟鍙蜂簩缁寸爜
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "璇锋壂鎻忓伐搴忔潯鐮�!";
+ mes.data = null;
+ return mes;
+ }
+ if (arra.Length == 2) //宸ュ崟鍙�+宸ュ簭鍙蜂簩缁寸爜
+ {
+ ordercode = arra[0]; //鑾峰彇鎸囧畾瀛楃涓插墠闈㈢殑瀛楃
+ stepcode = arra[1]; //鑾峰彇鎸囧畾瀛楃涓插墠闈㈢殑瀛楃
+ }
+ //閫氳繃鎵弿浜岀淮鐮佷俊鎭煡鎵句换鍔′俊鎭�
+ sql = @"select A.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname
+ from TK_Wrk_Step A
+ inner join TK_Wrk_Man P on A.wo_code=P.wo_code
+ left join TMateriel_Info M on P.materiel_code=M.partcode
+ left join TStep S on A.step_code=S.stepcode
+ where A.wo_code=@wo_code and A.step_code=@stepcode";
+ dynamicParams.Add("@wo_code", ordercode);
+ dynamicParams.Add("@stepcode", stepcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ return mes;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鐢熶骇浠诲姟涓嶅瓨鍦�!";
+ mes.data = null;
+ return mes;
+ }
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "浜岀淮鐮佷俊鎭负绌�!";
+ mes.data = null;
+ return mes;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠岃幏鍙栨楠屾爣鍑嗕笅鎷夋鏁版嵁]
+ public static ToMessage MesOrderStepCheckSelect()
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇宸ュ簭妫�楠屾爣鍑�
+ sql = @"select code,name from TStepCheckStandard where is_delete<>'1'";
+ var data = DapperHelper.selecttable(sql);
+ 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 MesOrderStepCheckItemList(string checkstandcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鏍规嵁妫�楠屾爣鍑嗙紪鐮佽幏鍙栧伐搴忔楠岄」鐩�
+ sql = @"select B.code,B.name,A.stepcheckitem_desc,A.stepcheckitem_seq from TStepCheckStandardSub A
+ left join TStepCheckItem B on A.stepcheckitem_code=B.code
+ where B.is_delete<>'1' and A.stepstaned_code=@checkstandcode";
+ dynamicParams.Add("@checkstandcode", checkstandcode);
+ 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 SaveMesOrderStepCheckItem(string mesordercode, string partcode, string stepcode, string checkstanedcode, string checkuser, string checktypecode, string checkresult, string checkdescr, string username, List<StepCheck> json)
+ {
+ var sql = "";
+ string[] arra = new string[] { };
+ string[] arra1 = new string[] { };
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ string date = DateTime.Now.ToString(); //鑾峰彇绯荤粺鏃堕棿
+
+ list.Clear();
+
+ //鍐欏叆宸ュ簭妫�楠岃褰曚富琛�
+ sql = @"insert into TStepCheckRecord(wo_code,part_code,step_code,checkstaned_code,check_user,check_type,check_result,check_descr,lm_user,lm_date)
+ values(@mesordercode,@partcode,@stepcode,@checkstanedcode,@checkuser,@checktypecode,@checkresult,@checkdescr,@lm_user,@lm_date)";
+ list.Add(new { str = sql, parm = new { mesordercode = mesordercode, partcode = partcode, stepcode = stepcode, checkstanedcode = checkstanedcode, checkuser = checkuser, checktypecode = checktypecode, checkresult = checkresult, checkdescr = checkdescr, lm_user = username, lm_date = date } });
+ //鍐欏叆宸ュ簭妫�楠岃褰曞瓙琛�
+ //鑾峰彇涓昏〃鏈�澶D
+ sql = @"select IDENT_CURRENT('TStepCheckRecord')+1 as id";
+ var dt = DapperHelper.selecttable(sql);
+ for (int i = 0; i < json.Count; i++)
+ {
+ sql = @"insert into TStepCheckRecordSub(m_id,checkiem_seq,checkitem_code,checkitem_name,checkitem_descr,check_result,lm_user,lm_date)
+ values(@m_id,@checkiem_seq,@checkitem_code,@checkitem_name,@checkitem_descr,@check_result,@lm_user,@lm_date)";
+ list.Add(new { str = sql, parm = new { m_id = int.Parse(dt.Rows[0]["ID"].ToString()), checkiem_seq = int.Parse(json[i].seq), checkitem_code = json[i].code, checkitem_name = json[i].name, checkitem_descr = json[i].descr, check_result = json[i].checkresult, lm_user = username, lm_date = date } });
+
+ }
+
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "妫�楠屾垚鍔�!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "妫�楠屽け璐�!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/QualityManagementDAL.cs b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
index f0cf516..aee0a95 100644
--- a/VueWebApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
@@ -29,23 +29,25 @@
{
if (defectcode != "" && defectcode != null)
{
- search += "and code=@defectcode ";
+ search += "and A.code=@defectcode ";
dynamicParams.Add("@defectcode", defectcode);
}
if (defectname != "" && defectname != null)
{
- search += "and name like '%'+@defectname+'%' ";
+ search += "and A.name like '%'+@defectname+'%' ";
dynamicParams.Add("@defectname", defectname);
}
if (defectdescr != "" && defectdescr != null)
{
- search += "and descr like '%'+@defectdescr+'%' ";
+ search += "and A.descr like '%'+@defectdescr+'%' ";
dynamicParams.Add("@defectdescr", defectdescr);
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select code,name,descr,lm_user,lm_date from TDefect where is_delete<>'1' " + search;
+ var sql = @"select A.code,A.name,A.descr,U.username as lm_user,A.lm_date from TDefect A
+ left join TUser U on A.lm_user=U.usercode
+ where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -61,6 +63,7 @@
}
return mes;
}
+
#endregion
#region[璐ㄩ噺绠＄悊锛岀己闄峰畾涔夋柊澧炪�佺紪杈戞彁浜
@@ -208,23 +211,25 @@
{
if (stanedcode != "" && stanedcode != null)
{
- search += "and code=@stanedcode ";
+ search += "and A.code=@stanedcode ";
dynamicParams.Add("@stanedcode", stanedcode);
}
if (stanedname != "" && stanedname != null)
{
- search += "and name like '%'+@stanedname+'%' ";
+ search += "and A.name like '%'+@stanedname+'%' ";
dynamicParams.Add("@stanedname", stanedname);
}
if (staneddescr != "" && staneddescr != null)
{
- search += "and descr like '%'+@staneddescr+'%' ";
+ search += "and A.descr like '%'+@staneddescr+'%' ";
dynamicParams.Add("@staneddescr", staneddescr);
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select code,name,descr,lm_user,lm_date from TStepCheckStandard where is_delete<>'1' " + search;
+ var sql = @"select A.code,A.name,A.descr,U.username as lm_user,A.lm_date from TStepCheckStandard A
+ left join TUser U on A.lm_user=U.usercode
+ where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -255,12 +260,21 @@
where code=@defectcode and is_delete<>'1'";
dynamicParams.Add("@defectcode", defectcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
-
RoutEdit rout = new RoutEdit();
- rout.code = data.Rows[0]["CODE"].ToString();
- rout.name = data.Rows[0]["NAME"].ToString();
- rout.description = data.Rows[0]["DESCR"].ToString();
-
+ if (data.Rows.Count > 0)
+ {
+ rout.code = data.Rows[0]["CODE"].ToString();
+ rout.name = data.Rows[0]["NAME"].ToString();
+ rout.description = data.Rows[0]["DESCR"].ToString();
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏃犲伐搴忔楠屾爣鍑嗕俊鎭�!";
+ mes.data = null;
+ return mes;
+ }
//鏍规嵁宸ュ簭妫�楠屾爣鍑嗙紪鐮佽幏鍙栧叧鑱旂殑宸ュ簭妫�楠岄」鐩俊鎭�
sql = @"select B.code,B.name,A.stepcheckitem_desc from TStepCheckStandardSub A
left join TStepCheckItem B on A.stepcheckitem_code=B.code
@@ -296,6 +310,59 @@
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 DeleteStepCheckStaned(string stanedcode)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ sql = @"select * from TStepCheckRecord where checkstaned_code=@stanedcode";
+ dynamicParams.Add("@stanedcode", stanedcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "褰撳墠妫�楠屾爣鍑嗗凡鐢熸垚妫�楠岃褰�,涓嶅厑璁稿垹闄�!";
+ mes.data = null;
+ return mes;
+ }
+ //鍒犻櫎宸ュ簭妫�楠屾爣鍑嗕富琛�
+ sql = @"delete TStepCheckStandard where code=@stanedcode";
+ list.Add(new { str = sql, parm = new { stanedcode = stanedcode } });
+ //鍒犻櫎宸ュ簭妫�楠屾爣鍑嗛」鐩瓙琛�
+ sql = @"delete TStepCheckStandardSub where stepstaned_code=@stanedcode";
+ list.Add(new { str = sql, parm = new { stanedcode = stanedcode } });
+
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "宸ュ簭妫�楠屾爣鍑嗗垹闄ゆ垚鍔�!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "宸ュ簭妫�楠屾爣鍑嗗垹闄ゅけ璐�!";
+ mes.data = null;
+ }
}
catch (Exception e)
{
@@ -347,11 +414,11 @@
if (opertype == "Update")
{
//鍒犻櫎宸ュ簭妫�楠屾爣鍑嗗瓙琛�
- sql = @"delete from TStepCheckStandard where stepstaned_code=@stepstaned_code";
+ sql = @"delete from TStepCheckStandard where code=@stepstaned_code";
list.Add(new { str = sql, parm = new { stepstaned_code = json.code} });
//淇敼宸ュ簭妫�楠屾爣鍑嗕富琛�
- sql = @"update TStepCheckStandard set name=@stepstaned_name,descr=@stepstaned_desc where stepstaned_code=@stepstaned_code";
- list.Add(new { str = sql, parm = new { stepstaned_name = json.code, stepstaned_desc=json.description } });
+ sql = @"update TStepCheckStandard set name=@stepstaned_name,descr=@stepstaned_desc where code=@stepstaned_code";
+ list.Add(new { str = sql, parm = new { stepstaned_code=json.code, stepstaned_name = json.name, stepstaned_desc=json.description } });
//鏂板宸ュ簭妫�楠屾爣鍑嗗瓙琛�
for (int i = 0; i < json.Data.Rows.Count; i++)
{
@@ -400,23 +467,25 @@
{
if (itemcode != "" && itemcode != null)
{
- search += "and code=@itemcode ";
+ search += "and A.code=@itemcode ";
dynamicParams.Add("@itemcode", itemcode);
}
if (itemname != "" && itemname != null)
{
- search += "and name like '%'+@itemname+'%' ";
+ search += "and A.name like '%'+@itemname+'%' ";
dynamicParams.Add("@itemname", itemname);
}
if (itemdescr != "" && itemdescr != null)
{
- search += "and descr like '%'+@itemdescr+'%' ";
+ search += "and A.descr like '%'+@itemdescr+'%' ";
dynamicParams.Add("@itemdescr", itemdescr);
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select code,name,descr,lm_user,lm_date from TStepCheckItem where is_delete<>'1' " + search;
+ var sql = @"select A.code,A.name,A.descr,U.username as lm_user,A.lm_date from TStepCheckItem A
+ left join TUser U on A.lm_user=U.usercode
+ where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -567,5 +636,8 @@
return mes;
}
#endregion
+
+
+
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/SystemSettingDAL.cs b/VueWebApi/DLL/DAL/SystemSettingDAL.cs
index 2bb643f..b9dfafc 100644
--- a/VueWebApi/DLL/DAL/SystemSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/SystemSettingDAL.cs
@@ -45,7 +45,7 @@
var total = 0; //鎬绘潯鏁�
var sql = @"select A.right_code,A.right_name,B.prefix,B.filingdate,B.incbit from TRight A
left join T_CodeRules B on A.right_code=B.rightcode
- where A.Type='PC' and A.parent_id<>'0' " + search + "";
+ where A.Type='PC' and A.parent_id<>'0' and A.is_delete<>'1' " + search + "";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
diff --git "a/VueWebApi/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls" "b/VueWebApi/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls"
index 5f49dc5..af044dc 100644
--- "a/VueWebApi/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls"
+++ "b/VueWebApi/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls"
Binary files differ
diff --git "a/VueWebApi/Excel/\350\247\222\350\211\262\346\270\205\345\215\225.xls" "b/VueWebApi/Excel/\350\247\222\350\211\262\346\270\205\345\215\225.xls"
new file mode 100644
index 0000000..73e21a0
--- /dev/null
+++ "b/VueWebApi/Excel/\350\247\222\350\211\262\346\270\205\345\215\225.xls"
Binary files differ
diff --git a/VueWebApi/Logs/2022-07-18.TXT b/VueWebApi/Logs/2022-07-18.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2022-07-18.TXT
diff --git a/VueWebApi/Logs/2022-07-19.TXT b/VueWebApi/Logs/2022-07-19.TXT
new file mode 100644
index 0000000..e975480
--- /dev/null
+++ b/VueWebApi/Logs/2022-07-19.TXT
@@ -0,0 +1,29 @@
+ 【时间】:2022-07-19 08:16:43,306
+ 【级别】:ERROR
+ 【类名】:日志记录
+ 【线程ID】: 18
+ 【文件地址】:D:\新凯迪MES\VueWebApi\VueWebApi\Tools\LogHelper.cs 第25行
+ 【日志内容】:
+消息类型：SqlException
+消息内容：过程 h_p_IFCLD_ERPMO 没有参数，但却为该过程提供了参数。
+引发异常路径：/api/ErpSyncMes/SeaveSearchErpOrder
+引发异常的方法：OnError
+引发异常源：.Net SqlClient Data Provider 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+ 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+ 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+ 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+ 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+ 在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+ 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+ 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+ 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+ 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+ 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+ 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+ 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+ 在 Dapper.SqlMapper.ExecuteReaderWithFlagsFallback(IDbCommand cmd, Boolean wasClosed, CommandBehavior behavior)
+ 在 Dapper.SqlMapper.ExecuteReaderImpl(IDbConnection cnn, CommandDefinition& command, CommandBehavior commandBehavior, IDbCommand& cmd)
+ 在 Dapper.SqlMapper.ExecuteReader(IDbConnection cnn, String sql, Object param, IDbTransaction transaction, Nullable`1 commandTimeout, Nullable`1 commandType)
+ 在 VueWebApi.Tools.DapperHelper.IsProcedure(String sql, Object parm) 位置 D:\新凯迪MES\VueWebApi\VueWebApi\Tools\DapperHelper.cs:行号 294
+ 【日记详细】：
+---------------------------------------------------------------------------------------------------------------
diff --git a/VueWebApi/Models/StepCheck.cs b/VueWebApi/Models/StepCheck.cs
new file mode 100644
index 0000000..1c0e82e
--- /dev/null
+++ b/VueWebApi/Models/StepCheck.cs
@@ -0,0 +1,16 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace VueWebApi.Models
+{
+ public class StepCheck
+ {
+ public string seq { get; set; }
+ public string code { get; set; }
+ public string name { get; set; }
+ public string descr { get; set; }
+ public string checkresult { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/VueWebApi/Models/TreeDM.cs b/VueWebApi/Models/TreeDM.cs
index 3db13d5..6dd9d8e 100644
--- a/VueWebApi/Models/TreeDM.cs
+++ b/VueWebApi/Models/TreeDM.cs
@@ -10,6 +10,7 @@
public string code { get; set; }
public string name { get; set; }
public string flag { get; set; }
+ public string is_delete { get; set; } //鏄惁闅愯棌
public List<TreeDMOne> children { get; set; }
}
public class TreeDMOne
@@ -17,6 +18,7 @@
public string code { set; get; }
public string name { set; get; }
public string flag { get; set; }
+ public string is_delete { get; set; } //鏄惁闅愯棌
public List<TreeDMTwo> children { get; set; }
}
public class TreeDMTwo
@@ -24,5 +26,6 @@
public string code { set; get; }
public string name { set; get; }
public string flag { get; set; }
+ public string is_delete { get; set; } //鏄惁闅愯棌
}
}
\ No newline at end of file
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index c53dca1..75ace4c 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -384,13 +384,13 @@
<publishTime>11/28/2018 13:04:24</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>07/16/2022 21:11:40</publishTime>
+ <publishTime>07/20/2022 11:38:44</publishTime>
</File>
<File Include="bin/VueWebApi.dll.config">
<publishTime>06/15/2022 15:31:43</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>07/16/2022 21:11:40</publishTime>
+ <publishTime>07/20/2022 11:38:44</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
<publishTime>06/16/2022 14:26:01</publishTime>
@@ -462,7 +462,7 @@
<publishTime>06/29/2022 20:36:27</publishTime>
</File>
<File Include="Excel/鐢ㄦ埛娓呭崟.xls">
- <publishTime>06/17/2022 17:19:59</publishTime>
+ <publishTime>07/20/2022 10:52:30</publishTime>
</File>
<File Include="favicon.ico">
<publishTime>06/10/2022 08:20:24</publishTime>
diff --git a/VueWebApi/Tools/DapperHelper.cs b/VueWebApi/Tools/DapperHelper.cs
index fced6ea..35385df 100644
--- a/VueWebApi/Tools/DapperHelper.cs
+++ b/VueWebApi/Tools/DapperHelper.cs
@@ -311,6 +311,40 @@
}
/// <summary>
+ /// Dapper鎵ц瀛樺偍杩囩▼杩斿洖datatable鏁版嵁(涓嶅甫鍙傛暟)
+ /// </summary>
+ /// <param name="sql">瀛樺偍杩囩▼鍚�</param>
+ /// <returns></returns>
+ public static bool IsProcedureNo(string sql)
+ {
+ bool result;
+ //sql璇彞
+ using (IDbConnection conn = sqlConnection())
+ {
+ try
+ {
+ DataTable table = new DataTable();
+ //var data = conn.ExecuteReader(sql, parm);
+ var res = conn.ExecuteReader(sql);//sql 瀛樺偍杩囩▼
+ result = true;
+ }
+ catch (Exception ex)
+ {
+ //鍒涘缓鏃ュ織璁板綍缁勪欢瀹炰緥
+ LogHelper.WriteLog(ex);
+ result = false;
+ throw ex;
+ }
+ finally
+ {
+ conn.Dispose();
+ conn.Close();
+ }
+ return result;
+ }
+ }
+
+ /// <summary>
/// Dapper鏌ヨ杩斿洖鏁版嵁鏉℃暟
/// </summary>
/// <param name="sql"></param>
diff --git a/VueWebApi/Tools/ImportExcelData.cs b/VueWebApi/Tools/ImportExcelData.cs
index 02621fd..34cd005 100644
--- a/VueWebApi/Tools/ImportExcelData.cs
+++ b/VueWebApi/Tools/ImportExcelData.cs
@@ -1615,44 +1615,74 @@
var dynamicParams = new DynamicParameters();
DataTable dt;
List<ExcelErro> list = new List<ExcelErro>();
- DataTable excelTable = new DataTable();
- list = ImportExcel.ExcelToTableErro(FileCode); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
- excelTable = ImportExcel.ExcelToTable(FileCode); //鑾峰彇Excel鏁版嵁
- for (int i = 0; i < excelTable.Rows.Count; i++)
+ List<DataTable> excelTable = new List<DataTable>();
+ list = ImportExcel.ExcelToTableListErro(FileCode); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+ excelTable = ImportExcel.ExcelToTableList(FileCode); //鑾峰彇Excel鏁版嵁
+ //涓昏〃
+ for (int j = 0; j < excelTable[0].Rows.Count; j++)
{
- if (excelTable.Rows[i][1].ToString().Trim() != null && excelTable.Rows[i][1].ToString().Trim() != "")
+ if (excelTable[0].Rows[j][1].ToString().Trim() != null && excelTable[0].Rows[j][1].ToString().Trim() != "")
{
- sql = @"select code from TUser where code=:code";
- dynamicParams.Add("@code", excelTable.Rows[i][1].ToString().Trim());
+ sql = @"select * from TGroup where group_code=@group_code";
+ dynamicParams.Add("@group_code", excelTable[0].Rows[j][1].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt.Rows.Count > 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
- erro.ErrorField = "{鐢ㄦ埛缂栧彿(鍞竴)}";
- erro.ErrorCont = "{鐢ㄦ埛缂栧彿(鍞竴)}瀛楁" + excelTable.Rows[i][1].ToString().Trim() + "宸插瓨鍦�";
+ erro.ErrorField = "{鐝粍缂栫爜(鍞竴)}";
+ erro.ErrorCont = "鐝粍琛�:{鐝粍缂栫爜(鍞竴)}瀛楁" + excelTable[0].Rows[j][1].ToString().Trim() + "宸插瓨鍦�";
list.Add(erro);
}
}
- if (excelTable.Rows[i][6].ToString().Trim() != null && excelTable.Rows[i][6].ToString().Trim() != "")
+ }
+ //瀛愯〃
+ for (int k = 0; k < excelTable[1].Rows.Count; k++)
+ {
+ if (excelTable[1].Rows[k][1].ToString().Trim() != null && excelTable[1].Rows[k][1].ToString().Trim() != "")
{
- sql = @"select * from(
- select org_code,org_name from TOrganization where description='D' and parent_id in (select id from TOrganization where description='F')
- union
- select org_code,org_name from TOrganization where parent_id in(select id
- from TOrganization where description='D' and parent_id in (select id from TOrganization where description='F'))
- ) as AA where AA.org_name=:name";
- dynamicParams.Add("@code", excelTable.Rows[i][3].ToString().Trim());
+ sql = @"select * from TUser where usercode=@usercode";
+ dynamicParams.Add("@usercode", excelTable[1].Rows[k][1].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{鐢ㄦ埛缂栫爜(鍞竴)}";
+ erro.ErrorCont = "鐢ㄦ埛琛�:{鐢ㄦ埛缂栫爜(鍞竴)}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "宸插瓨鍦�";
+ list.Add(erro);
+ }
+ }
+ if (excelTable[1].Rows[k][7].ToString().Trim() != null && excelTable[1].Rows[k][7].ToString().Trim() != "")
+ {
+ sql = @"select * from TOrganization where org_code=@org_code";
+ dynamicParams.Add("@org_code", excelTable[1].Rows[k][7].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt == null || dt.Rows.Count <= 0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
- erro.ErrorField = "{鎵�灞炵粍缁噠";
- erro.ErrorCont = "{鎵�灞炵粍缁噠瀛楁" + excelTable.Rows[i][3].ToString().Trim() + "涓嶅瓨鍦�";
+ erro.ErrorField = "{缁勭粐缂栫爜}";
+ erro.ErrorCont = "鐢ㄦ埛琛�:{缁勭粐缂栫爜}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "涓嶅瓨鍦�";
list.Add(erro);
}
}
+ }
+ //鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
+ var dt3 = from r in excelTable[1].AsEnumerable()
+ where !(
+ from rr in excelTable[0].AsEnumerable()
+ select rr.Field<string>("鐝粍缂栧彿(鍞竴)")
+ ).Contains(r.Field<string>("鐢ㄦ埛缁勭紪鐮�"))
+ select r;
+ List<DataRow> listRow = dt3.ToList();
+ if (listRow.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{鐢ㄦ埛缁勭紪鐮亇";
+ erro.ErrorCont = "鐢ㄦ埛琛�:{鐢ㄦ埛缁勭紪鐮亇瀛楁涓湁鍊煎湪鐝粍琛�:{鐝粍缂栧彿(鍞竴)}涓笉瀛樺湪";
+ list.Add(erro);
}
if (list.Count > 0)
{
@@ -1669,7 +1699,7 @@
{
StuCode = "200";
message = "鏁版嵁楠岃瘉鎴愬姛";
- count = excelTable.Rows.Count;
+ count = excelTable[0].Rows.Count + excelTable[1].Rows.Count;
}
return list;
}
@@ -1682,9 +1712,81 @@
StuCode = "";
count = 0;
string sql = "";
+ var dynamicParams = new DynamicParameters();
DataTable dt;
List<ExcelErro> list = new List<ExcelErro>();
-
+ List<DataTable> excelTable = new List<DataTable>();
+ list = ImportExcel.ExcelToTableListErro(FileCode); //楠岃瘉Excel鏁版嵁蹇呭～瀛楁鏄惁涓虹┖銆佸敮涓�瀛楁鏄惁閲嶅
+ excelTable = ImportExcel.ExcelToTableList(FileCode); //鑾峰彇Excel鏁版嵁
+ //涓昏〃
+ for (int j = 0; j < excelTable[0].Rows.Count; j++)
+ {
+ if (excelTable[0].Rows[j][1].ToString().Trim() != null && excelTable[0].Rows[j][1].ToString().Trim() != "")
+ {
+ sql = @"select * from TRoleType where roletype_code=@roletype_code";
+ dynamicParams.Add("@roletype_code", excelTable[0].Rows[j][1].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{瑙掕壊绫诲瀷缂栫爜(鍞竴)}";
+ erro.ErrorCont = "鐝粍琛�:{瑙掕壊绫诲瀷缂栫爜(鍞竴)}瀛楁" + excelTable[0].Rows[j][1].ToString().Trim() + "宸插瓨鍦�";
+ list.Add(erro);
+ }
+ }
+ }
+ //瀛愯〃
+ for (int k = 0; k < excelTable[1].Rows.Count; k++)
+ {
+ if (excelTable[1].Rows[k][1].ToString().Trim() != null && excelTable[1].Rows[k][1].ToString().Trim() != "")
+ {
+ sql = @"select * from TRole where role_code=@role_code";
+ dynamicParams.Add("@role_code", excelTable[1].Rows[k][1].ToString().Trim());
+ dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{瑙掕壊缂栧彿(鍞竴)}";
+ erro.ErrorCont = "瑙掕壊琛�:{瑙掕壊缂栧彿(鍞竴)}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "宸插瓨鍦�";
+ list.Add(erro);
+ }
+ }
+ }
+ //鍒ゆ柇瀛愯〃澶栭敭涓嶅瓨鍦ㄤ簬涓昏〃涓婚敭涓殑鏁版嵁
+ var dt3 = from r in excelTable[1].AsEnumerable()
+ where !(
+ from rr in excelTable[0].AsEnumerable()
+ select rr.Field<string>("瑙掕壊绫诲瀷缂栧彿(鍞竴)")
+ ).Contains(r.Field<string>("瑙掕壊绫诲瀷缂栫爜"))
+ select r;
+ List<DataRow> listRow = dt3.ToList();
+ if (listRow.Count > 0)
+ {
+ ExcelErro erro = new ExcelErro();
+ erro.RoeNumber = "/";
+ erro.ErrorField = "{瑙掕壊绫诲瀷缂栫爜}";
+ erro.ErrorCont = "瑙掕壊琛�:{瑙掕壊绫诲瀷缂栫爜}瀛楁涓湁鍊煎湪瑙掕壊绫诲瀷琛�:{瑙掕壊绫诲瀷缂栧彿(鍞竴)}涓笉瀛樺湪";
+ list.Add(erro);
+ }
+ if (list.Count > 0)
+ {
+ int index = 0;
+ foreach (ExcelErro item in list)
+ {
+ index++;
+ item.Seq = index.ToString();
+ }
+ StuCode = "300";
+ message = "鏁版嵁楠岃瘉澶辫触";
+ }
+ else
+ {
+ StuCode = "200";
+ message = "鏁版嵁楠岃瘉鎴愬姛";
+ count = excelTable[0].Rows.Count + excelTable[1].Rows.Count;
+ }
return list;
}
#endregion
@@ -2034,11 +2136,30 @@
try
{
list.Clear();
- DataTable excelTable = new DataTable();
- excelTable = ImportExcel.ExcelToTable(FileCode);
- for (int i = 0; i < excelTable.Rows.Count; i++)
+ List<DataTable> excelTable = new List<DataTable>();
+ excelTable = ImportExcel.ExcelToTableList(FileCode);
+ //瀵煎叆鐝粍
+ for (int k = 0; k < excelTable[0].Rows.Count; k++)
{
- if (excelTable.Rows[i][7].ToString().Trim() == "鍦ㄨ亴")
+ sql = @"insert into TGroup(group_code,group_name,description,lm_user,lm_date)
+ values(@group_code,@group_name,@description,@Operator,@CreateDate)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ group_code = excelTable[0].Rows[k][1].ToString().Trim(),
+ group_name = excelTable[0].Rows[k][2].ToString().Trim(),
+ description = excelTable[0].Rows[k][3].ToString().Trim(),
+ CreateDate = DateTime.Now.ToString(),
+ Operator = User
+ }
+ });
+ }
+ //瀵煎叆鐢ㄦ埛
+ for (int i = 0; i < excelTable[1].Rows.Count; i++)
+ {
+ if (excelTable[1].Rows[i][3].ToString().Trim() == "鍦ㄨ亴")
{
Enable = "Y";
}
@@ -2046,43 +2167,38 @@
{
Enable = "N";
}
- //鐐规绠℃帶
- switch (excelTable.Rows[i][8].ToString().Trim())
+ //宸ヨ祫绫诲瀷
+ switch (excelTable[1].Rows[i][8].ToString().Trim())
{
case "璁′欢鍒�":
- WageType = "1";
+ WageType = "2";
break;
case "璁℃椂鍒�":
- WageType = "2";
+ WageType = "1";
break;
default:
break;
}
- if (excelTable.Rows[i][6].ToString().Trim() != null && excelTable.Rows[i][6].ToString().Trim() != "")
- {
- sql = @"select * from(
- select org_code,org_name from TOrganization where description='D' and parent_id in (select id from TOrganization where description='F')
- union
- select org_code,org_name from TOrganization where parent_id in(select id
- from TOrganization where description='D' and parent_id in (select id from TOrganization where description='F'))
- ) as AA where AA.org_name=:name";
- dynamicParams.Add("@code", excelTable.Rows[i][3].ToString().Trim());
- dt = DapperHelper.selectdata(sql, dynamicParams);
- ZZName = dt.Rows[0]["CODE"].ToString().Trim();
- }
sql = @"insert into TUser(usercode,username,password,enable,mobile,lm_date,email,lm_user,stu_torgcode,wagetype)
values(@UserCode,@UserName,@password,@Enable,@Mobile,@CreateDate,@Email,@Operator,@StuOrg,@wagetype)";
- dynamicParams.Add("@UserCode", excelTable.Rows[i][1].ToString().Trim());
- dynamicParams.Add("@UserName", excelTable.Rows[i][2].ToString().Trim());
- dynamicParams.Add("@password", excelTable.Rows[i][3].ToString().Trim());
- dynamicParams.Add("@Enable", excelTable.Rows[i][7].ToString().Trim());
- dynamicParams.Add("@Mobile", excelTable.Rows[i][4].ToString().Trim());
- dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
- dynamicParams.Add("@Email", excelTable.Rows[i][5].ToString().Trim());
- dynamicParams.Add("@Operator", User);
- dynamicParams.Add("@StuOrg", ZZName);
- dynamicParams.Add("@wagetype", WageType);
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ UserCode = excelTable[1].Rows[i][1].ToString().Trim(),
+ UserName = excelTable[1].Rows[i][2].ToString().Trim(),
+ password= excelTable[1].Rows[i][4].ToString().Trim(),
+ Enable= Enable,
+ Mobile= excelTable[1].Rows[i][5].ToString().Trim(),
+ CreateDate= DateTime.Now.ToString(),
+ Email= excelTable[1].Rows[i][6].ToString().Trim(),
+ Operator= User,
+ StuOrg= excelTable[1].Rows[i][7].ToString().Trim(),
+ wagetype= WageType
+ }
+ });
}
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -2110,9 +2226,61 @@
{
string message = "";
StuCode = "";
+ string sql = "";
+ string ZZName = "", Enable = "", WageType = "";
+ DataTable dt;
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
try
{
-
+ list.Clear();
+ List<DataTable> excelTable = new List<DataTable>();
+ excelTable = ImportExcel.ExcelToTableList(FileCode);
+ //瀵煎叆瑙掕壊绫诲瀷
+ for (int k = 0; k < excelTable[0].Rows.Count; k++)
+ {
+ sql = @"insert into TRoleType(roletype_code,roletype_name)
+ values(@roletype_code,@roletype_name)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ roletype_code = excelTable[0].Rows[k][1].ToString().Trim(),
+ roletype_name = excelTable[0].Rows[k][2].ToString().Trim()
+ }
+ });
+ }
+ //瀵煎叆瑙掕壊
+ for (int i = 0; i < excelTable[1].Rows.Count; i++)
+ {
+ sql = @"insert into TRole(role_code,role_name,roletype_code,description,lm_user,lm_date)
+ values(@role_code,@role_name,@roletype_code,@description,@Operator,@CreateDate)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ role_code = excelTable[1].Rows[i][1].ToString().Trim(),
+ role_name = excelTable[1].Rows[i][2].ToString().Trim(),
+ roletype_code = excelTable[1].Rows[i][3].ToString().Trim(),
+ description = excelTable[1].Rows[i][4].ToString().Trim(),
+ Operator = User,
+ CreateDate = DateTime.Now.ToString()
+ }
+ });
+ }
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ StuCode = "300";
+ message = "瀵煎叆澶辫触锛�";
+ }
+ else
+ {
+ StuCode = "200";
+ message = "瀵煎叆鎴愬姛锛�";
+ }
}
catch (Exception e)
{
diff --git a/VueWebApi/Tools/ScanStartReport.cs b/VueWebApi/Tools/ScanStartReport.cs
index 27f883d..66da318 100644
--- a/VueWebApi/Tools/ScanStartReport.cs
+++ b/VueWebApi/Tools/ScanStartReport.cs
@@ -104,9 +104,10 @@
var data1 = DapperHelper.selectdata(sql, dynamicParams);
if (data1.Rows.Count > 0)
{
- string good_qty = data1.Rows[0]["GOOD_QTY"].ToString();//鎶ュ伐鏁伴噺
- string ng_qty = data1.Rows[0]["NG_QTY"].ToString();// 涓嶈壇鏁伴噺
- decimal kbqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()) - (decimal.Parse(good_qty) + decimal.Parse(ng_qty)); //鍓╀綑鍙姤宸ユ暟閲�=浠诲姟鏁伴噺-(鎶ュ伐鏁伴噺+涓嶈壇鏁伴噺)
+ decimal good_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum(); //鎶ュ伐鎬绘暟閲�
+ decimal ng_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum(); //涓嶈壇鏁伴噺
+
+ decimal kbqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()) - (good_qty + ng_qty); //鍓╀綑鍙姤宸ユ暟閲�=浠诲姟鏁伴噺-(鎶ュ伐鏁伴噺+涓嶈壇鏁伴噺)
if (kbqty <= 0)//鏃犲彲鎶ュ伐鏁伴噺
{
mes.code = "300";
@@ -119,8 +120,8 @@
{
rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //浠诲姟鏁伴噺
rt.startqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //寮�宸ユ暟閲�=浠诲姟鏁伴噺
- rt.noreportqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()) - kbqty; //鏈姤鏁伴噺=浠诲姟鏁伴噺-宸叉姤鏁伴噺
- rt.reportqty = decimal.Parse(good_qty) + decimal.Parse(ng_qty); //宸叉姤鏁伴噺=鎶ュ伐鏁伴噺-涓嶈壇鏁伴噺
+ rt.noreportqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()) - good_qty- ng_qty; //鏈姤鏁伴噺=浠诲姟鏁伴噺-宸叉姤鏁伴噺-涓嶈壇鏁伴噺
+ rt.reportqty = good_qty + ng_qty; //宸叉姤鏁伴噺=鎶ュ伐鏁伴噺-涓嶈壇鏁伴噺
mes.code = "200";
mes.count = 1;
mes.Message = "寮圭獥鎶ュ伐鐣岄潰!";
@@ -186,10 +187,11 @@
var data3 = DapperHelper.selectdata(sql, dynamicParams);
if (data3.Rows.Count > 0) //涓婇亾鏈夋姤宸�
{
- string sgood_qty = data3.Rows[0]["GOOD_QTY"].ToString();//涓婇亾鎶ュ伐鏁伴噺
- string good_qty = data2.Rows[0]["GOOD_QTY"].ToString();//鏈亾鎶ュ伐鏁伴噺
- string ng_qty = data2.Rows[0]["NG_QTY"].ToString();// 鏈亾涓嶈壇鏁伴噺
- decimal sybqty = decimal.Parse(sgood_qty) - decimal.Parse(good_qty) - decimal.Parse(ng_qty);//鏈亾鍓╀綑鍙姤鏁伴噺=涓婇亾鎶ュ伐鏁伴噺-鏈亾鎶ュ伐鏁伴噺-鏈亾涓嶈壇鏁伴噺
+ decimal sgood_qty = data3.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum(); //涓婇亾鎶ュ伐鎬绘暟閲�
+ decimal good_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum(); //鏈亾鎶ュ伐鎬绘暟閲�
+ decimal ng_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum(); //鏈亾涓嶈壇鎬绘暟閲�
+
+ decimal sybqty = sgood_qty - good_qty - ng_qty;//鏈亾鍓╀綑鍙姤鏁伴噺=涓婇亾鎶ュ伐鎬绘暟閲�-鏈亾鎶ュ伐鎬绘暟閲�-鏈亾涓嶈壇鎬绘暟閲�
if (sybqty <= 0)
{
mes.code = "300";
@@ -203,7 +205,7 @@
rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //浠诲姟鏁伴噺
rt.startqty = sybqty; //寮�宸ユ暟閲�=鏈亾鍓╀綑鍙姤鏁伴噺
rt.noreportqty = sybqty; //鏈姤鏁伴噺=鏈亾鍓╀綑鍙姤鏁伴噺
- rt.reportqty = decimal.Parse(good_qty) + decimal.Parse(ng_qty); //宸叉姤鏁伴噺=鏈亾鎶ュ伐鎬绘暟閲�+鏈亾鎶ュ伐鎬讳笉鑹�
+ rt.reportqty = good_qty + ng_qty; //宸叉姤鏁伴噺=鏈亾鎶ュ伐鎬绘暟閲�+鏈亾鎶ュ伐鎬讳笉鑹�
mes.code = "200";
mes.count = 1;
mes.Message = "寮圭獥鎶ュ伐鐣岄潰!";
@@ -229,9 +231,10 @@
if (data3.Rows.Count > 0) //涓婇亾鏈夋敹鏂�
{
decimal sqty = data3.AsEnumerable().Select(d => d.Field<decimal>("SQTY")).Sum(); //涓婇亾鏀舵枡鏁伴噺
- string good_qty = data2.Rows[0]["GOOD_QTY"].ToString();//鏈亾鎶ュ伐鏁伴噺
- string ng_qty = data2.Rows[0]["NG_QTY"].ToString();// 鏈亾涓嶈壇鏁伴噺
- decimal sybqty = sqty - decimal.Parse(good_qty) - decimal.Parse(ng_qty);//鏈亾鍓╀綑鍙姤鏁伴噺=涓婇亾鏀舵枡鏁伴噺-鏈亾鎶ュ伐鏁伴噺-鏈亾涓嶈壇鏁伴噺
+ decimal good_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum(); //鏈亾鎶ュ伐鎬绘暟閲�
+ decimal ng_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum(); //鏈亾涓嶈壇鎬绘暟閲�
+
+ decimal sybqty = sqty - good_qty - ng_qty;//鏈亾鍓╀綑鍙姤鏁伴噺=涓婇亾鏀舵枡鎬绘暟閲�-鏈亾鎶ュ伐鎬绘暟閲�-鏈亾涓嶈壇鎬绘暟閲�
if (sybqty <= 0)
{
mes.code = "300";
@@ -245,7 +248,7 @@
rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //浠诲姟鏁伴噺
rt.startqty = sybqty; //寮�宸ユ暟閲�=鏈亾鍓╀綑鍙姤鏁伴噺
rt.noreportqty = sybqty; //鏈姤鏁伴噺=鏈亾鍓╀綑鍙姤鏁伴噺
- rt.reportqty = decimal.Parse(good_qty) + decimal.Parse(ng_qty); //宸叉姤鏁伴噺=鏈亾鎶ュ伐鎬绘暟閲�+鏈亾鎶ュ伐鎬讳笉鑹�
+ rt.reportqty = good_qty + ng_qty; //宸叉姤鏁伴噺=鏈亾鎶ュ伐鎬绘暟閲�+鏈亾鎶ュ伐鎬讳笉鑹�
mes.code = "200";
mes.count = 1;
mes.Message = "寮圭獥鎶ュ伐鐣岄潰!";
@@ -273,8 +276,8 @@
var data3 = DapperHelper.selectdata(sql, dynamicParams);
if (data3.Rows.Count > 0) //涓婇亾鏈夋姤宸�
{
- string sgood_qty = data3.Rows[0]["GOOD_QTY"].ToString();//涓婇亾鎶ュ伐鏁伴噺
- decimal sybqty = decimal.Parse(sgood_qty); //鏈亾鍓╀綑鍙姤鏁伴噺=涓婇亾鎶ュ伐鏁伴噺
+ decimal sgood_qty = data3.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum(); //鏈亾鎶ュ伐鎬绘暟閲�
+ decimal sybqty = sgood_qty; //鏈亾鍓╀綑鍙姤鏁伴噺=涓婇亾鎶ュ伐鏁伴噺
rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //浠诲姟鏁伴噺
rt.startqty = sybqty; //寮�宸ユ暟閲�=鏈亾鍓╀綑鍙姤鏁伴噺
@@ -581,11 +584,11 @@
var data3 = DapperHelper.selectdata(sql, dynamicParams);
if (data3.Rows.Count > 0) //涓婇亾鏈夋姤宸�
{
- string sgood_qty = data3.Rows[0]["GOOD_QTY"].ToString();//涓婇亾鎶ュ伐鏁伴噺
+ decimal sgood_qty = data3.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum(); //鏈亾鎶ュ伐鎬绘暟閲�
decimal sqty = data1.AsEnumerable().Select(d => d.Field<decimal>("FQTY")).Sum();//鏈亾鍙戞枡鏁伴噺
decimal ng_qty = data1.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum();// 鏈亾涓嶈壇鏁伴噺
- decimal sybqty = decimal.Parse(sgood_qty) - sqty - ng_qty;//鏈亾鍓╀綑鍙彂鏁伴噺=涓婇亾鎶ュ伐鏁伴噺-鏈亾鍙戞枡鏁伴噺-鏈亾涓嶈壇鏁伴噺
+ decimal sybqty =sgood_qty - sqty - ng_qty;//鏈亾鍓╀綑鍙彂鏁伴噺=涓婇亾鎶ュ伐鏁伴噺-鏈亾鍙戞枡鏁伴噺-鏈亾涓嶈壇鏁伴噺
if (sybqty <= 0)
{
mes.code = "300";
@@ -672,9 +675,9 @@
var data3 = DapperHelper.selectdata(sql, dynamicParams);
if (data3.Rows.Count > 0) //涓婇亾鏈夋姤宸�
{
- string sgood_qty = data3.Rows[0]["GOOD_QTY"].ToString();//涓婇亾鎶ュ伐鏁伴噺
+ decimal sgood_qty = data3.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum(); //鏈亾鎶ュ伐鎬绘暟閲�
- decimal sybqty = decimal.Parse(sgood_qty);//鏈亾鍓╀綑鍙彂鏁伴噺=涓婇亾鎶ュ伐鏁伴噺
+ decimal sybqty = sgood_qty;//鏈亾鍓╀綑鍙彂鏁伴噺=涓婇亾鎶ュ伐鎬绘暟閲�
rt.planqty = decimal.Parse(data.Rows[0]["PLAN_QTY"].ToString()); //浠诲姟鏁伴噺
rt.noreportqty = sybqty; //鏈彂鏁伴噺=鍓╀綑鍙彂鏁伴噺
diff --git a/VueWebApi/Tools/SeachEncode.cs b/VueWebApi/Tools/SeachEncode.cs
index dce8c51..c265a5d 100644
--- a/VueWebApi/Tools/SeachEncode.cs
+++ b/VueWebApi/Tools/SeachEncode.cs
@@ -386,17 +386,18 @@
cmp.code = "PC";
cmp.name = "PC";
cmp.flag = "Y";
-
+ cmp.is_delete = "0";
}
else
{
cmp.code = "PC";
cmp.name = "PC";
cmp.flag = "N";
+ cmp.is_delete = "0";
}
cmp.children = new List<TreeDMOne>();
//绗簩灞�
- sql = @"select A.right_code,A.right_name,(case when C.parent_id is null then 'N' else 'Y' end) flag
+ sql = @"select A.right_code,A.right_name,(case when C.parent_id is null then 'N' else 'Y' end) flag,A.is_delete
from TRight A
left join (
select distinct A.parent_id from TRight A
@@ -412,10 +413,11 @@
cmp1.code = data2.Rows[i]["RIGHT_CODE"].ToString();
cmp1.name = data2.Rows[i]["RIGHT_NAME"].ToString();
cmp1.flag = data2.Rows[i]["FLAG"].ToString();
+ cmp1.is_delete= data2.Rows[i]["IS_DELETE"].ToString();
cmp.children.Add(cmp1);
cmp1.children = new List<TreeDMTwo>();
//绗笁灞�
- sql = @"select A.right_code,A.right_name,(case when C.right_code is null then 'N' else 'Y' end) flag
+ sql = @"select A.right_code,A.right_name,(case when C.right_code is null then 'N' else 'Y' end) flag,A.is_delete
from TRight A
left join (
select B.right_code from TRight A
@@ -431,6 +433,7 @@
cmp2.code = data3.Rows[j]["RIGHT_CODE"].ToString();
cmp2.name = data3.Rows[j]["RIGHT_NAME"].ToString();
cmp2.flag = data3.Rows[j]["FLAG"].ToString();
+ cmp2.is_delete= data3.Rows[j]["IS_DELETE"].ToString();
cmp1.children.Add(cmp2);
}
}
@@ -450,17 +453,18 @@
cmt.code = "APP";
cmt.name = "APP";
cmt.flag = "Y";
-
+ cmt.is_delete = "1";
}
else
{
cmt.code = "APP";
cmt.name = "APP";
cmt.flag = "N";
+ cmt.is_delete = "1";
}
cmt.children = new List<TreeDMOne>();
//绗簩灞�
- sql = @"select A.right_code,A.right_name,(case when C.parent_id is null then 'N' else 'Y' end) flag
+ sql = @"select A.right_code,A.right_name,(case when C.parent_id is null then 'N' else 'Y' end) flag,A.is_delete
from TRight A
left join (
select distinct A.parent_id from TRight A
@@ -476,10 +480,11 @@
cmt1.code = date2.Rows[i]["RIGHT_CODE"].ToString();
cmt1.name = date2.Rows[i]["RIGHT_NAME"].ToString();
cmt1.flag = date2.Rows[i]["FLAG"].ToString();
+ cmt1.is_delete= date2.Rows[i]["IS_DELETE"].ToString();
cmt.children.Add(cmt1);
cmt1.children = new List<TreeDMTwo>();
//绗笁灞�
- sql = @"select A.right_code,A.right_name,(case when C.right_code is null then 'N' else 'Y' end) flag
+ sql = @"select A.right_code,A.right_name,(case when C.right_code is null then 'N' else 'Y' end) flag,A.is_delete
from TRight A
left join (
select B.right_code from TRight A
@@ -495,6 +500,7 @@
cmt2.code = date3.Rows[j]["RIGHT_CODE"].ToString();
cmt2.name = date3.Rows[j]["RIGHT_NAME"].ToString();
cmt2.flag = date3.Rows[j]["FLAG"].ToString();
+ cmt2.flag= date3.Rows[j]["IS_DELETE"].ToString();
cmt1.children.Add(cmt2);
}
}
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index cfd1bae..2644a8c 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -303,6 +303,7 @@
<Compile Include="Models\RoleUserSubmit.cs" />
<Compile Include="Models\RoutEdit.cs" />
<Compile Include="Models\ScanStartReportData.cs" />
+ <Compile Include="Models\StepCheck.cs" />
<Compile Include="Models\StepDefect.cs" />
<Compile Include="Models\StepEqp.cs" />
<Compile Include="Models\TreeDG.cs" />
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 0235295..ae9d02e 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/bin/VueWebApi.xml b/VueWebApi/bin/VueWebApi.xml
index a81dd65..f1d3940 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -597,7 +597,7 @@
<param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.BasicSettingController.ImportUserExcel(System.Web.HttpPostedFileBase)">
+ <member name="M:VueWebApi.Controllers.BasicSettingController.ImportUserExcel(System.Web.HttpPostedFileBase,System.String)">
<summary>
鐢ㄦ埛娓呭崟瀵煎叆
</summary>
@@ -865,6 +865,12 @@
<param name="devicecode">璁惧缂栫爜</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ErpSyncMesController.SeaveSearchUnit">
+ <summary>
+ 鍒堕�犳ā鍨嬶細鍗曚綅鍚屾
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ErpSyncMesController.SeaveSearchInventoryClass">
<summary>
鍒堕�犳ā鍨嬶細瀛樿揣鍒嗙被鍚屾
@@ -886,6 +892,12 @@
<member name="M:VueWebApi.Controllers.ErpSyncMesController.SeaveSearchPartner">
<summary>
鍩虹璁剧疆:寰�鏉ュ崟浣嶅悓姝�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ErpSyncMesController.SeaveSearchErpOrder">
+ <summary>
+ 鐢熶骇绠＄悊锛氱敓浜ц鍗曞悓姝�
</summary>
<returns></returns>
</member>
@@ -962,7 +974,7 @@
<summary>
鐢ㄦ埛鐧诲綍
</summary>
- <param name="username">鐢ㄦ埛鍚�</param>
+ <param name="username">鐢ㄦ埛缂栫爜</param>
<param name="password">瀵嗙爜</param>
<returns></returns>
</member>
@@ -1064,9 +1076,9 @@
<param name="partcode">浜у搧缂栫爜</param>
<param name="partname">浜у搧鍚嶇О</param>
<param name="partspec">浜у搧瑙勬牸</param>
- <param name="paydate">浜や粯鏃堕棿</param>
+ <param name="paystartdate">棰勮寮�宸ユ椂闂�</param>
+ <param name="payenddate">棰勮瀹屽伐鏃堕棿</param>
<param name="creatuser">鍒涘缓浜哄憳</param>
- <param name="createdate">鍒涘缓鏃堕棿</param>
<param name="page">椤电爜</param>
<param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
<param name="prop">鎺掑簭瀛楁</param>
@@ -1257,6 +1269,33 @@
<param name="obj">鏀舵枡鎻愪氦鏁版嵁</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepCheckSearch(System.String)">
+ <summary>
+ 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭�
+ </summary>
+ <param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepCheckSelect">
+ <summary>
+ 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠岃幏鍙栨楠屾爣鍑嗕笅鎷夋鏁版嵁
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderStepCheckItemList(System.String)">
+ <summary>
+ 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾牴鎹楠屾爣鍑嗚幏鍙栨楠岄」鐩垪琛�
+ </summary>
+ <param name="checkstandcode">妫�楠屾爣鍑嗙紪鐮�</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.SaveMesOrderStepCheckItem(Newtonsoft.Json.Linq.JObject)">
+ <summary>
+ 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾彁浜や繚瀛�
+ </summary>
+ <param name="obj">鎻愪氦淇℃伅</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductModelController.StockTypeSelect">
<summary>
瀛樿揣绫诲瀷鎺ュ彛
@@ -1364,11 +1403,12 @@
<param name="partcode">鐗╂枡缂栫爜</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.ProductModelController.SaveInventoryFile(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData})">
+ <member name="M:VueWebApi.Controllers.ProductModelController.SaveInventoryFile(System.String,System.Collections.Generic.List{VueWebApi.Models.ObjectData},System.String)">
<summary>
瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦
</summary>
<param name="partcode">鐗╂枡缂栫爜</param>
+ <param name="defaultroute_code">榛樿宸ヨ壓璺嚎缂栫爜</param>
<param name="json">鎻愪氦鏁版嵁瀵硅薄</param>
<returns></returns>
</member>
@@ -1598,6 +1638,13 @@
</summary>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.QualityManagementController.DeleteStepCheckStaned(System.String)">
+ <summary>
+ 宸ュ簭妫�楠屾爣鍑嗗垹闄�
+ </summary>
+ <param name="stanedcode">stanedcode</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.QualityManagementController.AddUpdateStepCheckStaned(System.String,VueWebApi.Models.RoutEdit)">
<summary>
宸ュ簭妫�楠屾爣鍑嗘柊澧炪�佺紪杈戞彁浜�
@@ -1750,6 +1797,13 @@
<param name="parm">鍙傛暟</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Tools.DapperHelper.IsProcedureNo(System.String)">
+ <summary>
+ Dapper鎵ц瀛樺偍杩囩▼杩斿洖datatable鏁版嵁(涓嶅甫鍙傛暟)
+ </summary>
+ <param name="sql">瀛樺偍杩囩▼鍚�</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Tools.DapperHelper.selectcount(System.String,System.Object)">
<summary>
Dapper鏌ヨ杩斿洖鏁版嵁鏉℃暟
diff --git a/VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache b/VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache
index 202cf3b..7fe7046 100644
--- a/VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache
+++ b/VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-c44ce763bc75fbbb24393585b5dc481ba2772788
+019570a02b2de4ba32f7846318922052a168060f
diff --git a/VueWebApi/obj/Debug/VueWebApi.pdb b/VueWebApi/obj/Debug/VueWebApi.pdb
index 05f58f6..13b0c61 100644
--- a/VueWebApi/obj/Debug/VueWebApi.pdb
+++ b/VueWebApi/obj/Debug/VueWebApi.pdb
Binary files differ
diff --git "a/VueWebApi/obj/Release/Package/PackageTmp/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls" "b/VueWebApi/obj/Release/Package/PackageTmp/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls"
index 5f49dc5..af044dc 100644
--- "a/VueWebApi/obj/Release/Package/PackageTmp/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls"
+++ "b/VueWebApi/obj/Release/Package/PackageTmp/Excel/\347\224\250\346\210\267\346\270\205\345\215\225.xls"
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index 0235295..ae9d02e 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
index 1e1a7cd..b373bbd 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-5b4e84777a99a36edc80a7a5e9bfa2853c4cb60d
+20fce33fd342e469daac51efb4a3d8765365c620
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 0235295..ae9d02e 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3