From 7ff74f599084561338eef1230db5aa45f74565f8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 15 四月 2024 18:03:33 +0800
Subject: [PATCH] 1.ERP订单关闭增加单据id 2.MES工单关闭增加源单id关联

---
 VueWebCoreApi/DLL/BLL/DeviceManagerBLL.cs |  141 +++++++++++++++++++++++-----------------------
 1 files changed, 71 insertions(+), 70 deletions(-)

diff --git a/VueWebCoreApi/DLL/BLL/DeviceManagerBLL.cs b/VueWebCoreApi/DLL/BLL/DeviceManagerBLL.cs
index f16ac38..9359db2 100644
--- a/VueWebCoreApi/DLL/BLL/DeviceManagerBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/DeviceManagerBLL.cs
@@ -10,34 +10,8 @@
 {
     public class DeviceManagerBLL
     {
-        #region[璁惧绫诲瀷鏌ヨ]
-        public static ToMessage DeviceTypeSearch(int startNum, int endNum, string prop, string order)
-        {
-            return DeviceManagerDAL.DeviceTypeSearch(startNum, endNum, prop, order);
-        }
-        #endregion
 
-        #region[璁惧绫诲瀷鏂板]
-        public static ToMessage AddUpdateDeviceType(List<ObjectDataCont> json, string username)
-        {
-            return DeviceManagerDAL.AddUpdateDeviceType(json, username);
-        }
-        #endregion
-
-        #region[璁惧绫诲瀷鍒犻櫎]
-        public static ToMessage DeleteDeviceType(string devicetypecode)
-        {
-            return DeviceManagerDAL.DeleteDeviceType(devicetypecode);
-        }
-        #endregion
-
-
-        #region[璁惧绫诲瀷涓嬫媺妗嗘帴鍙
-        public static ToMessage DeviceTypeSelect()
-        {
-            return DeviceManagerDAL.DeviceTypeSelect();
-        }
-        #endregion
+        
 
         #region[璁惧缁勬煡璇
         public static ToMessage DeviceGroupSearch(int startNum, int endNum, string prop, string order)
@@ -82,28 +56,55 @@
         }
         #endregion
 
+
+
+
+
+
+
+
+        #region[璁惧绫诲瀷鏌ヨ]
+        public static ToMessage DeviceTypeSearch()
+        {
+            return DeviceManagerDAL.DeviceTypeSearch();
+        }
+        #endregion
+
+        #region[璁惧绫诲瀷鏂板]
+        public static ToMessage AddUpdateDeviceType(string OperType, List<ObjectDataCont> json, User us)
+        {
+            return DeviceManagerDAL.AddUpdateDeviceType(OperType,json, us);
+        }
+        #endregion
+
+        #region[璁惧绫诲瀷鍒犻櫎]
+        public static ToMessage DeleteDeviceType(string devicetypecode, User us)
+        {
+            return DeviceManagerDAL.DeleteDeviceType(devicetypecode,us);
+        }
+        #endregion
+
+
         #region [璁惧娓呭崟鏌ヨ]
-        public static ToMessage DeviceMangerSearch(string stu_torgcode, string description, string deviceCode, string deviceName, string status, string workShop, string deviceType, string deviceGroup, int startNum, int endNum, string prop, string order)
+        public static ToMessage DeviceMangerSearch(string devicecode, string devicename, string status, string storgcode, string devicetype, int startNum, int endNum, string prop, string order)
         {
-            return DeviceManagerDAL.DeviceMangerSearch(stu_torgcode, description, deviceCode, deviceName, status, workShop, deviceType, deviceGroup, startNum, endNum, prop, order);
+            return DeviceManagerDAL.DeviceMangerSearch(devicecode, devicename, status, storgcode, devicetype, startNum, endNum, prop, order);
         }
         #endregion
 
-        #region[璁惧娓呭崟鏂板缂栬緫]
-        public static ToMessage AddUpdateDeviceManger(string deviceid, string devicecode, string devicename, string devicetype, string devicegroup, string importdate, string workshop, string linecode, string status, string ratio, string usercode, string operType)
+        #region[璁惧淇℃伅鏂板缂栬緫]
+        public static ToMessage AddUpdateDeviceManger(string devicecode, string devicename, string devicetype, string storgcode, string status, string OperType, User us)
         {
-            return DeviceManagerDAL.AddUpdateDeviceManger(deviceid, devicecode, devicename, devicetype, devicegroup, importdate, workshop, linecode, status, ratio, usercode, operType);
+            return DeviceManagerDAL.AddUpdateDeviceManger(devicecode, devicename, devicetype, storgcode, status, OperType, us);
         }
         #endregion
 
-        #region[璁惧娓呭崟鍒犻櫎]
-        public static ToMessage DeleteDeviceManger(string devicecode)
+        #region[璁惧淇℃伅鍒犻櫎]
+        public static ToMessage DeleteDeviceManger(string devicecode,User us)
         {
-            return DeviceManagerDAL.DeleteDeviceManger(devicecode);
+            return DeviceManagerDAL.DeleteDeviceManger(devicecode,us);
         }
         #endregion
-
-
 
 
         #region[璁惧鐐规椤瑰垪琛ㄦ煡璇
@@ -114,9 +115,9 @@
         #endregion
 
         #region[璁惧鐐规椤规柊澧炵紪杈慮
-        public static ToMessage AddUpdateDeviceCheckItem(string checkitemid, string checkitemcode, string checkitemname, string checkitemdescr, string cycle, string isqrcode, string usercode, string operType)
+        public static ToMessage AddUpdateDeviceCheckItem(string checkitemid, string checkitemcode, string checkitemname, string checkitemdescr, string cycle, string isqrcode, User us, string operType)
         {
-            return DeviceManagerDAL.AddUpdateDeviceCheckItem(checkitemid, checkitemcode, checkitemname, checkitemdescr, cycle, isqrcode, usercode, operType);
+            return DeviceManagerDAL.AddUpdateDeviceCheckItem(checkitemid, checkitemcode, checkitemname, checkitemdescr, cycle, isqrcode, us, operType);
         }
         #endregion
 
@@ -136,9 +137,9 @@
         #endregion
 
         #region[璁惧淇濆吇椤规柊澧炵紪杈慮
-        public static ToMessage AddUpdateDeviceMaiItem(string maiitemid, string maiitemcode, string maiitemname, string maiitemdescr, string isqrcode, string usercode, string operType)
+        public static ToMessage AddUpdateDeviceMaiItem(string maiitemid, string maiitemcode, string maiitemname, string maiitemdescr, string isqrcode, User us, string operType)
         {
-            return DeviceManagerDAL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, isqrcode, usercode, operType);
+            return DeviceManagerDAL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, isqrcode, us, operType);
         }
         #endregion
 
