From 7c02c8cc0af92c66f251101f7ac12840c3903bb3 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周二, 23 4月 2024 16:15:41 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
/dev/null | 69 -------
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsTask/WmsTaskService.cs | 3
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WcsToWms/WareWcsToWmsService.cs | 7
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml | 413 ---------------------------------------------
4 files changed, 5 insertions(+), 487 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
index e6bd6dc..1b5e653 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
@@ -15290,10 +15290,10 @@
</member>
<member name="T:Admin.NET.Application.WareWcsToWmsService">
<summary>
- 鎷涘晢LES WCS璋冪敤鏈嶅姟
+ WCS璋冪敤鏈嶅姟
</summary>
</member>
- <member name="M:Admin.NET.Application.WareWcsToWmsService.#ctor(Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsOrder,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsOrderDetails,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsTask,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsMaterialContainer,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.AgvTask,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsPlace,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsContainerPlace,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsMaterialStock,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsContainer,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.LesPackWarehouse,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.LesDeviceWaring,Furion.DatabaseAccessor.MasterDbContextLocator})">
+ <member name="M:Admin.NET.Application.WareWcsToWmsService.#ctor(Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsOrder,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsOrderDetails,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsTask,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsMaterialContainer,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsPlace,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsContainerPlace,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsMaterialStock,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsContainer,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.LesPackWarehouse,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.LesDeviceWaring,Furion.DatabaseAccessor.MasterDbContextLocator})">
<summary>
鏋勯�犲嚱鏁�
</summary>
@@ -17765,413 +17765,6 @@
</summary>
<returns></returns>
</member>
- <member name="T:Admin.NET.Application.AgvTaskDto">
- <summary>
- AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級杈撳嚭鍙傛暟
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskDto.TaskType">
- <summary>
- 浠诲姟绫诲瀷-鍏ュ簱;鍑哄簱
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskDto.StartPlace">
- <summary>
- 璧峰浣嶇疆
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskDto.EndPlace">
- <summary>
- 缁撴潫浣嶇疆
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskDto.AgvState">
- <summary>
- 鐘舵��
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskDto.TransportOrder">
- <summary>
- 褰撳墠鎵ц鐨勪换鍔�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskDto.TaskNo">
- <summary>
- 涓讳换鍔″彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskDto.Pid">
- <summary>
- Agv鐖禝d
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskDto.ContainerCode">
- <summary>
- 瀹瑰櫒缂栧彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskDto.WorkShopType">
- <summary>
- 鎵�灞炶溅闂�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskDto.Id">
- <summary>
- Id涓婚敭
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskDto.IssueState">
- <summary>
- 绛炬牳鐘舵��
- </summary>
- </member>
- <member name="T:Admin.NET.Application.AgvTaskSearch">
- <summary>
- AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鏌ヨ鍙傛暟
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearch.TaskType">
- <summary>
- 浠诲姟绫诲瀷-鍏ュ簱;鍑哄簱
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearch.StartPlace">
- <summary>
- 璧峰浣嶇疆
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearch.EndPlace">
- <summary>
- 缁撴潫浣嶇疆
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearch.AgvState">
- <summary>
- 鐘舵��
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearch.TransportOrder">
- <summary>
- 褰撳墠鎵ц鐨勪换鍔�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearch.TaskNo">
- <summary>
- 涓讳换鍔″彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearch.Pid">
- <summary>
- Agv鐖禝d
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearch.ContainerCode">
- <summary>
- 瀹瑰櫒缂栧彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearch.WorkShopType">
- <summary>
- 鎵�灞炶溅闂�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearch.IssueState">
- <summary>
- 绛炬牳鐘舵��
- </summary>
- </member>
- <member name="T:Admin.NET.Application.AgvTaskSearchNonPage">
- <summary>
- AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級涓嶅垎椤垫煡璇㈠弬鏁�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearchNonPage.TaskType">
- <summary>
- 浠诲姟绫诲瀷-鍏ュ簱;鍑哄簱
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearchNonPage.StartPlace">
- <summary>
- 璧峰浣嶇疆
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearchNonPage.EndPlace">
- <summary>
- 缁撴潫浣嶇疆
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearchNonPage.AgvState">
- <summary>
- 鐘舵��
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearchNonPage.TransportOrder">
- <summary>
- 褰撳墠鎵ц鐨勪换鍔�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearchNonPage.TaskNo">
- <summary>
- 涓讳换鍔″彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearchNonPage.Pid">
- <summary>
- Agv鐖禝d
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearchNonPage.ContainerCode">
- <summary>
- 瀹瑰櫒缂栧彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearchNonPage.WorkShopType">
- <summary>
- 鎵�灞炶溅闂�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskSearchNonPage.IssueState">
- <summary>
- 绛炬牳鐘舵��
- </summary>
- </member>
- <member name="T:Admin.NET.Application.AgvTaskInput">
- <summary>
- AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級杈撳叆鍙傛暟
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskInput.TaskType">
- <summary>
- 浠诲姟绫诲瀷-鍏ュ簱;鍑哄簱
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskInput.StartPlace">
- <summary>
- 璧峰浣嶇疆
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskInput.EndPlace">
- <summary>
- 缁撴潫浣嶇疆
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskInput.AgvState">
- <summary>
- 鐘舵��
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskInput.TransportOrder">
- <summary>
- 褰撳墠鎵ц鐨勪换鍔�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskInput.TaskNo">
- <summary>
- 涓讳换鍔″彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskInput.Pid">
- <summary>
- Agv鐖禝d
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskInput.ContainerCode">
- <summary>
- 瀹瑰櫒缂栧彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskInput.WorkShopType">
- <summary>
- 鎵�灞炶溅闂�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskInput.IssueState">
- <summary>
- 绛炬牳鐘舵��
- </summary>
- </member>
- <member name="T:Admin.NET.Application.AddAgvTaskInput">
- <summary>
-
- </summary>
- </member>
- <member name="T:Admin.NET.Application.DeleteAgvTaskInput">
- <summary>
-
- </summary>
- </member>
- <member name="T:Admin.NET.Application.UpdateAgvTaskInput">
- <summary>
-
- </summary>
- </member>
- <member name="P:Admin.NET.Application.UpdateAgvTaskInput.Id">
- <summary>
- Id涓婚敭
- </summary>
- </member>
- <member name="T:Admin.NET.Application.QueryeAgvTaskInput">
- <summary>
-
- </summary>
- </member>
- <member name="T:Admin.NET.Application.AgvTaskFinishInput">
- <summary>
- 寮哄埗瀹屾垚
- </summary>
- </member>
- <member name="T:Admin.NET.Application.AgvTaskOutput">
- <summary>
- AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級杈撳嚭鍙傛暟
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskOutput.TaskType">
- <summary>
- 浠诲姟绫诲瀷-鍏ュ簱;鍑哄簱
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskOutput.StartPlace">
- <summary>
- 璧峰浣嶇疆
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskOutput.EndPlace">
- <summary>
- 缁撴潫浣嶇疆
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskOutput.AgvState">
- <summary>
- 鐘舵��
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskOutput.TransportOrder">
- <summary>
- 褰撳墠鎵ц鐨勪换鍔�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskOutput.TaskNo">
- <summary>
- 涓讳换鍔″彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskOutput.Pid">
- <summary>
- Agv鐖禝d
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskOutput.ContainerCode">
- <summary>
- 瀹瑰櫒缂栧彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskOutput.WorkShopType">
- <summary>
- 鎵�灞炶溅闂�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskOutput.Id">
- <summary>
- Id涓婚敭
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AgvTaskOutput.IssueState">
- <summary>
- 绛炬牳鐘舵��
- </summary>
- </member>
- <member name="T:Admin.NET.Application.WmsAgvTaskService">
- <summary>
- AGV鍑哄叆搴撲换鍔＄鐞嗘湇鍔�
- </summary>
- </member>
- <member name="M:Admin.NET.Application.WmsAgvTaskService.#ctor(Furion.DatabaseAccessor.IRepository{Admin.NET.Core.SysDictType,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.SysDictData,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.AgvTask,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsTask,Furion.DatabaseAccessor.MasterDbContextLocator},Admin.NET.Application.ISysExcelTemplateService)">
- <summary>
- 鏋勯�犲嚱鏁�
- </summary>
- <param name="sysDictTypeRep"></param>
- <param name="sysDictDataRep"></param>
- <param name="agvTaskRep"></param>
- <param name="wmsTaskRep"></param>
- <param name="sysExcelTemplateService"></param>
- </member>
- <member name="M:Admin.NET.Application.WmsAgvTaskService.Page(Admin.NET.Application.AgvTaskSearch)">
- <summary>
- 鍒嗛〉鏌ヨAGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAgvTaskService.ListNonPageAsync(Admin.NET.Application.AgvTaskSearchNonPage)">
- <summary>
- 涓嶅垎椤垫煡璇GV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級
- </summary>
- <param name="input">AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鏌ヨ鍙傛暟</param>
- <returns>(AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級)瀹炰緥鍒楄〃</returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAgvTaskService.Add(Admin.NET.Application.AddAgvTaskInput)">
- <summary>
- 澧炲姞AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAgvTaskService.Delete(Admin.NET.Application.DeleteAgvTaskInput)">
- <summary>
- 鍒犻櫎AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAgvTaskService.Update(Admin.NET.Application.UpdateAgvTaskInput)">
- <summary>
- 鏇存柊AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAgvTaskService.Finish(Admin.NET.Application.AgvTaskFinishInput)">
- <summary>
- 寮哄埗瀹屾垚
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAgvTaskService.Get(Admin.NET.Application.QueryeAgvTaskInput)">
- <summary>
- 鑾峰彇AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAgvTaskService.List(Admin.NET.Application.AgvTaskInput)">
- <summary>
- 鑾峰彇AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鍒楄〃
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAgvTaskService.FromExcelAsync(Microsoft.AspNetCore.Http.IFormFile,Admin.NET.Core.ImportExcelType)">
- <summary>
- Excel妯℃澘瀵煎叆AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鍔熻兘
- </summary>
- <param name="file">Excel妯℃澘鏂囦欢</param>
- <param name="importExcelType">Excel瀵煎叆鏂瑰紡</param>
- <returns>瀵煎叆鐨勮褰曟暟</returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAgvTaskService.DownloadExcelTemplate(System.String)">
- <summary>
- 鏍规嵁鐗堟湰涓嬭浇AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鐨凟xcel瀵煎叆妯℃澘
- </summary>
- <param name="version">妯℃澘鐗堟湰</param>
- <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAgvTaskService.ToExcelAsync(Admin.NET.Application.AgvTaskSearchNonPage)">
- <summary>
- 鏍规嵁AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鏌ヨ鍙傛暟瀵煎嚭Excel
- </summary>
- <param name="input">AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鏌ヨ鍙傛暟</param>
- <returns>瀵煎嚭鐨凟xcel鏂囦欢</returns>
- </member>
<member name="T:Admin.NET.Application.TaskDto">
<summary>
鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級杈撳嚭鍙傛暟
@@ -18827,7 +18420,7 @@
浠诲姟绠＄悊鏈嶅姟
</summary>
</member>
- <member name="M:Admin.NET.Application.WmsTaskService.#ctor(Furion.DatabaseAccessor.IRepository{Admin.NET.Core.SysDictType,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.SysDictData,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsTask,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsWarehouseEntrance,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsOrder,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsOrderDetails,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsPlace,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsContainerPlace,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsMaterialStock,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.AgvTask,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsContainer,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsMaterialContainer,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsArea,Furion.DatabaseAccessor.MasterDbContextLocator},Admin.NET.Application.ISysExcelTemplateService)">
+ <member name="M:Admin.NET.Application.WmsTaskService.#ctor(Furion.DatabaseAccessor.IRepository{Admin.NET.Core.SysDictType,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.SysDictData,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsTask,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsWarehouseEntrance,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsOrder,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsOrderDetails,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsPlace,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsContainerPlace,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsMaterialStock,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsContainer,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsMaterialContainer,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsArea,Furion.DatabaseAccessor.MasterDbContextLocator},Admin.NET.Application.ISysExcelTemplateService)">
<summary>
鏋勯�犲嚱鏁�
</summary>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WcsToWms/WareWcsToWmsService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WcsToWms/WareWcsToWmsService.cs
index 5178d45..350bde1 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WcsToWms/WareWcsToWmsService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WcsToWms/WareWcsToWmsService.cs
@@ -14,9 +14,9 @@
namespace Admin.NET.Application
{
/// <summary>
- /// 鎷涘晢LES WCS璋冪敤鏈嶅姟
+ /// WCS璋冪敤鏈嶅姟
/// </summary>
- [ApiDescriptionSettings("鎷涘晢LES WCS璋冪敤鏈嶅姟", Name = "WareWcsToWmsService", Order = 100)]
+ [ApiDescriptionSettings("WCS璋冪敤鏈嶅姟", Name = "WareWcsToWmsService", Order = 100)]
[Route("api/[Controller]")]
public class WareWcsToWmsService : IDynamicApiController, ITransient
{
@@ -24,7 +24,6 @@
private readonly IRepository<WmsOrderDetails, MasterDbContextLocator> _wmsOrderDetailsRep;
private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
- private readonly IRepository<AgvTask, MasterDbContextLocator> _agvTaskRep;
private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
@@ -41,7 +40,6 @@
IRepository<WmsOrderDetails, MasterDbContextLocator> wmsOrderDetailsRep,
IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep,
- IRepository<AgvTask, MasterDbContextLocator> agvTaskRep,
IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
@@ -54,7 +52,6 @@
_wmsOrderDetailsRep = wmsOrderDetailsRep;
_wmsTaskRep = wmsTaskRep;
_wmsMaterialContainerRep = wmsMaterialContainerRep;
- _agvTaskRep = agvTaskRep;
_wmsPlaceRep = wmsPlaceRep;
_wmsContainerPlaceRep = wmsContainerPlaceRep;
_wmsMaterialStockRep = wmsMaterialStockRep;
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsAgvTask/Dto/AgvTaskDto.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsAgvTask/Dto/AgvTaskDto.cs
deleted file mode 100644
index e63e790..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsAgvTask/Dto/AgvTaskDto.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-锘縰sing Admin.NET.Core;
-
-namespace Admin.NET.Application
-{
- /// <summary>
- /// AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級杈撳嚭鍙傛暟
- /// </summary>
- public class AgvTaskDto
- {
- /// <summary>
- /// 浠诲姟绫诲瀷-鍏ュ簱;鍑哄簱
- /// </summary>
- public string TaskType { get; set; }
-
- /// <summary>
- /// 璧峰浣嶇疆
- /// </summary>
- public string StartPlace { get; set; }
-
- /// <summary>
- /// 缁撴潫浣嶇疆
- /// </summary>
- public string EndPlace { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- public string AgvState { get; set; }
-
- /// <summary>
- /// 褰撳墠鎵ц鐨勪换鍔�
- /// </summary>
- public string TransportOrder { get; set; }
-
- /// <summary>
- /// 涓讳换鍔″彿
- /// </summary>
- public string TaskNo { get; set; }
-
- /// <summary>
- /// Agv鐖禝d
- /// </summary>
- public long Pid { get; set; }
-
- /// <summary>
- /// 瀹瑰櫒缂栧彿
- /// </summary>
- public string ContainerCode { get; set; }
-
- /// <summary>
- /// 鎵�灞炶溅闂�
- /// </summary>
- public LesWorkShopType WorkShopType { get; set; }
-
- /// <summary>
- /// Id涓婚敭
- /// </summary>
- public long Id { get; set; }
-
- /// <summary>
- /// 绛炬牳鐘舵��
- /// </summary>
- public IssueState IssueState { get; set; }
- }
-}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsAgvTask/Dto/AgvTaskInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsAgvTask/Dto/AgvTaskInput.cs
deleted file mode 100644
index c44729f..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsAgvTask/Dto/AgvTaskInput.cs
+++ /dev/null
@@ -1,215 +0,0 @@
-锘縰sing System.ComponentModel.DataAnnotations;
-using Admin.NET.Core;
-using Admin.NET.Core.Service;
-
-namespace Admin.NET.Application
-{
- /// <summary>
- /// AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鏌ヨ鍙傛暟
- /// </summary>
- public class AgvTaskSearch : PageInputBase
- {
- /// <summary>
- /// 浠诲姟绫诲瀷-鍏ュ簱;鍑哄簱
- /// </summary>
- public virtual string TaskType { get; set; }
-
- /// <summary>
- /// 璧峰浣嶇疆
- /// </summary>
- public virtual string StartPlace { get; set; }
-
- /// <summary>
- /// 缁撴潫浣嶇疆
- /// </summary>
- public virtual string EndPlace { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- public virtual string AgvState { get; set; }
-
- /// <summary>
- /// 褰撳墠鎵ц鐨勪换鍔�
- /// </summary>
- public virtual string TransportOrder { get; set; }
-
- /// <summary>
- /// 涓讳换鍔″彿
- /// </summary>
- public virtual string TaskNo { get; set; }
-
- /// <summary>
- /// Agv鐖禝d
- /// </summary>
- public virtual long? Pid { get; set; }
-
- /// <summary>
- /// 瀹瑰櫒缂栧彿
- /// </summary>
- public virtual string ContainerCode { get; set; }
-
- /// <summary>
- /// 鎵�灞炶溅闂�
- /// </summary>
- public virtual LesWorkShopType WorkShopType { get; set; }
-
- /// <summary>
- /// 绛炬牳鐘舵��
- /// </summary>
- public virtual IssueState IssueState { get; set; }
- }
-
- /// <summary>
- /// AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級涓嶅垎椤垫煡璇㈠弬鏁�
- /// </summary>
- public class AgvTaskSearchNonPage : PageInputNonPageBase
- {
- /// <summary>
- /// 浠诲姟绫诲瀷-鍏ュ簱;鍑哄簱
- /// </summary>
- public virtual string? TaskType { get; set; }
-
- /// <summary>
- /// 璧峰浣嶇疆
- /// </summary>
- public virtual string? StartPlace { get; set; }
-
- /// <summary>
- /// 缁撴潫浣嶇疆
- /// </summary>
- public virtual string? EndPlace { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- public virtual string? AgvState { get; set; }
-
- /// <summary>
- /// 褰撳墠鎵ц鐨勪换鍔�
- /// </summary>
- public virtual string? TransportOrder { get; set; }
-
- /// <summary>
- /// 涓讳换鍔″彿
- /// </summary>
- public virtual string? TaskNo { get; set; }
-
- /// <summary>
- /// Agv鐖禝d
- /// </summary>
- public virtual long? Pid { get; set; }
-
- /// <summary>
- /// 瀹瑰櫒缂栧彿
- /// </summary>
- public virtual string? ContainerCode { get; set; }
-
- /// <summary>
- /// 鎵�灞炶溅闂�
- /// </summary>
- public virtual LesWorkShopType? WorkShopType { get; set; }
-
- /// <summary>
- /// 绛炬牳鐘舵��
- /// </summary>
- public virtual IssueState? IssueState { get; set; }
- }
-
- /// <summary>
- /// AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級杈撳叆鍙傛暟
- /// </summary>
- public class AgvTaskInput
- {
- /// <summary>
- /// 浠诲姟绫诲瀷-鍏ュ簱;鍑哄簱
- /// </summary>
- public virtual string TaskType { get; set; }
-
- /// <summary>
- /// 璧峰浣嶇疆
- /// </summary>
- public virtual string StartPlace { get; set; }
-
- /// <summary>
- /// 缁撴潫浣嶇疆
- /// </summary>
- public virtual string EndPlace { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- public virtual string AgvState { get; set; }
-
- /// <summary>
- /// 褰撳墠鎵ц鐨勪换鍔�
- /// </summary>
- public virtual string TransportOrder { get; set; }
-
- /// <summary>
- /// 涓讳换鍔″彿
- /// </summary>
- public virtual string TaskNo { get; set; }
-
- /// <summary>
- /// Agv鐖禝d
- /// </summary>
- public virtual long Pid { get; set; }
-
- /// <summary>
- /// 瀹瑰櫒缂栧彿
- /// </summary>
- public virtual string ContainerCode { get; set; }
-
- /// <summary>
- /// 鎵�灞炶溅闂�
- /// </summary>
- public virtual LesWorkShopType WorkShopType { get; set; }
-
- /// <summary>
- /// 绛炬牳鐘舵��
- /// </summary>
- public virtual IssueState IssueState { get; set; }
- }
-
- /// <summary>
- ///
- /// </summary>
- public class AddAgvTaskInput : AgvTaskInput
- {
- }
-
- /// <summary>
- ///
- /// </summary>
- public class DeleteAgvTaskInput : BaseId
- {
- }
-
- /// <summary>
- ///
- /// </summary>
- public class UpdateAgvTaskInput : AgvTaskInput
- {
- /// <summary>
- /// Id涓婚敭
- /// </summary>
- [Required(ErrorMessage = "Id涓婚敭涓嶈兘涓虹┖")]
- public long Id { get; set; }
- }
-
- /// <summary>
- ///
- /// </summary>
- public class QueryeAgvTaskInput : BaseId
- {
-
- }
-
- /// <summary>
- /// 寮哄埗瀹屾垚
- /// </summary>
- public class AgvTaskFinishInput : BaseId
- {
- }
-}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsAgvTask/Dto/AgvTaskOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsAgvTask/Dto/AgvTaskOutput.cs
deleted file mode 100644
index 24ef8ce..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsAgvTask/Dto/AgvTaskOutput.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-锘縰sing Admin.NET.Core;
-
-namespace Admin.NET.Application
-{
- /// <summary>
- /// AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級杈撳嚭鍙傛暟
- /// </summary>
- public class AgvTaskOutput
- {
- /// <summary>
- /// 浠诲姟绫诲瀷-鍏ュ簱;鍑哄簱
- /// </summary>
- public string TaskType { get; set; }
-
- /// <summary>
- /// 璧峰浣嶇疆
- /// </summary>
- public string StartPlace { get; set; }
-
- /// <summary>
- /// 缁撴潫浣嶇疆
- /// </summary>
- public string EndPlace { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- public string AgvState { get; set; }
-
- /// <summary>
- /// 褰撳墠鎵ц鐨勪换鍔�
- /// </summary>
- public string TransportOrder { get; set; }
-
- /// <summary>
- /// 涓讳换鍔″彿
- /// </summary>
- public string TaskNo { get; set; }
-
- /// <summary>
- /// Agv鐖禝d
- /// </summary>
- public long Pid { get; set; }
-
- /// <summary>
- /// 瀹瑰櫒缂栧彿
- /// </summary>
- public string ContainerCode { get; set; }
-
- /// <summary>
- /// 鎵�灞炶溅闂�
- /// </summary>
- public LesWorkShopType WorkShopType { get; set; }
-
- /// <summary>
- /// Id涓婚敭
- /// </summary>
- public long Id { get; set; }
-
- /// <summary>
- /// 绛炬牳鐘舵��
- /// </summary>
- public IssueState IssueState { get; set; }
- }
-}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsAgvTask/WmsAgvTaskService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsAgvTask/WmsAgvTaskService.cs
deleted file mode 100644
index aaef017..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsAgvTask/WmsAgvTaskService.cs
+++ /dev/null
@@ -1,311 +0,0 @@
-锘縰sing Furion.DatabaseAccessor;
-using Furion.DependencyInjection;
-using Furion.DynamicApiController;
-using Furion.FriendlyException;
-using Mapster;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using System.Linq.Dynamic.Core;
-using System.Text;
-using System.Web;
-using Admin.NET.Core;
-
-namespace Admin.NET.Application
-{
- /// <summary>
- /// AGV鍑哄叆搴撲换鍔＄鐞嗘湇鍔�
- /// </summary>
- [ApiDescriptionSettings("浠撳簱浣滀笟", Name = "WmsAgvTask", Order = 103)]
- [Route("api/[Controller]")]
- public class WmsAgvTaskService : IDynamicApiController, ITransient
- {
- private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
- private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
- private readonly IRepository<AgvTask, MasterDbContextLocator> _agvTaskRep;
- private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
- private readonly ISysExcelTemplateService _sysExcelTemplateService;
- private readonly static object _lock = new();
-
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- /// <param name="sysDictTypeRep"></param>
- /// <param name="sysDictDataRep"></param>
- /// <param name="agvTaskRep"></param>
- /// <param name="wmsTaskRep"></param>
- /// <param name="sysExcelTemplateService"></param>
- public WmsAgvTaskService(
- IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep,
- IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep,
- IRepository<AgvTask, MasterDbContextLocator> agvTaskRep,
- IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
- ISysExcelTemplateService sysExcelTemplateService
- )
- {
- _sysDictTypeRep = sysDictTypeRep;
- _sysDictDataRep = sysDictDataRep;
- _agvTaskRep = agvTaskRep;
- _wmsTaskRep = wmsTaskRep;
- _sysExcelTemplateService = sysExcelTemplateService;
- }
-
- /// <summary>
- /// 鍒嗛〉鏌ヨAGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("page")]
- public async Task<PageResult<AgvTaskOutput>> Page([FromQuery] AgvTaskSearch input)
- {
- var agvTasks = await _agvTaskRep.DetachedEntities
- .Where(u => u.WorkShopType == LesWorkShopType.FAPAOCHEJIAN)
- .Where(!string.IsNullOrEmpty(input.TaskType), u => u.TaskType == input.TaskType)
- .Where(!string.IsNullOrEmpty(input.AgvState), u => u.AgvState == input.AgvState)
- .Where(!string.IsNullOrEmpty(input.TransportOrder), u => EF.Functions.Like(u.TransportOrder, $"%{input.TransportOrder.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.TaskNo), u => EF.Functions.Like(u.TaskNo, $"%{input.TaskNo.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.ContainerCode), u => EF.Functions.Like(u.ContainerCode, $"%{input.ContainerCode.Trim()}%"))
- .OrderBy(PageInputOrder.OrderBuilder<AgvTaskSearch>(input))
- .ProjectToType<AgvTaskOutput>()
- .ToADPagedListAsync(input.PageNo, input.PageSize);
-
- foreach (var item in agvTasks.Rows)
- {
- if (item.AgvState == "PRISTINE") item.AgvState = "寰呮墽琛�";
- else if (item.AgvState == "TRAVELLING") item.AgvState = "鎵ц涓�";
- else item.AgvState = "瀹屾垚";
- }
-
- return agvTasks;
- }
-
- /// <summary>
- /// 涓嶅垎椤垫煡璇GV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級
- /// </summary>
- /// <param name="input">AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鏌ヨ鍙傛暟</param>
- /// <returns>(AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級)瀹炰緥鍒楄〃</returns>
- [HttpGet("listNonPage")]
- public async Task<List<AgvTaskOutput>> ListNonPageAsync([FromQuery] AgvTaskSearchNonPage input)
- {
- var pTaskType = input.TaskType?.Trim() ?? "";
- var pAgvState = input.AgvState?.Trim() ?? "";
- var pTransportOrder = input.TransportOrder?.Trim() ?? "";
- var pTaskNo = input.TaskNo?.Trim() ?? "";
- var pContainerCode = input.ContainerCode?.Trim() ?? "";
- var agvTasks = await _agvTaskRep.DetachedEntities
- .Where(u => u.WorkShopType == LesWorkShopType.FAPAOCHEJIAN)
- .Where(!string.IsNullOrEmpty(pTaskType), u => u.TaskType == pTaskType)
- .Where(!string.IsNullOrEmpty(pAgvState), u => u.AgvState == pAgvState)
- .Where(!string.IsNullOrEmpty(pTransportOrder), u => EF.Functions.Like(u.TransportOrder, $"%{pTransportOrder}%"))
- .Where(!string.IsNullOrEmpty(pTaskNo), u => EF.Functions.Like(u.TaskNo, $"%{pTaskNo}%"))
- .Where(!string.IsNullOrEmpty(pContainerCode), u => EF.Functions.Like(u.ContainerCode, $"%{pContainerCode}%"))
- .OrderBy(PageInputOrder.OrderNonPageBuilder(input))
- .ProjectToType<AgvTaskOutput>()
- .ToListAsync();
- return agvTasks;
- }
-
- /// <summary>
- /// 澧炲姞AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("add")]
- public async Task Add(AddAgvTaskInput input)
- {
- var agvTask = input.Adapt<AgvTask>();
- await _agvTaskRep.InsertAsync(agvTask);
- }
-
- /// <summary>
- /// 鍒犻櫎AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("delete")]
- public async Task Delete(DeleteAgvTaskInput input)
- {
- var agvTask = await _agvTaskRep.FirstOrDefaultAsync(u => u.Id == input.Id);
- await _agvTaskRep.DeleteAsync(agvTask);
- }
-
- /// <summary>
- /// 鏇存柊AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("edit")]
- public async Task Update(UpdateAgvTaskInput input)
- {
- var isExist = await _agvTaskRep.AnyAsync(u => u.Id == input.Id, false);
- if (!isExist) throw Oops.Oh(ErrorCode.D3000);
-
- var agvTask = input.Adapt<AgvTask>();
- await _agvTaskRep.UpdateAsync(agvTask, ignoreNullValues: true);
- }
-
- /// <summary>
- /// 寮哄埗瀹屾垚
- /// </summary>
- /// <returns></returns>
- [HttpPost("finish")]
- [UnitOfWork]
- public async Task Finish([FromBody] AgvTaskFinishInput input)
- {
- var wareAgvTask = await _agvTaskRep.FirstOrDefaultAsync(z => z.Id == input.Id);
- if (wareAgvTask == null) throw Oops.Oh("AGV浠诲姟涓嶅瓨鍦紒");
- if (wareAgvTask.AgvState == "FINISHED") throw Oops.Oh("AGV浠诲姟宸插畬鎴愶紒");
-
- if (wareAgvTask.TaskType == "鍏ュ簱") //鍏ュ簱
- {
- // 鏇存柊AGV浠诲姟鐘舵��
- wareAgvTask.AgvState = "FINISHED";
- await _agvTaskRep.UpdateAsync(wareAgvTask);
-
- // 鏌ヨ浠诲姟淇℃伅
- var taskModel = await _wmsTaskRep.FirstOrDefaultAsync(p => p.TaskNo == wareAgvTask.TaskNo);
- if (taskModel == null) throw Oops.Oh("涓讳换鍔′笉瀛樺湪锛�");
- if (taskModel.TaskStatus == TaskStatusEnum.WANCHENG) throw Oops.Oh("涓讳换鍔″凡瀹屾垚锛�");
-
- // 鏇存柊浠诲姟琛╓CS鏄惁鍙互璇诲彇涓篢rue锛岃澶囦换鍔＄姸鎬佷负鈥滄墽琛屼腑-AGV鈥�
- taskModel.IsRead = true;
- taskModel.TaskDodeviceStatus = TaskDodeviceStatusEnum.ZX_AGV;
- await _wmsTaskRep.UpdateAsync(taskModel);
- }
- else if (wareAgvTask.TaskType == "鍑哄簱") //鍑哄簱
- {
-
- }
- else //绉诲簱
- {
-
- }
- }
-
- /// <summary>
- /// 鑾峰彇AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("detail")]
- public async Task<AgvTaskOutput> Get([FromQuery] QueryeAgvTaskInput input)
- {
- return (await _agvTaskRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<AgvTaskOutput>();
- }
-
- /// <summary>
- /// 鑾峰彇AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鍒楄〃
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("list")]
- public async Task<List<AgvTaskOutput>> List([FromQuery] AgvTaskInput input)
- {
- return await _agvTaskRep.DetachedEntities.ProjectToType<AgvTaskOutput>().ToListAsync();
- }
-
- /// <summary>
- /// Excel妯℃澘瀵煎叆AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鍔熻兘
- /// </summary>
- /// <param name="file">Excel妯℃澘鏂囦欢</param>
- /// <param name="importExcelType">Excel瀵煎叆鏂瑰紡</param>
- /// <returns>瀵煎叆鐨勮褰曟暟</returns>
- [HttpPost("fromExcel")]
- public async Task<int> FromExcelAsync(IFormFile file, [FromQuery] ImportExcelType importExcelType)
- {
- int size = 200;
- var excelTemplate = await _sysExcelTemplateService.GetByAppNameAndClassNameAndVersionAsync("AgvTask", "v2");
- if (excelTemplate == null) throw Oops.Oh(ErrorCode.Excel002);
- var keys = excelTemplate.UnionUniqueFields.Split(",") ?? Array.Empty<string>();
- for (var i = 0; i < keys.Length; i++)
- {
- keys[i] = keys[i]?.Trim() ?? string.Empty;
- }
- ExcelUtil.FromExcel(file, excelTemplate.HeadStartLine, excelTemplate.DataStartLine, out List<string> headers, out List<List<object?>> data, out string sheetName);
- List<AgvTaskOutput> agvTaskList = DataConvertUtil.ToObjectList(headers, data, sheetName, keys, excelTemplate?.DataStartLine ?? 2, out Dictionary<string, AgvTaskOutput> dict);
- List<Dictionary<string, object>> uniqueKeyValueDictList = agvTaskList.ParseUniqueKeyValueDictList(keys.ToList(), excelTemplate?.DataStartLine ?? 2, sheetName);
- var filters = DataConvertUtil.GetExpressionListByUniqueDict<AgvTask>(keys.ToList(), uniqueKeyValueDictList, size);
- var selectKeys = keys.ToList();
- if (!selectKeys.Contains("Id")) selectKeys.Add("Id");
- var selector = DataConvertUtil.GetSelectExpressionListByUniqueDict<AgvTask, AgvTaskOutput>(selectKeys);
- List<AgvTask> updates = new();
- List<AgvTask> adds = new();
-
- lock (_lock)
- {
- foreach (var filter in filters)
- {
- var agvTaskExistSubList = _agvTaskRep.Where(filter).Select(selector).ToList();
- agvTaskExistSubList.ForEach(x =>
- {
- var k = DataConvertUtil.GetKey(x, keys);
- if (dict.ContainsKey(k)) dict[k].Id = x.Id;
- });
- }
-
- foreach (var agvTask in agvTaskList)
- {
- if (agvTask.Id > 0)
- {
- if (importExcelType == ImportExcelType.ADD_AND_UPDATE) updates.Add(agvTask.Adapt<AgvTask>());
- }
- else
- {
- adds.Add(agvTask.Adapt<AgvTask>());
- }
- }
-
- if (importExcelType == ImportExcelType.ADD_AND_UPDATE) updates.ForEach(x => _agvTaskRep.Update(x));
- var maxId = _agvTaskRep.DetachedEntities.OrderByDescending(x => x.Id).Select(x => x.Id).FirstOrDefault();
- adds.ForEach(x => x.Id = ++maxId);
- Db.GetDbContext().Set<AgvTask>().AddRange(adds);
- Db.GetDbContext().SaveChanges();
- }
-
- await Task.CompletedTask;
- return adds.Count;
- }
-
- /// <summary>
- /// 鏍规嵁鐗堟湰涓嬭浇AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鐨凟xcel瀵煎叆妯℃澘
- /// </summary>
- /// <param name="version">妯℃澘鐗堟湰</param>
- /// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
- [HttpGet("downloadExcelTemplate")]
- public async Task<IActionResult> DownloadExcelTemplate([FromQuery] string version)
- {
- var excelTemplate = await _sysExcelTemplateService.GetByAppNameAndClassNameAndVersionAsync("AgvTask", version);
- if (excelTemplate == null) throw Oops.Oh(ErrorCode.Excel002);
- var path = Path.Combine(@"\", excelTemplate.TemplateFileName);
- Stream ms = FileUtil.Download(path, excelTemplate.TemplateFileName);
- var fileName = HttpUtility.UrlEncode($"{excelTemplate.Name}瀵煎叆妯℃澘.xlsx", Encoding.GetEncoding("UTF-8"));
- return new FileStreamResult(ms, "application/octet-stream") { FileDownloadName = fileName };
- }
-
- /// <summary>
- /// 鏍规嵁AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鏌ヨ鍙傛暟瀵煎嚭Excel
- /// </summary>
- /// <param name="input">AGV鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鏌ヨ鍙傛暟</param>
- /// <returns>瀵煎嚭鐨凟xcel鏂囦欢</returns>
- [HttpGet("toExcel")]
- public async Task<IActionResult> ToExcelAsync([FromQuery] AgvTaskSearchNonPage input)
- {
- var agvTaskList = await ListNonPageAsync(input);
- MemoryStream ms = new();
- DataConvertUtil.ToExcelData(agvTaskList, _sysDictTypeRep, _sysDictDataRep, out List<string> headers,
- out List<List<object>> data, out string sheetName);
- var excelTemplate = await _sysExcelTemplateService.GetByAppNameAndClassNameAndVersionAsync("AgvTask", "v1");
- if (excelTemplate != null)
- {
- ExcelUtil.ToExcel(excelTemplate.TemplateFileName, headers, data, sheetName, excelTemplate.HeadStartLine, excelTemplate.DataStartLine, ms);
- }
- else
- {
- ExcelUtil.ToExcel(headers, data, sheetName, ms);
- }
- ms.Position = 0;
- var fileName = HttpUtility.UrlEncode($"{sheetName}[{DateTimeOffset.Now:yyyy-MM-dd}].xlsx", Encoding.GetEncoding("UTF-8"));
- return new FileStreamResult(ms, "application/octet-stream") { FileDownloadName = fileName };
- }
- }
-}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsTask/WmsTaskService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsTask/WmsTaskService.cs
index 7a7bccc..878ea9f 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsTask/WmsTaskService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsTask/WmsTaskService.cs
@@ -31,7 +31,6 @@
private readonly IRepository<WmsOrderDetails, MasterDbContextLocator> _wmsOrderDetailsRep;
private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
- private readonly IRepository<AgvTask, MasterDbContextLocator> _agvTaskRep;
private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
@@ -51,7 +50,6 @@
IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
- IRepository<AgvTask, MasterDbContextLocator> agvTaskRep,
IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep,
IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
@@ -67,7 +65,6 @@
_wmsPlaceRep = wmsPlaceRep;
_wmsContainerPlaceRep = wmsContainerPlaceRep;
_wmsMaterialStockRep = wmsMaterialStockRep;
- _agvTaskRep = agvTaskRep;
_wmsContainerRep = wmsContainerRep;
_wmsMaterialContainerRep = wmsMaterialContainerRep;
_wmsAreaRep= wmsAreaRep;
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsOrder/WmsReceiptOrder/Dto/TextFile1.txt b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsOrder/WmsReceiptOrder/Dto/TextFile1.txt
deleted file mode 100644
index 526f8ff..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsOrder/WmsReceiptOrder/Dto/TextFile1.txt
+++ /dev/null
@@ -1 +0,0 @@
-锘縶"Status":true,"Data":[{"NO":"ZG-IN2024011087","TradeMode":1,"Vendorcode":"913206116744352385","StoreRoomname":"浼熸湰浠撻棿","Companyname":"鎷涘晢灞�閲嶅伐锛堟睙鑻忥級鏈夐檺鍏徃","SOID":435787750,"SourceBillNo":"SHTZ202401160001","Vendorname":"鍗楅�氬垱浼熻埞鑸堕厤浠舵湁闄愬叕鍙�","WarehouseCentername":"浼熸湰WMS","Dtls":[{"tradename":"","CustomsUnitName":"","TheoreticalWeight":0.000,"SumPrice":238.94,"SingleLength":0.000,"OID":435787751,"Materialcode":"10624028","Unit":"EA","Materialname":"FPSO绠″す\\S1鍨� 閫傜敤绠″緞:桅114.3 鏉愯川:45# 琛ㄩ潰澶勭悊:鐑蹈閿� 鍘傚鏍囧噯","TACode":"CMHI-287P00000P00402M","SpecialNeeds":"","ContractCode":"CMHI-287缁煎悎鍚堝悓","Price":79.646018,"Qty":3.000000,"ItemNo":0,"ProjectCode":"00.120199.CMHI-287","CustomsNum":0.00,"CustomsPrices":0.00},{"tradename":"","CustomsUnitName":"","TheoreticalWeight":0.000,"SumPrice":146.90,"SingleLength":0.000,"OID":435787752,"Materialcode":"10564701","Unit":"EA","Materialname":"FPSO绠″す\\S3-B鍨� 閫傜敤绠″緞:桅114.3 鏉愯川:AH36 琛ㄩ潰澶勭悊:鐑蹈閿� 鍘傚鏍囧噯","TACode":"CMHI-287P00000P00402M","SpecialNeeds":"","ContractCode":"CMHI-287缁煎悎鍚堝悓","Price":146.902655,"Qty":1.000000,"ItemNo":0,"ProjectCode":"00.120199.CMHI-287","CustomsNum":0.00,"CustomsPrices":0.00}],"DeclarationCode":"","Majorname":"浼熸湰娴嬭瘯涓撲笟","Billdate":"2024-01-16","WarehouseKeepername":"闄嗘槬涓�"}],"Result":"鎴愬姛"}
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/Agv/AgvTask.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/Agv/AgvTask.cs
deleted file mode 100644
index 9ff7c2c..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/Agv/AgvTask.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-锘縰sing Microsoft.EntityFrameworkCore;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Admin.NET.Core
-{
- /// <summary>
- /// Agv浠诲姟琛�
- /// </summary>
- [Comment("Agv浠诲姟琛�")]
- [Table("les_agv_task")]
- public class AgvTask : DEntityBase
- {
- /// <summary>
- /// 浠诲姟绫诲瀷-鍏ュ簱;鍑哄簱
- /// </summary>
- [Comment("浠诲姟绫诲瀷-鍏ュ簱;鍑哄簱")]
- [MaxLength(10)]
- public string TaskType { get; set; }
-
- /// <summary>
- /// 璧峰浣嶇疆
- /// </summary>
- [Comment("璧峰浣嶇疆")]
- [MaxLength(50)]
- public string StartPlace { get; set; }
-
- /// <summary>
- /// 璧峰鍚嶇О
- /// </summary>
- [Comment("璧峰鍚嶇О")]
- [MaxLength(50)]
- public string StartName { get; set; }
-
- /// <summary>
- /// 缁撴潫浣嶇疆
- /// </summary>
- [Comment("缁撴潫浣嶇疆")]
- [MaxLength(50)]
- public string EndPlace { get; set; }
-
- /// <summary>
- /// 缁撴潫鍚嶇О
- /// </summary>
- [Comment("缁撴潫鍚嶇О")]
- [MaxLength(50)]
- public string EndName { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// PRISTINE锛氬緟鎵ц
- /// TRAVELLING锛氭墽琛屼腑
- /// FINISHED锛氬畬鎴�
- /// </summary>
- [Comment("鐘舵��")]
- [MaxLength(50)]
- public string AgvState { get; set; }
-
- /// <summary>
- /// 褰撳墠鎵ц鐨勪换鍔�
- /// </summary>
- [Comment("褰撳墠鎵ц鐨勪换鍔�")]
- [MaxLength(100)]
- public string TransportOrder { get; set; }
-
- /// <summary>
- /// 涓讳换鍔″彿
- /// </summary>
- [Comment("涓讳换鍔″彿")]
- [MaxLength(50)]
- public string TaskNo { get; set; }
-
- /// <summary>
- /// Agv鐖禝d
- /// </summary>
- [Comment("Agv鐖禝d")]
- public long Pid { get; set; }
-
- /// <summary>
- /// 瀹瑰櫒缂栧彿
- /// </summary>
- [Comment("瀹瑰櫒缂栧彿")]
- [MaxLength(50)]
- public string ContainerCode { get; set; }
-
- /// <summary>
- /// 鎵�灞炶溅闂�
- /// </summary>
- [Comment("鎵�灞炶溅闂�")]
- public LesWorkShopType WorkShopType { get; set; }
-
-
- /// <summary>
- /// 璧峰搴撲綅鍚嶇О
- /// </summary>
- [Comment("璧峰搴撲綅鍚嶇О")]
- [MaxLength(50)]
- public string SourcePlaceName { get; set; }
- }
-}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/Agv/AgvWaring.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/Agv/AgvWaring.cs
deleted file mode 100644
index 7567f21..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/Agv/AgvWaring.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-锘縰sing Microsoft.EntityFrameworkCore;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Admin.NET.Core
-{
- /// <summary>
- /// Agv鎶ヨ
- /// </summary>
- [Comment("Agv鎶ヨ")]
- [Table("les_agv_waring")]
- public class AgvWaring : DEntityBase
- {
- /// <summary>
- /// 鍞竴缂栫爜
- /// </summary>
- [Comment("鍞竴缂栫爜")]
- [MaxLength(10)]
- public string Code { get; set; }
-
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- [Comment("浠诲姟鍙�")]
- [MaxLength(100)]
- public string TransportOrder { get; set; }
-
- /// <summary>
- /// agv灏忚溅缂栧彿
- /// </summary>
- [Comment("agv灏忚溅缂栧彿")]
- [MaxLength(10)]
- public string AgvCarCode { get; set; }
-
- /// <summary>
- /// 鏁呴殰鍐呭
- /// </summary>
- [Comment("鏁呴殰鍐呭")]
- [MaxLength(50)]
- public string FaultText { get; set; }
-
- /// <summary>
- /// 鏁呴殰鏃堕棿
- /// </summary>
- [Comment("鏁呴殰鏃堕棿")]
- [MaxLength(50)]
- public DateTimeOffset? StartTime { get; set; }
-
- /// <summary>
- /// 鏄惁瑙ｅ喅
- /// </summary>
- [Comment("鏄惁瑙ｅ喅")]
- [MaxLength(50)]
- public YesOrNot YesOrNot { get; set; }
-
- /// <summary>
- /// WCS鏄惁鍙互璇诲彇
- /// </summary>
- [Comment("WCS鏄惁鍙互璇诲彇")]
- [Required]
- public bool IsRead { get; set; } = true;
-
- /// <summary>
- /// 鎵�灞炶溅闂�
- /// </summary>
- [Comment("鎵�灞炶溅闂�")]
- public LesWorkShopType WorkShopType { get; set; }
- }
-}
--
Gitblit v1.9.3