@@ -152,9 +153,9 @@
 
 
         #region[璁惧鐐规鏍囧噯鍒楄〃鏌ヨ]
-        public static ToMessage DeviceCheckStandArdSearch(string stu_torgcode, string stu_torgtypecode, string checkstandcode, string checkstandname, string checkcontr, int startNum, int endNum, string prop, string order)
+        public static ToMessage DeviceCheckStandArdSearch(User us, string checkstandcode, string checkstandname, string checkcontr, int startNum, int endNum, string prop, string order)
         {
-            return DeviceManagerDAL.DeviceCheckStandArdSearch(stu_torgcode, stu_torgtypecode, checkstandcode, checkstandname, checkcontr, startNum, endNum, prop, order);
+            return DeviceManagerDAL.DeviceCheckStandArdSearch(us, checkstandcode, checkstandname, checkcontr, startNum, endNum, prop, order);
         }
         #endregion
 
@@ -173,9 +174,9 @@
         #endregion
 
         #region[璁惧鐐规鏍囧噯鏂板缂栬緫]
-        public static ToMessage AddUpdateDeviceCheckStandArd(string opertype, RoutEdit json, string username)
+        public static ToMessage AddUpdateDeviceCheckStandArd(string opertype, RoutEdit json, User us)
         {
-            return DeviceManagerDAL.AddUpdateDeviceCheckStandArd(opertype, json, username);
+            return DeviceManagerDAL.AddUpdateDeviceCheckStandArd(opertype, json, us);
         }
         #endregion
 
@@ -187,25 +188,25 @@
         #endregion
 
         #region[璁惧鐐规鏍囧噯鍏宠仈宸ヤ綔绔欐煡璇
-        public static ToMessage DeviceCheckStanedAssociationEqp(string stu_torgcode, string description, string checkstand_code)
+        public static ToMessage DeviceCheckStanedAssociationEqp(User us, string checkstand_code)
         {
-            return DeviceManagerDAL.DeviceCheckStanedAssociationEqp(stu_torgcode, description, checkstand_code);
+            return DeviceManagerDAL.DeviceCheckStanedAssociationEqp(us, checkstand_code);
         }
         #endregion
 
         #region [璁惧鐐规鏍囧噯鍏宠仈宸ヤ綔绔欐彁浜
-        public static ToMessage SaveDeviceCheckStanedAssociationEqp(string stu_torgcode, string stu_torgtypecode, string checkstand_code, string username, List<ObjectData> json)
+        public static ToMessage SaveDeviceCheckStanedAssociationEqp(User us, string checkstand_code, List<ObjectData> json)
         {
-            return DeviceManagerDAL.SaveDeviceCheckStanedAssociationEqp(stu_torgcode, stu_torgtypecode, checkstand_code, username, json);
+            return DeviceManagerDAL.SaveDeviceCheckStanedAssociationEqp(us, checkstand_code, json);
         }
         #endregion
 
 
 
         #region[璁惧淇濆吇鏍囧噯鍒楄〃鏌ヨ]
-        public static ToMessage DeviceRepairStandArdSearch(string stu_torgcode, string stu_torgtypecode, string repairstandcode, string repairstandname, string repairstanddescr, int startNum, int endNum, string prop, string order)
+        public static ToMessage DeviceRepairStandArdSearch(User us, string repairstandcode, string repairstandname, string repairstanddescr, int startNum, int endNum, string prop, string order)
         {
-            return DeviceManagerDAL.DeviceRepairStandArdSearch(stu_torgcode, stu_torgtypecode, repairstandcode, repairstandname, repairstanddescr, startNum, endNum, prop, order);
+            return DeviceManagerDAL.DeviceRepairStandArdSearch(us, repairstandcode, repairstandname, repairstanddescr, startNum, endNum, prop, order);
         }
         #endregion
 
@@ -224,9 +225,9 @@
         #endregion
 
         #region[璁惧淇濆吇鏍囧噯鏂板缂栬緫]
-        public static ToMessage AddUpdateDeviceRepairStandArd(string opertype, EqpRepair json, string username)
+        public static ToMessage AddUpdateDeviceRepairStandArd(string opertype, EqpRepair json, User us)
         {
-            return DeviceManagerDAL.AddUpdateDeviceRepairStandArd(opertype, json, username);
+            return DeviceManagerDAL.AddUpdateDeviceRepairStandArd(opertype, json, us);
         }
         #endregion
 
@@ -238,25 +239,25 @@
         #endregion
 
         #region[璁惧淇濆吇鏍囧噯鍏宠仈宸ヤ綔绔欐煡璇
-        public static ToMessage DeviceRepairStanedAssociationEqp(string stu_torgcode, string description, string repairstand_code)
+        public static ToMessage DeviceRepairStanedAssociationEqp(User us, string repairstand_code)
         {
-            return DeviceManagerDAL.DeviceRepairStanedAssociationEqp(stu_torgcode, description, repairstand_code);
+            return DeviceManagerDAL.DeviceRepairStanedAssociationEqp(us, repairstand_code);
         }
         #endregion
 
         #region [璁惧淇濆吇鏍囧噯鍏宠仈宸ヤ綔绔欐彁浜
-        public static ToMessage SaveDeviceRepairStanedAssociationEqp(string stu_torgcode, string stu_torgtypecode, string repairstand_code, string username, List<ObjectData> json)
+        public static ToMessage SaveDeviceRepairStanedAssociationEqp(User us, string repairstand_code, List<ObjectData> json)
         {
-            return DeviceManagerDAL.SaveDeviceRepairStanedAssociationEqp(stu_torgcode, stu_torgtypecode, repairstand_code, username, json);
+            return DeviceManagerDAL.SaveDeviceRepairStanedAssociationEqp(us, repairstand_code, json);
         }
         #endregion
 
 
 
         #region[璁惧鐐规璁板綍鏌ヨ]
-        public static ToMessage DeviceCheckTakeSearch(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate, int startNum, int endNum, string prop, string order)
+        public static ToMessage DeviceCheckTakeSearch(User us, string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate, int startNum, int endNum, string prop, string order)
         {
-            return DeviceManagerDAL.DeviceCheckTakeSearch(stu_torgcode, description, wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate, startNum, endNum, prop, order);
+            return DeviceManagerDAL.DeviceCheckTakeSearch(us, wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate, startNum, endNum, prop, order);
         }
         #endregion
 
@@ -268,18 +269,17 @@
         #endregion
 
         #region[璁惧鐐规璁板綍瀵煎嚭]
-        public static ToMessage DeviceCheckTakeOutExcel(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate)
+        public static ToMessage DeviceCheckTakeOutExcel(User us, string wkshopcode, string eqpcode, string eqpname, string stanedname, string checkuser, string checkopendate, string checkclosedate)
         {
-            return DeviceManagerDAL.DeviceCheckTakeOutExcel(stu_torgcode, description, wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate);
+            return DeviceManagerDAL.DeviceCheckTakeOutExcel(us, wkshopcode, eqpcode, eqpname, stanedname, checkuser, checkopendate, checkclosedate);
         }
         #endregion
 
 
-
         #region[璁惧淇濆吇璁板綍鏌ヨ]
-        public static ToMessage DeviceRepairTakeSearch(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult, int startNum, int endNum, string prop, string order)
+        public static ToMessage DeviceRepairTakeSearch(User us, string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult, int startNum, int endNum, string prop, string order)
         {
-            return DeviceManagerDAL.DeviceCheckTakeSearch(stu_torgcode, description, wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult, startNum, endNum, prop, order);
+            return DeviceManagerDAL.DeviceCheckTakeSearch(us, wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult, startNum, endNum, prop, order);
         }
         #endregion
 
@@ -291,18 +291,18 @@
         #endregion
 
         #region[璁惧淇濆吇璁板綍瀵煎嚭]
-        public static ToMessage DeviceRepairTakeOutExcel(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult)
+        public static ToMessage DeviceRepairTakeOutExcel(User us, string wkshopcode, string eqpcode, string eqpname, string stanedname, string repairuser, string repairopendate, string repairclosedate, string repairresult)
         {
-            return DeviceManagerDAL.DeviceRepairTakeOutExcel(stu_torgcode, description, wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult);
+            return DeviceManagerDAL.DeviceRepairTakeOutExcel(us, wkshopcode, eqpcode, eqpname, stanedname, repairuser, repairopendate, repairclosedate, repairresult);
         }
         #endregion
 
 
 
         #region[璁惧缁翠慨璁板綍鏌ヨ]
-        public static ToMessage DeviceUpdateSearch(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate, int startNum, int endNum, string prop, string order)
+        public static ToMessage DeviceUpdateSearch(User us, string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate, int startNum, int endNum, string prop, string order)
         {
-            return DeviceManagerDAL.DeviceUpdateSearch(stu_torgcode, description, wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate, startNum, endNum, prop, order);
+            return DeviceManagerDAL.DeviceUpdateSearch(us, wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate, startNum, endNum, prop, order);
         }
         #endregion
 
@@ -314,10 +314,11 @@
         #endregion
 
         #region[璁惧缁翠慨璁板綍瀵煎嚭]
-        public static ToMessage DeviceUpdateOutExcel(string stu_torgcode, string description, string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate)
+        public static ToMessage DeviceUpdateOutExcel(User us, string wkshopcode, string eqpcode, string eqpname, string reportuser, string repairuser, string vrifcatuser, string reportopendate, string reportclosedate, string repairopendate, string repairclosedate, string vrifcatopendate, string vrifcatclosedate)
         {
-            return DeviceManagerDAL.DeviceUpdateOutExcel(stu_torgcode, description, wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate);
+            return DeviceManagerDAL.DeviceUpdateOutExcel(us, wkshopcode, eqpcode, eqpname, reportuser, repairuser, vrifcatuser, reportopendate, reportclosedate, repairopendate, repairclosedate, vrifcatopendate, vrifcatclosedate);
         }
         #endregion
+
     }
 }

--
Gitblit v1.9.3