From f76acac54523d67590f8f07c404e005524eff464 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周二, 23 4月 2024 17:36:56 +0800
Subject: [PATCH] 修改
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsArea.cs | 11
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsOrder/WmsTakeMaterialOrder/WmsTakeMaterialOrderService.cs | 1168 ++++++++--------
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs | 135 +
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsJob/WmsTask/WmsTaskService.cs | 1140 ++++++++--------
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/CallEmpty/CallEmptyService.cs | 206 +-
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsWarehouse.cs | 11
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/ExWarehouse/ExWarehouseService.cs | 576 ++++----
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml | 616 ---------
8 files changed, 1,656 insertions(+), 2,207 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 5046de5..64481ff 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
@@ -405,43 +405,6 @@
璐﹂潰鏁伴噺
</summary>
</member>
- <member name="T:Admin.NET.Application.ExWarehouseService">
- <summary>
- 鍑哄簱绠＄悊鏈嶅姟
- </summary>
- </member>
- <member name="M:Admin.NET.Application.ExWarehouseService.#ctor(Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsArea,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsPlace,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsTask,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsContainer,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsContainerPlace,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsMaterial,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsMaterialStock,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsMaterialContainer,Furion.DatabaseAccessor.MasterDbContextLocator})">
- <summary>
- 鏋勯�犲嚱鏁�
- </summary>
- </member>
- <member name="M:Admin.NET.Application.ExWarehouseService.Page(Admin.NET.Application.ExWarehouseSearch)">
- <summary>
- 鍒嗛〉鏌ヨ鐗╂枡鍑哄簱绠＄悊淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.ExWarehouseService.AutoExWarehouse(System.Collections.Generic.List{Admin.NET.Application.ExWarehouseInput})">
- <summary>
- 鑷姩鍑哄簱
- </summary>
- <param name="inputs"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.ExWarehouseService.ManualExWarehouse(System.Collections.Generic.List{Admin.NET.Application.ExWarehouseInput})">
- <summary>
- 浜哄伐鍑哄簱
- </summary>
- <param name="inputs"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.ExWarehouseService.CallAirflare(Admin.NET.Application.CallAirflareInput)">
- <summary>
- 鍛煎彨绌烘墭
- </summary>
- <returns></returns>
- </member>
<member name="T:Admin.NET.Application.WmsAreaDto">
<summary>
搴撳尯淇℃伅杈撳嚭鍙傛暟
@@ -676,103 +639,6 @@
<summary>
绛炬牳鐘舵��
</summary>
- </member>
- <member name="T:Admin.NET.Application.WmsAreaService">
- <summary>
- 搴撳尯淇℃伅鏈嶅姟
- </summary>
- </member>
- <member name="M:Admin.NET.Application.WmsAreaService.#ctor(Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsArea,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.SysDictType,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.SysDictData,Furion.DatabaseAccessor.MasterDbContextLocator},Admin.NET.Application.ISysExcelTemplateService)">
- <summary>
- 鏋勯�犲嚱鏁�
- </summary>
- <param name="wmsAreaRep"></param>
- <param name="sysDictTypeRep"></param>
- <param name="sysDictDataRep"></param>
- <param name="sysExcelTemplateService"></param>
- </member>
- <member name="M:Admin.NET.Application.WmsAreaService.Page(Admin.NET.Application.WmsAreaSearch)">
- <summary>
- 鍒嗛〉鏌ヨ搴撳尯淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAreaService.ListNonPageAsync(Admin.NET.Application.WmsAreaSearchNonPage)">
- <summary>
- 涓嶅垎椤垫煡璇㈠簱鍖轰俊鎭垪琛�
- </summary>
- <param name="input">搴撳尯淇℃伅鏌ヨ鍙傛暟</param>
- <returns>(搴撳尯淇℃伅)瀹炰緥鍒楄〃</returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAreaService.Add(Admin.NET.Application.AddWmsAreaInput)">
- <summary>
- 澧炲姞搴撳尯淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAreaService.Delete(Admin.NET.Application.DeleteWmsAreaInput)">
- <summary>
- 鍒犻櫎搴撳尯淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAreaService.Update(Admin.NET.Application.UpdateWmsAreaInput)">
- <summary>
- 鏇存柊搴撳尯淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAreaService.Get(Admin.NET.Application.QueryeWmsAreaInput)">
- <summary>
- 鑾峰彇搴撳尯淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAreaService.List(Admin.NET.Application.WmsAreaInput)">
- <summary>
- 鑾峰彇搴撳尯淇℃伅鍒楄〃
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAreaService.TaskWmsArea">
- <summary>
- 缁勮杞﹂棿鑾峰彇搴撳尯
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAreaService.GetAreaEntranceList">
- <summary>
- 鑾峰彇浠撳簱涓嬫媺妗�
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAreaService.FromExcelAsync(Microsoft.AspNetCore.Http.IFormFile,Admin.NET.Core.ImportExcelType)">
- <summary>
- Excel妯℃澘瀵煎叆搴撳尯淇℃伅鍔熻兘
- </summary>
- <param name="file">Excel妯℃澘鏂囦欢</param>
- <param name="importExcelType">Excel瀵煎叆鏂瑰紡</param>
- <returns>瀵煎叆鐨勮褰曟暟</returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAreaService.DownloadExcelTemplate(System.String)">
- <summary>
- 鏍规嵁鐗堟湰涓嬭浇搴撳尯淇℃伅鐨凟xcel瀵煎叆妯℃澘
- </summary>
- <param name="version">妯℃澘鐗堟湰</param>
- <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
- </member>
- <member name="M:Admin.NET.Application.WmsAreaService.ToExcelAsync(Admin.NET.Application.WmsAreaSearchNonPage)">
- <summary>
- 鏍规嵁搴撳尯淇℃伅鏌ヨ鍙傛暟瀵煎嚭Excel
- </summary>
- <param name="input">搴撳尯淇℃伅鏌ヨ鍙傛暟</param>
- <returns>瀵煎嚭鐨凟xcel鏂囦欢</returns>
</member>
<member name="T:Admin.NET.Application.WmsContainerDto">
<summary>
@@ -3001,84 +2867,6 @@
<summary>
搴撳尯淇℃伅杈撳嚭鍙傛暟
</summary>
- </member>
- <member name="T:Admin.NET.Application.WmsPlaceService">
- <summary>
- 搴撲綅淇℃伅鏈嶅姟
- </summary>
- </member>
- <member name="M:Admin.NET.Application.WmsPlaceService.#ctor(Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsArea},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsPlace,Furion.DatabaseAccessor.MasterDbContextLocator})">
- <summary>
- 鏋勯�犲嚱鏁�
- </summary>
- </member>
- <member name="M:Admin.NET.Application.WmsPlaceService.Page(Admin.NET.Application.WmsPlaceSearch)">
- <summary>
- 鍒嗛〉鏌ヨ搴撲綅淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsPlaceService.AddNew(Admin.NET.Application.AddWmsPlaceInput)">
- <summary>
- 澧炲姞搴撲綅淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsPlaceService.Delete(Admin.NET.Application.DeleteWmsPlaceInput)">
- <summary>
- 鍒犻櫎搴撲綅淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsPlaceService.MoreLock(Admin.NET.Application.MoreLockInput)">
- <summary>
- 鎵归噺閿佸畾
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsPlaceService.MoreUnlock(Admin.NET.Application.MoreLockInput)">
- <summary>
- 鎵归噺瑙ｉ攣
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsPlaceService.Update(Admin.NET.Application.UpdateWmsPlaceInput)">
- <summary>
- 鏇存柊搴撲綅淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsPlaceService.Get(Admin.NET.Application.QueryeWmsPlaceInput)">
- <summary>
- 鑾峰彇搴撲綅淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsPlaceService.List(Admin.NET.Application.WmsPlaceInput)">
- <summary>
- 鑾峰彇搴撲綅淇℃伅鍒楄〃
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsPlaceService.FkWmsAreaList">
- <summary>
- 鑾峰彇WmsArea鍒楄〃
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsPlaceService.GetFAisle">
- <summary>
- 鑾峰彇鐔熷寲搴撳贩閬�
- </summary>
- <returns></returns>
</member>
<member name="T:Admin.NET.Application.WmsWarehouseEntranceDto">
<summary>
@@ -15288,86 +15076,6 @@
浠诲姟鍙�
</summary>
</member>
- <member name="T:Admin.NET.Application.WareWcsToWmsService">
- <summary>
- 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.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>
- </member>
- <member name="M:Admin.NET.Application.WareWcsToWmsService.GetSendTask">
- <summary>
- 瀹氭椂鏌ヨWCS鍙互涓嬪彂鐨勫嚭鍏ュ簱浠诲姟(10鏉�)
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WareWcsToWmsService.UpdateTask(Admin.NET.Application.UpdateTaskInput)">
- <summary>
- 鏇存柊浠诲姟淇℃伅
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WareWcsToWmsService.GetPlace(Admin.NET.Application.GetPlaceInput)">
- <summary>
- 鑾峰彇搴撲綅淇℃伅
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WareWcsToWmsService.CreateRelocation(Admin.NET.Application.CreateRelocationInput)">
- <summary>
- 鍒涘缓绉诲簱浠诲姟
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WareWcsToWmsService.CancelTask(Admin.NET.Application.FinishTaskInput)">
- <summary>
- 鍙栨秷浠诲姟
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WareWcsToWmsService.CheckPack">
- <summary>
- wcs璇诲彇鎺ュ彛鍒ゆ柇鐗╂枡鏄惁缁勭洏鍑哄簱 true浠ｈ〃宸茬粡缁勭洏鍑哄簱
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WareWcsToWmsService.AddDeviceWaring(Admin.NET.Application.AddDeviceWaringInput)">
- <summary>
- 璁惧鎶ヨ淇℃伅
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WareWcsToWmsService.GetOneRowByAisle(System.Int32)">
- <summary>
- 鏍规嵁宸烽亾鑾峰彇澶栦晶绗竴鎺�
- </summary>
- <param name="Aisle"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WareWcsToWmsService.GetTwoRowByAisle(System.Int32)">
- <summary>
- 鏍规嵁宸烽亾鑾峰彇鍐呬晶绗簩鎺�
- </summary>
- <param name="Aisle"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WareWcsToWmsService.GetThreeRowByAisle(System.Int32)">
- <summary>
- 鏍规嵁宸烽亾鑾峰彇澶栦晶绗簩鎺�
- </summary>
- <param name="Aisle"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WareWcsToWmsService.GetFourRowByAisle(System.Int32)">
- <summary>
- 鏍规嵁宸烽亾鑾峰彇澶栦晶绗竴鎺�
- </summary>
- <param name="Aisle"></param>
- <returns></returns>
- </member>
<member name="T:Admin.NET.Application.BaseCustomerService">
<summary>
瀹㈡埛妗ｆ鏈嶅姟
@@ -17645,64 +17353,6 @@
灞�
</summary>
</member>
- <member name="T:Admin.NET.Application.LocationViewService">
- <summary>
- 搴撲綅璇曞浘鏈嶅姟
- </summary>
- </member>
- <member name="M:Admin.NET.Application.LocationViewService.#ctor(Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsArea,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsPlace,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsMaterialStock,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsContainerPlace,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsContainer,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsMaterialContainer,Furion.DatabaseAccessor.MasterDbContextLocator})">
- <summary>
- 鏋勯�犲嚱鏁�
- </summary>
- </member>
- <member name="M:Admin.NET.Application.LocationViewService.GetArea">
- <summary>
- 鑾峰彇搴撳尯淇℃伅
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.LocationViewService.GetPalceAisle(Admin.NET.Application.GetPalceAisleInput)">
- <summary>
- 鏍规嵁搴撳尯鑾峰彇宸烽亾
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.LocationViewService.GetPalceRowno(Admin.NET.Application.GetPalceAisleRownoInput)">
- <summary>
- 鏍规嵁搴撳尯鍜屽贩閬撹幏鍙栨帓
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.LocationViewService.GetPalceList(Admin.NET.Application.GetPalceListInput)">
- <summary>
- 鏍规嵁搴撳尯 鎺掕幏鍙栧簱浣嶄俊鎭�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.LocationViewService.GetMaterialDetail(Admin.NET.Application.GetMaterialDetailInput)">
- <summary>
- 鏍规嵁搴撲綅鑾峰彇瀵瑰簲淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.LocationViewService.UpdatePalceIslock(Admin.NET.Application.GetMaterialDetailInput)">
- <summary>
- 淇敼搴撲綅閿佸畾淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.LocationViewService.UpdatePalceKongXian(Admin.NET.Application.GetMaterialDetailInput)">
- <summary>
- 灏嗗簱浣嶇疆涓虹┖闂�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
<member name="T:Admin.NET.Application.MaterialStockDto">
<summary>
搴撳瓨淇℃伅锛堢啛鍖栧簱锛夎緭鍑哄弬鏁�
@@ -18895,133 +18545,6 @@
<summary>
鍏ュ簱鏉ユ簮
</summary>
- </member>
- <member name="T:Admin.NET.Application.WmsTaskService">
- <summary>
- 浠诲姟绠＄悊鏈嶅姟
- </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.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>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.Page(Admin.NET.Application.WmsTaskSearch)">
- <summary>
- 鍒嗛〉鏌ヨ鍑哄叆搴撲换鍔＄鐞�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.ListNonPageAsync(Admin.NET.Application.WmsTaskSearchNonPage)">
- <summary>
- 涓嶅垎椤垫煡璇㈠嚭鍏ュ簱浠诲姟绠＄悊鍒楄〃
- </summary>
- <param name="input">鍑哄叆搴撲换鍔＄鐞嗘煡璇㈠弬鏁�</param>
- <returns>(鍑哄叆搴撲换鍔＄鐞�)瀹炰緥鍒楄〃</returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.Add(Admin.NET.Application.AddWmsTaskInput)">
- <summary>
- 澧炲姞鍑哄叆搴撲换鍔＄鐞�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.Delete(Admin.NET.Application.DeleteWmsTaskInput)">
- <summary>
- 鍒犻櫎鍑哄叆搴撲换鍔＄鐞�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.Update(Admin.NET.Application.UpdateWmsTaskInput)">
- <summary>
- 鏇存柊鍑哄叆搴撲换鍔＄鐞�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.Finish(Admin.NET.Application.WmsTaskFinishInput)">
- <summary>
- 寮哄埗瀹屾垚
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.UpwardTaskLevel(Admin.NET.Application.UpdateTaskLevelInput)">
- <summary>
- 鏇存柊浼樺厛绾�(鍚戜笂)
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.DownTaskLevel(Admin.NET.Application.UpdateTaskLevelInput)">
- <summary>
- 鏇存柊浼樺厛绾�(鍚戜笅)
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.CancelTask(Admin.NET.Application.CancelInput)">
- <summary>
- 鍙栨秷
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.BatchCancel(Admin.NET.Application.BatchCancelInput)">
- <summary>
- 鎵归噺鍙栨秷
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.BatchBreak(Admin.NET.Application.BatchBreakInput)">
- <summary>
- 鎵归噺鏆傚仠
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.BatchContinue(Admin.NET.Application.BatchContinueInput)">
- <summary>
- 鎵归噺缁х画
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.Get(Admin.NET.Application.QueryeWmsTaskInput)">
- <summary>
- 鑾峰彇鍑哄叆搴撲换鍔＄鐞�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.List(Admin.NET.Application.TaskInput)">
- <summary>
- 鑾峰彇鍑哄叆搴撲换鍔＄鐞嗗垪琛�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.FromExcelAsync(Microsoft.AspNetCore.Http.IFormFile,Admin.NET.Core.ImportExcelType)">
- <summary>
- Excel妯℃澘瀵煎叆鍑哄叆搴撲换鍔＄鐞嗗姛鑳�
- </summary>
- <param name="file">Excel妯℃澘鏂囦欢</param>
- <param name="importExcelType">Excel瀵煎叆鏂瑰紡</param>
- <returns>瀵煎叆鐨勮褰曟暟</returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.DownloadExcelTemplate(System.String)">
- <summary>
- 鏍规嵁鐗堟湰涓嬭浇鍑哄叆搴撲换鍔＄鐞嗙殑Excel瀵煎叆妯℃澘
- </summary>
- <param name="version">妯℃澘鐗堟湰</param>
- <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTaskService.ToExcelAsync(Admin.NET.Application.WmsTaskSearchNonPage)">
- <summary>
- 鏍规嵁鍑哄叆搴撲换鍔＄鐞嗘煡璇㈠弬鏁板鍑篍xcel
- </summary>
- <param name="input">鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鏌ヨ鍙傛暟</param>
- <returns>瀵煎嚭鐨凟xcel鏂囦欢</returns>
</member>
<member name="T:Admin.NET.Application.WmsDumpOrderDto">
<summary>
@@ -24174,145 +23697,6 @@
<summary>
璇锋眰鐘舵��
</summary>
- </member>
- <member name="T:Admin.NET.Application.WmsTakeMaterialOrderService">
- <summary>
- 棰嗘枡鍗曟湇鍔�
- </summary>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.Page(Admin.NET.Application.WmsTakeMaterialOrderSearch)">
- <summary>
- 鍒嗛〉鏌ヨ棰嗘枡鍗�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.ListNonPageAsync(Admin.NET.Application.WmsTakeMaterialOrderSearchNonPage)">
- <summary>
- 涓嶅垎椤垫煡璇㈤鏂欏崟鍒楄〃
- </summary>
- <param name="input">棰嗘枡鍗曟煡璇㈠弬鏁�</param>
- <returns>(棰嗘枡鍗�)瀹炰緥鍒楄〃</returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.PageDetail(Admin.NET.Application.TakePageDetailInput)">
- <summary>
- 鑾峰彇鍗曟嵁鏄庣粏
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.StockPage(Admin.NET.Application.TakeMaterialStockSearch)">
- <summary>
- 鍒嗛〉鏌ヨ鐗╂枡搴撳瓨
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.GetMaterialNoList">
- <summary>
- 鐗╂枡缂栫爜涓嬫媺妗�
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.GetProjectCodeList">
- <summary>
- 椤圭洰缂栫爜涓嬫媺妗�
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.Add(Admin.NET.Application.AddWmsTakeMaterialOrderInput)">
- <summary>
- 澧炲姞棰嗘枡鍗�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.TakeOrderAdd">
- <summary>
- 澧炲姞棰嗘枡鍗�(yigo绯荤粺鑾峰彇)
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.ReturnTakeOrder(Admin.NET.Application.ReturnTakeOrderInput)">
- <summary>
- 棰嗘枡涓嬫灦鎺ュ彛(yigo绯荤粺)
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.DistributeOrder(Admin.NET.Application.DistributeOrderInput)">
- <summary>
- 涓嬪彂棰嗘枡鍗�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.Delete(Admin.NET.Application.DeleteWmsTakeMaterialOrderInput)">
- <summary>
- 鍒犻櫎棰嗘枡鍗�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.Update(Admin.NET.Application.UpdateWmsTakeMaterialOrderInput)">
- <summary>
- 鏇存柊棰嗘枡鍗�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.Get(Admin.NET.Application.QueryeWmsTakeMaterialOrderInput)">
- <summary>
- 鑾峰彇棰嗘枡鍗�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.List(Admin.NET.Application.WmsTakeMaterialOrderInput)">
- <summary>
- 鑾峰彇棰嗘枡鍗曞垪琛�
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.FromExcelAsync(Microsoft.AspNetCore.Http.IFormFile,Admin.NET.Core.ImportExcelType)">
- <summary>
- Excel妯℃澘瀵煎叆棰嗘枡鍗曞姛鑳�
- </summary>
- <param name="file">Excel妯℃澘鏂囦欢</param>
- <param name="importExcelType">Excel瀵煎叆鏂瑰紡</param>
- <returns>瀵煎叆鐨勮褰曟暟</returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.DownloadExcelTemplate(System.String)">
- <summary>
- 鏍规嵁鐗堟湰涓嬭浇棰嗘枡鍗曠殑Excel瀵煎叆妯℃澘
- </summary>
- <param name="version">妯℃澘鐗堟湰</param>
- <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
- </member>
- <member name="M:Admin.NET.Application.WmsTakeMaterialOrderService.ToExcelAsync(Admin.NET.Application.WmsTakeMaterialOrderSearchNonPage)">
- <summary>
- 鏍规嵁棰嗘枡鍗曟煡璇㈠弬鏁板鍑篍xcel
- </summary>
- <param name="input">棰嗘枡鍗曟煡璇㈠弬鏁�</param>
- <returns>瀵煎嚭鐨凟xcel鏂囦欢</returns>
- </member>
- <member name="T:Admin.NET.Application.CallEmptyService">
- <summary>
- Pda绌烘墭鍑哄簱
- </summary>
- </member>
- <member name="M:Admin.NET.Application.CallEmptyService.#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.WmsPlace,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsArea,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsWarehouseEntrance,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsMaterialContainer,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsContainer,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.WmsOrderType,Furion.DatabaseAccessor.MasterDbContextLocator})">
- <summary>
- 鏋勯�犲嚱鏁�
- </summary>
- </member>
- <member name="M:Admin.NET.Application.CallEmptyService.PdaContainerOut(Admin.NET.Application.PdaContainerOutInput)">
- <summary>
- 鎻愪氦鍑哄簱
- </summary>
- <returns></returns>
</member>
<member name="T:Admin.NET.Application.PdaContainerOutInput">
<summary>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/ExWarehouse/ExWarehouseService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/ExWarehouse/ExWarehouseService.cs
index 9eddb3e..c932ea0 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/ExWarehouse/ExWarehouseService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/ExWarehouse/ExWarehouseService.cs
@@ -1,323 +1,323 @@
-锘縰sing Furion.DatabaseAccessor;
-using Furion.DependencyInjection;
-using Furion.DynamicApiController;
-using Furion.FriendlyException;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Yitter.IdGenerator;
-using Admin.NET.Core;
+锘�//using Furion.DatabaseAccessor;
+//using Furion.DependencyInjection;
+//using Furion.DynamicApiController;
+//using Furion.FriendlyException;
+//using Mapster;
+//using Microsoft.AspNetCore.Mvc;
+//using Microsoft.EntityFrameworkCore;
+//using Yitter.IdGenerator;
+//using Admin.NET.Core;
-namespace Admin.NET.Application
-{
- /// <summary>
- /// 鍑哄簱绠＄悊鏈嶅姟
- /// </summary>
- [ApiDescriptionSettings("鑷繁鐨勪笟鍔�", Name = "ExWarehouse", Order = 100)]
- [Route("api/[Controller]")]
- public class ExWarehouseService : IDynamicApiController, ITransient
- {
- private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
- private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
- private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
- private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
- private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
- private readonly IRepository<WmsMaterial, MasterDbContextLocator> _wmsMaterialRep;
- private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
- private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
+//namespace Admin.NET.Application
+//{
+// /// <summary>
+// /// 鍑哄簱绠＄悊鏈嶅姟
+// /// </summary>
+// [ApiDescriptionSettings("鑷繁鐨勪笟鍔�", Name = "ExWarehouse", Order = 100)]
+// [Route("api/[Controller]")]
+// public class ExWarehouseService : IDynamicApiController, ITransient
+// {
+// private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
+// private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
+// private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
+// private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
+// private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
+// private readonly IRepository<WmsMaterial, MasterDbContextLocator> _wmsMaterialRep;
+// private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
+// private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- public ExWarehouseService(
- IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
- IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
- IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
- IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
- IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
- IRepository<WmsMaterial, MasterDbContextLocator> wmsMaterialRep,
- IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
- IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep
- )
- {
- this._wmsAreaRep = wmsAreaRep;
- this._wmsPlaceRep = wmsPlaceRep;
- this._wmsTaskRep = wmsTaskRep;
- this._wmsContainerRep = wmsContainerRep;
- this._wmsContainerPlaceRep = wmsContainerPlaceRep;
- this._wmsMaterialRep = wmsMaterialRep;
- this._wmsMaterialStockRep = wmsMaterialStockRep;
- this._wmsMaterialContainerRep = wmsMaterialContainerRep;
- }
+// /// <summary>
+// /// 鏋勯�犲嚱鏁�
+// /// </summary>
+// public ExWarehouseService(
+// IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
+// IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
+// IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
+// IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
+// IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
+// IRepository<WmsMaterial, MasterDbContextLocator> wmsMaterialRep,
+// IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
+// IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep
+// )
+// {
+// this._wmsAreaRep = wmsAreaRep;
+// this._wmsPlaceRep = wmsPlaceRep;
+// this._wmsTaskRep = wmsTaskRep;
+// this._wmsContainerRep = wmsContainerRep;
+// this._wmsContainerPlaceRep = wmsContainerPlaceRep;
+// this._wmsMaterialRep = wmsMaterialRep;
+// this._wmsMaterialStockRep = wmsMaterialStockRep;
+// this._wmsMaterialContainerRep = wmsMaterialContainerRep;
+// }
- /// <summary>
- /// 鍒嗛〉鏌ヨ鐗╂枡鍑哄簱绠＄悊淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("page")]
- public async Task<PageResult<ExWareHouseOutput>> Page([FromQuery] ExWarehouseSearch input)
- {
- var wmsMaterialStocks = await _wmsMaterialStockRep.DetachedEntities
- .Where (!string.IsNullOrEmpty(input.MaterialName), u => EF.Functions.Like(u.MaterialName, $"%{input.MaterialName.Trim()}%"))
- .ProjectToType<ExWareHouseOutput>()
- .ToListAsync();
- return wmsMaterialStocks.ToADPagedList(input.PageNo, input.PageSize);
- }
+// /// <summary>
+// /// 鍒嗛〉鏌ヨ鐗╂枡鍑哄簱绠＄悊淇℃伅
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("page")]
+// public async Task<PageResult<ExWareHouseOutput>> Page([FromQuery] ExWarehouseSearch input)
+// {
+// var wmsMaterialStocks = await _wmsMaterialStockRep.DetachedEntities
+// .Where (!string.IsNullOrEmpty(input.MaterialName), u => EF.Functions.Like(u.MaterialName, $"%{input.MaterialName.Trim()}%"))
+// .ProjectToType<ExWareHouseOutput>()
+// .ToListAsync();
+// return wmsMaterialStocks.ToADPagedList(input.PageNo, input.PageSize);
+// }
- /// <summary>
- /// 鑷姩鍑哄簱
- /// </summary>
- /// <param name="inputs"></param>
- /// <returns></returns>
- [HttpPost("AutoExWarehouse")]
- [UnitOfWork]
- public async Task AutoExWarehouse(List<ExWarehouseInput> inputs)
- {
- // 鏍规嵁鎵樼洏鍙枫�佸簱浣嶇紪鍙峰幓閲�
- var containerCodeDistinct = inputs.Select(u => new { u.ContainerCode, u.PlaceCode }).Distinct().ToList();
- if (containerCodeDistinct.Count <= 0) throw Oops.Oh("鏆傛棤搴撳瓨鍑哄簱");
+// /// <summary>
+// /// 鑷姩鍑哄簱
+// /// </summary>
+// /// <param name="inputs"></param>
+// /// <returns></returns>
+// [HttpPost("AutoExWarehouse")]
+// [UnitOfWork]
+// public async Task AutoExWarehouse(List<ExWarehouseInput> inputs)
+// {
+// // 鏍规嵁鎵樼洏鍙枫�佸簱浣嶇紪鍙峰幓閲�
+// var containerCodeDistinct = inputs.Select(u => new { u.ContainerCode, u.PlaceCode }).Distinct().ToList();
+// if (containerCodeDistinct.Count <= 0) throw Oops.Oh("鏆傛棤搴撳瓨鍑哄簱");
- // 鏌ヨ搴撳尯鍚嶇О
- var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.AreaName.Contains("缁濈紭绔嬪簱"));
- if (wmsArea != null) throw Oops.Oh("搴撳尯涓嶅瓨鍦�");
+// // 鏌ヨ搴撳尯鍚嶇О
+// var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.AreaName.Contains("缁濈紭绔嬪簱"));
+// if (wmsArea != null) throw Oops.Oh("搴撳尯涓嶅瓨鍦�");
- foreach (var item in containerCodeDistinct)
- {
- var wmsMaterialContainerList = new List<WmsMaterialContainer>();
- // 鍒ゆ柇浠诲姟
- var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(p => p.ContainerCode == item.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
- if (wmsTask != null) throw Oops.Oh("鍛ㄨ浆绠卞彿瀛樺湪鏈畬鎴愮殑浠诲姟!");
+// foreach (var item in containerCodeDistinct)
+// {
+// var wmsMaterialContainerList = new List<WmsMaterialContainer>();
+// // 鍒ゆ柇浠诲姟
+// var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(p => p.ContainerCode == item.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
+// if (wmsTask != null) throw Oops.Oh("鍛ㄨ浆绠卞彿瀛樺湪鏈畬鎴愮殑浠诲姟!");
- // 妫�鏌ュ懆杞鍙蜂俊鎭�
- var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(n => n.ContainerCode == item.ContainerCode);
- if (wmsContainer == null) throw Oops.Oh("搴撳瓨涓病鏈夎锛�" + wmsContainer.ContainerCode + "鎵樼洏!");
+// // 妫�鏌ュ懆杞鍙蜂俊鎭�
+// var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(n => n.ContainerCode == item.ContainerCode);
+// if (wmsContainer == null) throw Oops.Oh("搴撳瓨涓病鏈夎锛�" + wmsContainer.ContainerCode + "鎵樼洏!");
- // 妫�鏌ュ簱浣嶄俊鎭�
- var wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(p => p.PlaceCode == item.PlaceCode);
- if (wmsPlace == null) throw Oops.Oh("搴撲綅涓嶅瓨鍦�!");
- if (wmsPlace.Islock == YesOrNot.Y) throw Oops.Oh("搴撲綅琚攣瀹�!");
+// // 妫�鏌ュ簱浣嶄俊鎭�
+// var wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(p => p.PlaceCode == item.PlaceCode);
+// if (wmsPlace == null) throw Oops.Oh("搴撲綅涓嶅瓨鍦�!");
+// if (wmsPlace.Islock == YesOrNot.Y) throw Oops.Oh("搴撲綅琚攣瀹�!");
- // 鏇存柊鐘舵�佷负鈥滃緟鍑衡��
- wmsPlace.PlaceStatus = PlaceStatus.DAICHU;
- await _wmsPlaceRep.UpdateAsync(wmsPlace);
+// // 鏇存柊鐘舵�佷负鈥滃緟鍑衡��
+// wmsPlace.PlaceStatus = PlaceStatus.DAICHU;
+// await _wmsPlaceRep.UpdateAsync(wmsPlace);
- // 妫�鏌ュ簱瀛�
- var wmsMaterialStockList = inputs.Where(u => u.ContainerCode == wmsContainer.ContainerCode && u.PlaceCode == wmsPlace.PlaceCode).ToList();
- if (wmsMaterialStockList.Count <= 0) throw Oops.Oh("搴撳瓨鏁版嵁寮傚父!");
+// // 妫�鏌ュ簱瀛�
+// var wmsMaterialStockList = inputs.Where(u => u.ContainerCode == wmsContainer.ContainerCode && u.PlaceCode == wmsPlace.PlaceCode).ToList();
+// if (wmsMaterialStockList.Count <= 0) throw Oops.Oh("搴撳瓨鏁版嵁寮傚父!");
- // 妫�鏌ュ簱浣嶄笌鍛ㄨ浆绠卞彿鍏崇郴
- var wmsContainerPlace = await _wmsContainerPlaceRep.FirstOrDefaultAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.ContainerId == wmsContainer.Id
- && p.PlaceCode == wmsPlace.PlaceCode && p.PlaceId == wmsPlace.Id && p.ContainerPlaceStatus == CommonStatus.ENABLE);
- if (wmsContainerPlace == null) throw Oops.Oh("鎵樼洏鍙蜂笌搴撲綅鍏崇郴涓嶅瓨鍦�!");
+// // 妫�鏌ュ簱浣嶄笌鍛ㄨ浆绠卞彿鍏崇郴
+// var wmsContainerPlace = await _wmsContainerPlaceRep.FirstOrDefaultAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.ContainerId == wmsContainer.Id
+// && p.PlaceCode == wmsPlace.PlaceCode && p.PlaceId == wmsPlace.Id && p.ContainerPlaceStatus == CommonStatus.ENABLE);
+// if (wmsContainerPlace == null) throw Oops.Oh("鎵樼洏鍙蜂笌搴撲綅鍏崇郴涓嶅瓨鍦�!");
- // 涓嶆槸绌烘枡绠辨墠浼氭湁缁勭洏鍏崇郴
- if (wmsPlace.EmptyContainer == YesOrNot.N)
- {
- // 妫�鏌ョ墿鏂欎笌鍛ㄨ浆绠卞彿鍏崇郴
- wmsMaterialContainerList = await _wmsMaterialContainerRep.Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
- if (wmsMaterialContainerList.Count <= 0) throw Oops.Oh("鍛ㄨ浆绠卞彿涓庣墿鏂欏叧绯讳笉瀛樺湪!");
- }
- else
- {
- // 鏇存柊绌烘枡绠卞簱瀛�
- var wmsMaterialStock = await _wmsMaterialStockRep.FirstOrDefaultAsync(u => u.ContainerCode == wmsContainer.ContainerCode);
- if (wmsMaterialStock.Source == RuKuSourceEnum.KONGTUO)
- {
- wmsMaterialStock.PlaceCode = "N/A";
- await _wmsMaterialStockRep.UpdateAsync(wmsMaterialStock);
- }
- }
- if (wmsTask == null)
- {
- string taskNo = "CHUKU" + DateTime.Today.ToString("yyyyMMdd");
- var wmsTaskModel = await _wmsTaskRep.DetachedEntities.FirstOrDefaultAsync(u => EF.Functions.Like(u.TaskNo, $"%{taskNo}%"));
- if (wmsTaskModel == null)
- {
- taskNo = taskNo + "0001";
- }
- else
- {
- //鑾峰彇娴佹按鍙锋渶澶х殑鏁版嵁
- var maxSerialNumber = await _wmsTaskRep.MaxAsync(t => t.TaskNo);
- taskNo = Comm.GenerateNewInvoiceNumber(maxSerialNumber, 1);
- }
+// // 涓嶆槸绌烘枡绠辨墠浼氭湁缁勭洏鍏崇郴
+// if (wmsPlace.EmptyContainer == YesOrNot.N)
+// {
+// // 妫�鏌ョ墿鏂欎笌鍛ㄨ浆绠卞彿鍏崇郴
+// wmsMaterialContainerList = await _wmsMaterialContainerRep.Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
+// if (wmsMaterialContainerList.Count <= 0) throw Oops.Oh("鍛ㄨ浆绠卞彿涓庣墿鏂欏叧绯讳笉瀛樺湪!");
+// }
+// else
+// {
+// // 鏇存柊绌烘枡绠卞簱瀛�
+// var wmsMaterialStock = await _wmsMaterialStockRep.FirstOrDefaultAsync(u => u.ContainerCode == wmsContainer.ContainerCode);
+// if (wmsMaterialStock.Source == RuKuSourceEnum.KONGTUO)
+// {
+// wmsMaterialStock.PlaceCode = "N/A";
+// await _wmsMaterialStockRep.UpdateAsync(wmsMaterialStock);
+// }
+// }
+// if (wmsTask == null)
+// {
+// string taskNo = "CHUKU" + DateTime.Today.ToString("yyyyMMdd");
+// var wmsTaskModel = await _wmsTaskRep.DetachedEntities.FirstOrDefaultAsync(u => EF.Functions.Like(u.TaskNo, $"%{taskNo}%"));
+// if (wmsTaskModel == null)
+// {
+// taskNo = taskNo + "0001";
+// }
+// else
+// {
+// //鑾峰彇娴佹按鍙锋渶澶х殑鏁版嵁
+// var maxSerialNumber = await _wmsTaskRep.MaxAsync(t => t.TaskNo);
+// taskNo = Comm.GenerateNewInvoiceNumber(maxSerialNumber, 1);
+// }
- // 鏂板浠诲姟
- var takmodel = new WmsTask()
- {
- TaskNo = taskNo,//YitIdHelper.NextId().ToString(),
- TaskModel = TaskModel.QUANZIDONG,
- TaskType = TaskType.CHUKU,
- TaskLevel = 1,
- TaskStatus = TaskStatusEnum.WEIZHIXING,
- ContainerCode = wmsContainer.ContainerCode,
- SourcePlace = wmsPlace.PlaceCode,
- Aisle = wmsPlace.Aisle,
- ToPlace = "鍑哄簱鍙�",
- AreaName = wmsArea.AreaName,
- Description = wmsPlace.EmptyContainer == YesOrNot.Y ? "绌烘墭" : "鐗╂枡",
- OrderNo = wmsMaterialContainerList.Count <= 0 ? "N/A" : wmsMaterialContainerList.FirstOrDefault().OrderNo,
- TaskDodeviceStatus = TaskDodeviceStatusEnum.W,
- IsRead = true
- };
- await _wmsTaskRep.InsertAsync(takmodel);
- }
- }
- }
+// // 鏂板浠诲姟
+// var takmodel = new WmsTask()
+// {
+// TaskNo = taskNo,//YitIdHelper.NextId().ToString(),
+// TaskModel = TaskModel.QUANZIDONG,
+// TaskType = TaskType.CHUKU,
+// TaskLevel = 1,
+// TaskStatus = TaskStatusEnum.WEIZHIXING,
+// ContainerCode = wmsContainer.ContainerCode,
+// SourcePlace = wmsPlace.PlaceCode,
+// Aisle = wmsPlace.Aisle,
+// ToPlace = "鍑哄簱鍙�",
+// AreaName = wmsArea.AreaName,
+// Description = wmsPlace.EmptyContainer == YesOrNot.Y ? "绌烘墭" : "鐗╂枡",
+// OrderNo = wmsMaterialContainerList.Count <= 0 ? "N/A" : wmsMaterialContainerList.FirstOrDefault().OrderNo,
+// TaskDodeviceStatus = TaskDodeviceStatusEnum.W,
+// IsRead = true
+// };
+// await _wmsTaskRep.InsertAsync(takmodel);
+// }
+// }
+// }
- /// <summary>
- /// 浜哄伐鍑哄簱
- /// </summary>
- /// <param name="inputs"></param>
- /// <returns></returns>
- [HttpPost("manualExWarehouse")]
- [UnitOfWork]
- public async Task ManualExWarehouse(List<ExWarehouseInput> inputs)
- {
- // 鏍规嵁鎵樼洏鍙枫�佸簱浣嶇紪鍙峰幓閲�
- var containerCodeDistinct = inputs.Select(u => new { u.ContainerCode, u.PlaceCode }).Distinct().ToList();
- if (containerCodeDistinct.Count <= 0) throw Oops.Oh("鏆傛棤搴撳瓨鍑哄簱");
+// /// <summary>
+// /// 浜哄伐鍑哄簱
+// /// </summary>
+// /// <param name="inputs"></param>
+// /// <returns></returns>
+// [HttpPost("manualExWarehouse")]
+// [UnitOfWork]
+// public async Task ManualExWarehouse(List<ExWarehouseInput> inputs)
+// {
+// // 鏍规嵁鎵樼洏鍙枫�佸簱浣嶇紪鍙峰幓閲�
+// var containerCodeDistinct = inputs.Select(u => new { u.ContainerCode, u.PlaceCode }).Distinct().ToList();
+// if (containerCodeDistinct.Count <= 0) throw Oops.Oh("鏆傛棤搴撳瓨鍑哄簱");
- // 鏌ヨ搴撳尯鍚嶇О
- var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.AreaName.Contains("缁濈紭绔嬪簱"));
- if (wmsArea != null) throw Oops.Oh("搴撳尯涓嶅瓨鍦�");
+// // 鏌ヨ搴撳尯鍚嶇О
+// var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.AreaName.Contains("缁濈紭绔嬪簱"));
+// if (wmsArea != null) throw Oops.Oh("搴撳尯涓嶅瓨鍦�");
- foreach (var item in containerCodeDistinct)
- {
- var wmsMaterialContainerList = new List<WmsMaterialContainer>();
- // 鍒ゆ柇浠诲姟
- var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(p => p.ContainerCode == item.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
- if (wmsTask != null) throw Oops.Oh("鎵樼洏鍙峰瓨鍦ㄦ湭瀹屾垚鐨勪换鍔�!");
+// foreach (var item in containerCodeDistinct)
+// {
+// var wmsMaterialContainerList = new List<WmsMaterialContainer>();
+// // 鍒ゆ柇浠诲姟
+// var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(p => p.ContainerCode == item.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
+// if (wmsTask != null) throw Oops.Oh("鎵樼洏鍙峰瓨鍦ㄦ湭瀹屾垚鐨勪换鍔�!");
- // 妫�鏌ユ墭鐩樺彿淇℃伅
- var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(n => n.ContainerCode == item.ContainerCode);
- if (wmsContainer == null) throw Oops.Oh("鍛ㄨ浆绠卞彿涓嶅瓨鍦�!");
+// // 妫�鏌ユ墭鐩樺彿淇℃伅
+// var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(n => n.ContainerCode == item.ContainerCode);
+// if (wmsContainer == null) throw Oops.Oh("鍛ㄨ浆绠卞彿涓嶅瓨鍦�!");
- // 妫�鏌ュ簱浣嶄俊鎭�
- var wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(p => p.PlaceCode == item.PlaceCode);
- if (wmsPlace == null) throw Oops.Oh("搴撲綅涓嶅瓨鍦�!");
- if (wmsPlace.Islock == YesOrNot.Y) throw Oops.Oh("搴撲綅琚攣瀹�!");
+// // 妫�鏌ュ簱浣嶄俊鎭�
+// var wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(p => p.PlaceCode == item.PlaceCode);
+// if (wmsPlace == null) throw Oops.Oh("搴撲綅涓嶅瓨鍦�!");
+// if (wmsPlace.Islock == YesOrNot.Y) throw Oops.Oh("搴撲綅琚攣瀹�!");
- // 妫�鏌ュ簱瀛�
- var wmsMaterialStockList = inputs.Where(u => u.ContainerCode == wmsContainer.ContainerCode && u.PlaceCode == wmsPlace.PlaceCode).ToList();
- if (wmsMaterialStockList.Count <= 0) throw Oops.Oh("搴撳瓨鏁版嵁寮傚父!");
+// // 妫�鏌ュ簱瀛�
+// var wmsMaterialStockList = inputs.Where(u => u.ContainerCode == wmsContainer.ContainerCode && u.PlaceCode == wmsPlace.PlaceCode).ToList();
+// if (wmsMaterialStockList.Count <= 0) throw Oops.Oh("搴撳瓨鏁版嵁寮傚父!");
- // 妫�鏌ュ簱浣嶄笌鎵樼洏鍙峰叧绯�
- var wmsContainerPlace = await _wmsContainerPlaceRep.FirstOrDefaultAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.ContainerId == wmsContainer.Id
- && p.PlaceCode == wmsPlace.PlaceCode && p.PlaceId == wmsPlace.Id && p.ContainerPlaceStatus == CommonStatus.ENABLE);
- if (wmsContainerPlace == null) throw Oops.Oh("鎵樼洏鍙蜂笌搴撲綅鍏崇郴涓嶅瓨鍦�!");
+// // 妫�鏌ュ簱浣嶄笌鎵樼洏鍙峰叧绯�
+// var wmsContainerPlace = await _wmsContainerPlaceRep.FirstOrDefaultAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.ContainerId == wmsContainer.Id
+// && p.PlaceCode == wmsPlace.PlaceCode && p.PlaceId == wmsPlace.Id && p.ContainerPlaceStatus == CommonStatus.ENABLE);
+// if (wmsContainerPlace == null) throw Oops.Oh("鎵樼洏鍙蜂笌搴撲綅鍏崇郴涓嶅瓨鍦�!");
- // 涓嶆槸绌烘墭鎵嶄細鏈夌粍鐩樺叧绯�
- if (wmsPlace.EmptyContainer == YesOrNot.N)
- {
- // 妫�鏌ョ墿鏂欎笌绌烘墭鍙峰叧绯�
- wmsMaterialContainerList = await _wmsMaterialContainerRep.Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
- if (wmsMaterialContainerList.Count <= 0) throw Oops.Oh("鎵樼洏鍙蜂笌鐗╂枡鍏崇郴涓嶅瓨鍦�!");
- }
- else
- {
- // 鏇存柊绌烘枡绠卞簱瀛�
- var wmsMaterialStock = await _wmsMaterialStockRep.FirstOrDefaultAsync(u => u.ContainerCode == wmsContainer.ContainerCode);
- if (wmsMaterialStock.Source == RuKuSourceEnum.KONGTUO)
- {
- await _wmsMaterialStockRep.DeleteAsync(wmsMaterialStock);
- }
- }
+// // 涓嶆槸绌烘墭鎵嶄細鏈夌粍鐩樺叧绯�
+// if (wmsPlace.EmptyContainer == YesOrNot.N)
+// {
+// // 妫�鏌ョ墿鏂欎笌绌烘墭鍙峰叧绯�
+// wmsMaterialContainerList = await _wmsMaterialContainerRep.Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
+// if (wmsMaterialContainerList.Count <= 0) throw Oops.Oh("鎵樼洏鍙蜂笌鐗╂枡鍏崇郴涓嶅瓨鍦�!");
+// }
+// else
+// {
+// // 鏇存柊绌烘枡绠卞簱瀛�
+// var wmsMaterialStock = await _wmsMaterialStockRep.FirstOrDefaultAsync(u => u.ContainerCode == wmsContainer.ContainerCode);
+// if (wmsMaterialStock.Source == RuKuSourceEnum.KONGTUO)
+// {
+// await _wmsMaterialStockRep.DeleteAsync(wmsMaterialStock);
+// }
+// }
- if (wmsTask == null)
- {
- //鏋勫缓鍑哄簱鐗╂枡鍜屽懆杞鍙峰叧绯�
- var orderNo = "N/A";
- if (wmsMaterialContainerList.Count > 0) orderNo = YitIdHelper.NextId().ToString();
+// if (wmsTask == null)
+// {
+// //鏋勫缓鍑哄簱鐗╂枡鍜屽懆杞鍙峰叧绯�
+// var orderNo = "N/A";
+// if (wmsMaterialContainerList.Count > 0) orderNo = YitIdHelper.NextId().ToString();
- foreach (var wmsMaterialContaine in wmsMaterialContainerList)
- {
- //鏇存柊鐘舵�佷负鈥濆垹闄も��
- wmsMaterialContaine.BindStatus = CommonStatus.DELETED;
- await _wmsMaterialContainerRep.UpdateNowAsync(wmsMaterialContaine);
+// foreach (var wmsMaterialContaine in wmsMaterialContainerList)
+// {
+// //鏇存柊鐘舵�佷负鈥濆垹闄も��
+// wmsMaterialContaine.BindStatus = CommonStatus.DELETED;
+// await _wmsMaterialContainerRep.UpdateNowAsync(wmsMaterialContaine);
- //鏂板缁勭洏缁戝畾璁板綍 姝ｅ父
- var addWmsMaterialContainer = wmsMaterialContaine;
- addWmsMaterialContainer.Id = YitIdHelper.NextId();
- addWmsMaterialContainer.OrderNo = orderNo;
- addWmsMaterialContainer.BindStatus = CommonStatus.ENABLE;
- await _wmsMaterialContainerRep.InsertNowAsync(addWmsMaterialContainer);
- // 杩欓噷娌℃湁鍒嗘嫞鎿嶄綔鐩存帴鏇存柊搴撳瓨淇℃伅
- var wmsMaterialStock = await _wmsMaterialStockRep.FirstOrDefaultAsync(u => u.ContainerCode == wmsMaterialContaine.ContainerCode);
- wmsMaterialStock.PlaceCode = "N/A";
- wmsMaterialStock.StockNumber -= wmsMaterialContaine.BindQuantity;
- await _wmsMaterialStockRep.UpdateAsync(wmsMaterialStock);
- }
+// //鏂板缁勭洏缁戝畾璁板綍 姝ｅ父
+// var addWmsMaterialContainer = wmsMaterialContaine;
+// addWmsMaterialContainer.Id = YitIdHelper.NextId();
+// addWmsMaterialContainer.OrderNo = orderNo;
+// addWmsMaterialContainer.BindStatus = CommonStatus.ENABLE;
+// await _wmsMaterialContainerRep.InsertNowAsync(addWmsMaterialContainer);
+// // 杩欓噷娌℃湁鍒嗘嫞鎿嶄綔鐩存帴鏇存柊搴撳瓨淇℃伅
+// var wmsMaterialStock = await _wmsMaterialStockRep.FirstOrDefaultAsync(u => u.ContainerCode == wmsMaterialContaine.ContainerCode);
+// wmsMaterialStock.PlaceCode = "N/A";
+// wmsMaterialStock.StockNumber -= wmsMaterialContaine.BindQuantity;
+// await _wmsMaterialStockRep.UpdateAsync(wmsMaterialStock);
+// }
- string taskNo = "CHUKU" + DateTime.Today.ToString("yyyyMMdd");
- var wmsTaskModel = await _wmsTaskRep.DetachedEntities.FirstOrDefaultAsync(u => EF.Functions.Like(u.TaskNo, $"%{taskNo}%"));
- if (wmsTaskModel == null)
- {
- taskNo = taskNo + "0001";
- }
- else
- {
- //鑾峰彇娴佹按鍙锋渶澶х殑鏁版嵁
- var maxSerialNumber = await _wmsTaskRep.MaxAsync(t => t.TaskNo);
- taskNo = Comm.GenerateNewInvoiceNumber(maxSerialNumber, 1);
- }
- // 鏂板浠诲姟
- var addWmsTask = new WmsTask()
- {
- TaskNo = taskNo,//YitIdHelper.NextId().ToString(),
- TaskModel = TaskModel.SHOUDONG,
- TaskType = TaskType.CHUKU,
- TaskLevel = 1,
- TaskStatus = TaskStatusEnum.WANCHENG,
- ContainerCode = wmsContainer.ContainerCode,
- SourcePlace = wmsPlace.PlaceCode,
- Aisle = wmsPlace.Aisle,
- ToPlace = "鍑哄簱鍙�",
- AreaName = wmsArea.AreaName,
- Description = wmsPlace.EmptyContainer == YesOrNot.Y ? "绌烘墭" : "鐗╂枡",
- OrderNo = orderNo,
- TaskDodeviceStatus=TaskDodeviceStatusEnum.W,
- UpdatedTime = DateTime.Now,
- };
- await _wmsTaskRep.InsertAsync(addWmsTask);
+// string taskNo = "CHUKU" + DateTime.Today.ToString("yyyyMMdd");
+// var wmsTaskModel = await _wmsTaskRep.DetachedEntities.FirstOrDefaultAsync(u => EF.Functions.Like(u.TaskNo, $"%{taskNo}%"));
+// if (wmsTaskModel == null)
+// {
+// taskNo = taskNo + "0001";
+// }
+// else
+// {
+// //鑾峰彇娴佹按鍙锋渶澶х殑鏁版嵁
+// var maxSerialNumber = await _wmsTaskRep.MaxAsync(t => t.TaskNo);
+// taskNo = Comm.GenerateNewInvoiceNumber(maxSerialNumber, 1);
+// }
+// // 鏂板浠诲姟
+// var addWmsTask = new WmsTask()
+// {
+// TaskNo = taskNo,//YitIdHelper.NextId().ToString(),
+// TaskModel = TaskModel.SHOUDONG,
+// TaskType = TaskType.CHUKU,
+// TaskLevel = 1,
+// TaskStatus = TaskStatusEnum.WANCHENG,
+// ContainerCode = wmsContainer.ContainerCode,
+// SourcePlace = wmsPlace.PlaceCode,
+// Aisle = wmsPlace.Aisle,
+// ToPlace = "鍑哄簱鍙�",
+// AreaName = wmsArea.AreaName,
+// Description = wmsPlace.EmptyContainer == YesOrNot.Y ? "绌烘墭" : "鐗╂枡",
+// OrderNo = orderNo,
+// TaskDodeviceStatus=TaskDodeviceStatusEnum.W,
+// UpdatedTime = DateTime.Now,
+// };
+// await _wmsTaskRep.InsertAsync(addWmsTask);
- // 鏇存柊搴撲綅涓庡懆杞鍙峰叧绯昏〃鐘舵�佷负鈥滃垹闄も��
- wmsContainerPlace.ContainerPlaceStatus = CommonStatus.DELETED;
- await _wmsContainerPlaceRep.UpdateAsync(wmsContainerPlace);
+// // 鏇存柊搴撲綅涓庡懆杞鍙峰叧绯昏〃鐘舵�佷负鈥滃垹闄も��
+// wmsContainerPlace.ContainerPlaceStatus = CommonStatus.DELETED;
+// await _wmsContainerPlaceRep.UpdateAsync(wmsContainerPlace);
- // 鏇存柊搴撲綅涓衡�滅┖闂测��
- wmsPlace.PlaceStatus = PlaceStatus.KONGXIAN;
- wmsPlace.Islock = YesOrNot.N;
- wmsPlace.EmptyContainer = YesOrNot.N;
- await _wmsPlaceRep.UpdateAsync(wmsPlace);
+// // 鏇存柊搴撲綅涓衡�滅┖闂测��
+// wmsPlace.PlaceStatus = PlaceStatus.KONGXIAN;
+// wmsPlace.Islock = YesOrNot.N;
+// wmsPlace.EmptyContainer = YesOrNot.N;
+// await _wmsPlaceRep.UpdateAsync(wmsPlace);
- // 鏇存柊鍛ㄨ浆绠卞彿鐘舵�佷负鈥滅┖闂测��
- wmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
- await _wmsContainerRep.UpdateAsync(wmsContainer);
- }
- }
- }
+// // 鏇存柊鍛ㄨ浆绠卞彿鐘舵�佷负鈥滅┖闂测��
+// wmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
+// await _wmsContainerRep.UpdateAsync(wmsContainer);
+// }
+// }
+// }
- /// <summary>
- /// 鍛煎彨绌烘墭
- /// </summary>
- /// <returns></returns>
- [HttpPost("callairflare")]
- [UnitOfWork]
- public async Task CallAirflare(CallAirflareInput input)
- {
- //鑾峰彇搴撲綅涓瓨璐ф槸绌烘墭鐨勫簱浣�
- var wmsPlace = await _wmsPlaceRep.Where(u => u.PlaceStatus == PlaceStatus.CUNHUO && u.EmptyContainer== YesOrNot.Y).ToListAsync();
- if (wmsPlace.Count > 0)
- {
+// /// <summary>
+// /// 鍛煎彨绌烘墭
+// /// </summary>
+// /// <returns></returns>
+// [HttpPost("callairflare")]
+// [UnitOfWork]
+// public async Task CallAirflare(CallAirflareInput input)
+// {
+// //鑾峰彇搴撲綅涓瓨璐ф槸绌烘墭鐨勫簱浣�
+// var wmsPlace = await _wmsPlaceRep.Where(u => u.PlaceStatus == PlaceStatus.CUNHUO && u.EmptyContainer== YesOrNot.Y).ToListAsync();
+// if (wmsPlace.Count > 0)
+// {
- }
- }
- }
-}
\ No newline at end of file
+// }
+// }
+// }
+//}
\ No newline at end of file
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 878ea9f..fd7a88d 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
@@ -1,624 +1,624 @@
-锘縰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;
-using Yitter.IdGenerator;
-using StackExchange.Redis;
+锘�//using 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;
+//using Yitter.IdGenerator;
+//using StackExchange.Redis;
-namespace Admin.NET.Application
-{
- /// <summary>
- /// 浠诲姟绠＄悊鏈嶅姟
- /// </summary>
- [ApiDescriptionSettings("浠撳簱浣滀笟", Name = "WmsTask", Order = 102)]
- [Route("api/[Controller]")]
- public class WmsTaskService : IDynamicApiController, ITransient
- {
- private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
- private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
- private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
- private readonly IRepository<WmsWarehouseEntrance, MasterDbContextLocator> _wmsWarehouseEntranceRep;
- private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
- private readonly IRepository<WmsOrder, MasterDbContextLocator> _wmsOrderRep;
- private readonly IRepository<WmsOrderDetails, MasterDbContextLocator> _wmsOrderDetailsRep;
- private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
- private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
- private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
- private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
- private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
- private readonly ISysExcelTemplateService _sysExcelTemplateService;
- private readonly static object _lock = new();
+//namespace Admin.NET.Application
+//{
+// /// <summary>
+// /// 浠诲姟绠＄悊鏈嶅姟
+// /// </summary>
+// [ApiDescriptionSettings("浠撳簱浣滀笟", Name = "WmsTask", Order = 102)]
+// [Route("api/[Controller]")]
+// public class WmsTaskService : IDynamicApiController, ITransient
+// {
+// private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
+// private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
+// private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
+// private readonly IRepository<WmsWarehouseEntrance, MasterDbContextLocator> _wmsWarehouseEntranceRep;
+// private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
+// private readonly IRepository<WmsOrder, MasterDbContextLocator> _wmsOrderRep;
+// private readonly IRepository<WmsOrderDetails, MasterDbContextLocator> _wmsOrderDetailsRep;
+// private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
+// private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
+// private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
+// private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
+// private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
+// private readonly ISysExcelTemplateService _sysExcelTemplateService;
+// private readonly static object _lock = new();
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- public WmsTaskService(
- IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep,
- IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep,
- IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
- IRepository<WmsWarehouseEntrance, MasterDbContextLocator> wmsWarehouseEntranceRep,
- IRepository<WmsOrder, MasterDbContextLocator> wmsOrderRep,
- IRepository<WmsOrderDetails, MasterDbContextLocator> wmsOrderDetailsRep,
- IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
- IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
- IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
- IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
- IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep,
- IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
- ISysExcelTemplateService sysExcelTemplateService
- )
- {
- _sysDictTypeRep = sysDictTypeRep;
- _sysDictDataRep = sysDictDataRep;
- _wmsTaskRep = wmsTaskRep;
- _wmsWarehouseEntranceRep = wmsWarehouseEntranceRep;
- _wmsOrderRep = wmsOrderRep;
- _wmsOrderDetailsRep = wmsOrderDetailsRep;
- _wmsPlaceRep = wmsPlaceRep;
- _wmsContainerPlaceRep = wmsContainerPlaceRep;
- _wmsMaterialStockRep = wmsMaterialStockRep;
- _wmsContainerRep = wmsContainerRep;
- _wmsMaterialContainerRep = wmsMaterialContainerRep;
- _wmsAreaRep= wmsAreaRep;
- _sysExcelTemplateService = sysExcelTemplateService;
- }
+// /// <summary>
+// /// 鏋勯�犲嚱鏁�
+// /// </summary>
+// public WmsTaskService(
+// IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep,
+// IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep,
+// IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
+// IRepository<WmsWarehouseEntrance, MasterDbContextLocator> wmsWarehouseEntranceRep,
+// IRepository<WmsOrder, MasterDbContextLocator> wmsOrderRep,
+// IRepository<WmsOrderDetails, MasterDbContextLocator> wmsOrderDetailsRep,
+// IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
+// IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
+// IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
+// IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
+// IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep,
+// IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
+// ISysExcelTemplateService sysExcelTemplateService
+// )
+// {
+// _sysDictTypeRep = sysDictTypeRep;
+// _sysDictDataRep = sysDictDataRep;
+// _wmsTaskRep = wmsTaskRep;
+// _wmsWarehouseEntranceRep = wmsWarehouseEntranceRep;
+// _wmsOrderRep = wmsOrderRep;
+// _wmsOrderDetailsRep = wmsOrderDetailsRep;
+// _wmsPlaceRep = wmsPlaceRep;
+// _wmsContainerPlaceRep = wmsContainerPlaceRep;
+// _wmsMaterialStockRep = wmsMaterialStockRep;
+// _wmsContainerRep = wmsContainerRep;
+// _wmsMaterialContainerRep = wmsMaterialContainerRep;
+// _wmsAreaRep= wmsAreaRep;
+// _sysExcelTemplateService = sysExcelTemplateService;
+// }
- /// <summary>
- /// 鍒嗛〉鏌ヨ鍑哄叆搴撲换鍔＄鐞�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("page")]
- public async Task<PageResult<TaskOutput>> Page([FromQuery] WmsTaskSearch input)
- {
- var wmsTasks = await _wmsTaskRep.DetachedEntities
- .Where(u => u.AreaName.Contains("缁濈紭绔嬪簱"))
- .Where(!string.IsNullOrEmpty(input.TaskNo), u => EF.Functions.Like(u.TaskNo, $"%{input.TaskNo.Trim()}%"))
- .Where(input.TaskModel != null, u => u.TaskModel == input.TaskModel)
- .Where(input.TaskType != null, u => u.TaskType == input.TaskType)
- .Where(input.TaskStatus != null, u => u.TaskStatus == input.TaskStatus)
- .Where(!string.IsNullOrEmpty(input.ContainerCode), u => EF.Functions.Like(u.ContainerCode, $"%{input.ContainerCode.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.AreaName), u => u.AreaName == input.AreaName)
- .Where(!string.IsNullOrEmpty(input.OrderNo), u => EF.Functions.Like(u.OrderNo, $"%{input.OrderNo.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.SourcePlace), u => EF.Functions.Like(u.SourcePlace, $"%{input.SourcePlace.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.ToPlace), u => EF.Functions.Like(u.ToPlace, $"%{input.ToPlace.Trim()}%"))
- .Where(input.Aisle != null, u => u.Aisle == input.Aisle)
- .OrderBy(PageInputOrder.OrderBuilder(input))
- .ProjectToType<TaskOutput>()
- .ToADPagedListAsync(input.PageNo, input.PageSize);
- return wmsTasks;
- }
+// /// <summary>
+// /// 鍒嗛〉鏌ヨ鍑哄叆搴撲换鍔＄鐞�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("page")]
+// public async Task<PageResult<TaskOutput>> Page([FromQuery] WmsTaskSearch input)
+// {
+// var wmsTasks = await _wmsTaskRep.DetachedEntities
+// .Where(u => u.AreaName.Contains("缁濈紭绔嬪簱"))
+// .Where(!string.IsNullOrEmpty(input.TaskNo), u => EF.Functions.Like(u.TaskNo, $"%{input.TaskNo.Trim()}%"))
+// .Where(input.TaskModel != null, u => u.TaskModel == input.TaskModel)
+// .Where(input.TaskType != null, u => u.TaskType == input.TaskType)
+// .Where(input.TaskStatus != null, u => u.TaskStatus == input.TaskStatus)
+// .Where(!string.IsNullOrEmpty(input.ContainerCode), u => EF.Functions.Like(u.ContainerCode, $"%{input.ContainerCode.Trim()}%"))
+// .Where(!string.IsNullOrEmpty(input.AreaName), u => u.AreaName == input.AreaName)
+// .Where(!string.IsNullOrEmpty(input.OrderNo), u => EF.Functions.Like(u.OrderNo, $"%{input.OrderNo.Trim()}%"))
+// .Where(!string.IsNullOrEmpty(input.SourcePlace), u => EF.Functions.Like(u.SourcePlace, $"%{input.SourcePlace.Trim()}%"))
+// .Where(!string.IsNullOrEmpty(input.ToPlace), u => EF.Functions.Like(u.ToPlace, $"%{input.ToPlace.Trim()}%"))
+// .Where(input.Aisle != null, u => u.Aisle == input.Aisle)
+// .OrderBy(PageInputOrder.OrderBuilder(input))
+// .ProjectToType<TaskOutput>()
+// .ToADPagedListAsync(input.PageNo, input.PageSize);
+// return wmsTasks;
+// }
- /// <summary>
- /// 涓嶅垎椤垫煡璇㈠嚭鍏ュ簱浠诲姟绠＄悊鍒楄〃
- /// </summary>
- /// <param name="input">鍑哄叆搴撲换鍔＄鐞嗘煡璇㈠弬鏁�</param>
- /// <returns>(鍑哄叆搴撲换鍔＄鐞�)瀹炰緥鍒楄〃</returns>
- [HttpGet("listNonPage")]
- public async Task<List<TaskOutput>> ListNonPageAsync([FromQuery] WmsTaskSearchNonPage input)
- {
- var pTaskNo = input.TaskNo?.Trim() ?? "";
- var pTaskModel = input.TaskModel;
- var pTaskType = input.TaskType;
- var pTaskLevel = input.TaskLevel;
- var pTaskStatus = input.TaskStatus;
- var pIsRead = input.IsRead;
- var pContainerCode = input.ContainerCode?.Trim() ?? "";
- var pAreaName = input.AreaName?.Trim() ?? "";
- var pOrderNo = input.OrderNo?.Trim() ?? "";
- var pTaskDodeviceStatus = input.TaskDodeviceStatus;
- var wmsTasks = await _wmsTaskRep.DetachedEntities
- .Where(!string.IsNullOrEmpty(pTaskNo), u => EF.Functions.Like(u.TaskNo, $"%{pTaskNo}%"))
- .Where(pTaskModel != null, u => u.TaskModel == pTaskModel)
- .Where(pTaskType != null, u => u.TaskType == pTaskType)
- .Where(pTaskLevel != null, u => u.TaskLevel == pTaskLevel)
- .Where(pTaskStatus != null, u => u.TaskStatus == pTaskStatus)
- .Where(pIsRead != null, u => u.IsRead == pIsRead)
- .Where(!string.IsNullOrEmpty(pContainerCode), u => EF.Functions.Like(u.ContainerCode, $"%{pContainerCode}%"))
- .Where(!string.IsNullOrEmpty(pAreaName), u => u.AreaName == pAreaName)
- .Where(!string.IsNullOrEmpty(pOrderNo), u => EF.Functions.Like(u.OrderNo, $"%{pOrderNo}%"))
- .Where(pTaskDodeviceStatus != null, u => u.TaskDodeviceStatus == pTaskDodeviceStatus)
- .OrderBy(PageInputOrder.OrderNonPageBuilder(input))
- .ProjectToType<TaskOutput>()
- .ToListAsync();
- return wmsTasks;
- }
+// /// <summary>
+// /// 涓嶅垎椤垫煡璇㈠嚭鍏ュ簱浠诲姟绠＄悊鍒楄〃
+// /// </summary>
+// /// <param name="input">鍑哄叆搴撲换鍔＄鐞嗘煡璇㈠弬鏁�</param>
+// /// <returns>(鍑哄叆搴撲换鍔＄鐞�)瀹炰緥鍒楄〃</returns>
+// [HttpGet("listNonPage")]
+// public async Task<List<TaskOutput>> ListNonPageAsync([FromQuery] WmsTaskSearchNonPage input)
+// {
+// var pTaskNo = input.TaskNo?.Trim() ?? "";
+// var pTaskModel = input.TaskModel;
+// var pTaskType = input.TaskType;
+// var pTaskLevel = input.TaskLevel;
+// var pTaskStatus = input.TaskStatus;
+// var pIsRead = input.IsRead;
+// var pContainerCode = input.ContainerCode?.Trim() ?? "";
+// var pAreaName = input.AreaName?.Trim() ?? "";
+// var pOrderNo = input.OrderNo?.Trim() ?? "";
+// var pTaskDodeviceStatus = input.TaskDodeviceStatus;
+// var wmsTasks = await _wmsTaskRep.DetachedEntities
+// .Where(!string.IsNullOrEmpty(pTaskNo), u => EF.Functions.Like(u.TaskNo, $"%{pTaskNo}%"))
+// .Where(pTaskModel != null, u => u.TaskModel == pTaskModel)
+// .Where(pTaskType != null, u => u.TaskType == pTaskType)
+// .Where(pTaskLevel != null, u => u.TaskLevel == pTaskLevel)
+// .Where(pTaskStatus != null, u => u.TaskStatus == pTaskStatus)
+// .Where(pIsRead != null, u => u.IsRead == pIsRead)
+// .Where(!string.IsNullOrEmpty(pContainerCode), u => EF.Functions.Like(u.ContainerCode, $"%{pContainerCode}%"))
+// .Where(!string.IsNullOrEmpty(pAreaName), u => u.AreaName == pAreaName)
+// .Where(!string.IsNullOrEmpty(pOrderNo), u => EF.Functions.Like(u.OrderNo, $"%{pOrderNo}%"))
+// .Where(pTaskDodeviceStatus != null, u => u.TaskDodeviceStatus == pTaskDodeviceStatus)
+// .OrderBy(PageInputOrder.OrderNonPageBuilder(input))
+// .ProjectToType<TaskOutput>()
+// .ToListAsync();
+// return wmsTasks;
+// }
- /// <summary>
- /// 澧炲姞鍑哄叆搴撲换鍔＄鐞�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("add")]
- [NonAction]
- public async Task Add(AddWmsTaskInput input)
- {
- var wmsTask = input.Adapt<WmsTask>();
- await _wmsTaskRep.InsertAsync(wmsTask);
- }
+// /// <summary>
+// /// 澧炲姞鍑哄叆搴撲换鍔＄鐞�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("add")]
+// [NonAction]
+// public async Task Add(AddWmsTaskInput input)
+// {
+// var wmsTask = input.Adapt<WmsTask>();
+// await _wmsTaskRep.InsertAsync(wmsTask);
+// }
- /// <summary>
- /// 鍒犻櫎鍑哄叆搴撲换鍔＄鐞�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("delete")]
- public async Task Delete(DeleteWmsTaskInput input)
- {
- var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.Id == input.Id);
- await _wmsTaskRep.DeleteAsync(wmsTask);
- }
+// /// <summary>
+// /// 鍒犻櫎鍑哄叆搴撲换鍔＄鐞�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("delete")]
+// public async Task Delete(DeleteWmsTaskInput input)
+// {
+// var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.Id == input.Id);
+// await _wmsTaskRep.DeleteAsync(wmsTask);
+// }
- /// <summary>
- /// 鏇存柊鍑哄叆搴撲换鍔＄鐞�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("edit")]
- public async Task Update(UpdateWmsTaskInput input)
- {
- var isExist = await _wmsTaskRep.AnyAsync(u => u.Id == input.Id, false);
- if (!isExist) throw Oops.Oh(ErrorCode.D3000);
+// /// <summary>
+// /// 鏇存柊鍑哄叆搴撲换鍔＄鐞�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("edit")]
+// public async Task Update(UpdateWmsTaskInput input)
+// {
+// var isExist = await _wmsTaskRep.AnyAsync(u => u.Id == input.Id, false);
+// if (!isExist) throw Oops.Oh(ErrorCode.D3000);
- var wmsTask = input.Adapt<WmsTask>();
- await _wmsTaskRep.UpdateAsync(wmsTask, ignoreNullValues: true);
- }
+// var wmsTask = input.Adapt<WmsTask>();
+// await _wmsTaskRep.UpdateAsync(wmsTask, ignoreNullValues: true);
+// }
- /// <summary>
- /// 寮哄埗瀹屾垚
- /// </summary>
- /// <returns></returns>
- [HttpPost("finish")]
- [UnitOfWork]
- public async Task Finish([FromBody] WmsTaskFinishInput input)
- {
- //鏌ヨ浠诲姟
- var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.Id == input.Id);
- if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
+// /// <summary>
+// /// 寮哄埗瀹屾垚
+// /// </summary>
+// /// <returns></returns>
+// [HttpPost("finish")]
+// [UnitOfWork]
+// public async Task Finish([FromBody] WmsTaskFinishInput input)
+// {
+// //鏌ヨ浠诲姟
+// var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.Id == input.Id);
+// if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
- // 鏌ヨ娣峰悎鏂欏簱鍖轰俊鎭�
- var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.AreaName.Contains("缁濈紭绔嬪簱"));
- if (wmsArea == null) throw Oops.Oh("搴撳尯涓嶅瓨鍦紒");
+// // 鏌ヨ娣峰悎鏂欏簱鍖轰俊鎭�
+// var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.AreaName.Contains("缁濈紭绔嬪簱"));
+// if (wmsArea == null) throw Oops.Oh("搴撳尯涓嶅瓨鍦紒");
- // 鏌ヨ鎵樼洏淇℃伅,鍛兼晳AGV鏃朵細杩涜缁勭洏鎿嶄綔
- var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode);
- if (wmsContainer == null) throw Oops.Oh("鎵樼洏涓嶅瓨鍦紒");
+// // 鏌ヨ鎵樼洏淇℃伅,鍛兼晳AGV鏃朵細杩涜缁勭洏鎿嶄綔
+// var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode);
+// if (wmsContainer == null) throw Oops.Oh("鎵樼洏涓嶅瓨鍦紒");
- var statusList = new List<TaskStatusEnum> { TaskStatusEnum.WEIZHIXING, TaskStatusEnum.ZHIXINGZHONG , TaskStatusEnum .DAIZHIXING};
- if (!statusList.Contains(wmsTask.TaskStatus)) throw Oops.Oh("鍙湁鏈墽琛屽拰鎵ц涓殑浠诲姟鎵嶈兘寮哄埗瀹屾垚锛�");
+// var statusList = new List<TaskStatusEnum> { TaskStatusEnum.WEIZHIXING, TaskStatusEnum.ZHIXINGZHONG , TaskStatusEnum .DAIZHIXING};
+// if (!statusList.Contains(wmsTask.TaskStatus)) throw Oops.Oh("鍙湁鏈墽琛屽拰鎵ц涓殑浠诲姟鎵嶈兘寮哄埗瀹屾垚锛�");
- if (wmsTask.TaskType == TaskType.RUKU) // 鍏ュ簱浠诲姟
- {
- // 鏌ヨ搴撲綅淇℃伅 闅忔満鍒嗛厤搴撲綅
- var wmsPlace = new WmsPlace();
- if (string.IsNullOrEmpty(wmsTask.ToPlace))
- wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.AreaId == wmsArea.Id && u.Islock == YesOrNot.N && u.PlaceStatus == PlaceStatus.KONGXIAN);
- else
- wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.AreaId == wmsArea.Id && u.PlaceCode == wmsTask.ToPlace);
- if (wmsPlace == null) throw Oops.Oh("搴撲綅涓嶅瓨鍦�!");
- if (wmsPlace.Islock == YesOrNot.Y) throw Oops.Oh("搴撲綅琚攣瀹�!");
- if (wmsPlace.PlaceStatus != PlaceStatus.KONGXIAN) throw Oops.Oh("搴撲綅宸插瓨璐�!");
- // 鏇存柊搴撲綅鐘舵�佷负鈥滃瓨璐р��
- wmsPlace.PlaceStatus = PlaceStatus.CUNHUO;
- if (wmsTask.Description == "绌烘墭") wmsPlace.EmptyContainer = YesOrNot.Y; //鏄惁绌烘墭
- else wmsPlace.EmptyContainer = YesOrNot.N;
+// if (wmsTask.TaskType == TaskType.RUKU) // 鍏ュ簱浠诲姟
+// {
+// // 鏌ヨ搴撲綅淇℃伅 闅忔満鍒嗛厤搴撲綅
+// var wmsPlace = new WmsPlace();
+// if (string.IsNullOrEmpty(wmsTask.ToPlace))
+// wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.AreaId == wmsArea.Id && u.Islock == YesOrNot.N && u.PlaceStatus == PlaceStatus.KONGXIAN);
+// else
+// wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.AreaId == wmsArea.Id && u.PlaceCode == wmsTask.ToPlace);
+// if (wmsPlace == null) throw Oops.Oh("搴撲綅涓嶅瓨鍦�!");
+// if (wmsPlace.Islock == YesOrNot.Y) throw Oops.Oh("搴撲綅琚攣瀹�!");
+// if (wmsPlace.PlaceStatus != PlaceStatus.KONGXIAN) throw Oops.Oh("搴撲綅宸插瓨璐�!");
+// // 鏇存柊搴撲綅鐘舵�佷负鈥滃瓨璐р��
+// wmsPlace.PlaceStatus = PlaceStatus.CUNHUO;
+// if (wmsTask.Description == "绌烘墭") wmsPlace.EmptyContainer = YesOrNot.Y; //鏄惁绌烘墭
+// else wmsPlace.EmptyContainer = YesOrNot.N;
- // 鍒涘缓鎵樼洏鍙峰簱浣嶅叧绯昏〃
- var wmsContainerPlaceModel = new WmsContainerPlace()
- {
- PlaceId = wmsPlace.Id,
- PlaceCode = wmsPlace.PlaceCode,
- ContainerId = wmsContainer.Id,
- ContainerCode = wmsContainer.ContainerCode,
- ContainerPlaceStatus = CommonStatus.ENABLE
- };
- await _wmsContainerPlaceRep.InsertAsync(wmsContainerPlaceModel);
+// // 鍒涘缓鎵樼洏鍙峰簱浣嶅叧绯昏〃
+// var wmsContainerPlaceModel = new WmsContainerPlace()
+// {
+// PlaceId = wmsPlace.Id,
+// PlaceCode = wmsPlace.PlaceCode,
+// ContainerId = wmsContainer.Id,
+// ContainerCode = wmsContainer.ContainerCode,
+// ContainerPlaceStatus = CommonStatus.ENABLE
+// };
+// await _wmsContainerPlaceRep.InsertAsync(wmsContainerPlaceModel);
- // 鏇存柊搴撳瓨
- var wmsMaterialContainerList = await _wmsMaterialContainerRep.DetachedEntities
- .Where(p => p.OrderNo ==wmsTask.OrderNo && p.BindStatus == CommonStatus.ENABLE).ProjectToType<WmsMaterialContainer>().ToListAsync();
+// // 鏇存柊搴撳瓨
+// var wmsMaterialContainerList = await _wmsMaterialContainerRep.DetachedEntities
+// .Where(p => p.OrderNo ==wmsTask.OrderNo && p.BindStatus == CommonStatus.ENABLE).ProjectToType<WmsMaterialContainer>().ToListAsync();
- foreach (var item in wmsMaterialContainerList)
- {
- var wmsMaterialStock = await _wmsMaterialStockRep.FirstOrDefaultAsync(p => p.ContainerCode == wmsContainer.ContainerCode
- && p.MaterialBatch == item.MaterialBatch);
- if (wmsMaterialStock != null)
- {
- wmsMaterialStock.Source = RuKuSourceEnum.KONGTUO;
- wmsMaterialStock.AreaId = wmsPlace.AreaId;
- wmsMaterialStock.PlaceCode = wmsPlace.PlaceCode;
- wmsMaterialStock.StockNumber += item.BindQuantity;
- await _wmsMaterialStockRep.UpdateAsync(wmsMaterialStock);
- }
- else
- {
- wmsMaterialStock = new WmsMaterialStock()
- {
- InspectionMethod = MaterialInspection.MIANJIAN,
- UnitType = UnitType.ZHONGLIANG,
- UnitNo = UnitNoType.T,
- MaterialNo = item.MaterialNo,
- MaterialType = MaterialType.CHENGPING,
- MaterialName = item.MaterialName,
- MaterialSpec = item.MaterialSpec,
- MaterialBatch = item.MaterialBatch,
- MaterialDensity = item.MaterialDensity,
- StockNumber = 1,
- PlaceCode = wmsPlace.PlaceCode,
- ContainerId = wmsContainer.Id,
- ContainerCode = wmsContainer.ContainerCode,
- AreaId = wmsPlace.AreaId,
- Source = RuKuSourceEnum.KONGTUO,
- };
- await _wmsMaterialStockRep.InsertAsync(wmsMaterialStock);
- }
- }
- // 绌烘枡绠卞叆搴�
- if (wmsTask.OrderNo == "N/A")
- {
- var wmsMaterialStock = new WmsMaterialStock()
- {
- InspectionMethod = MaterialInspection.MIANJIAN,
- UnitType = UnitType.ZHONGLIANG,
- UnitNo = UnitNoType.T,
- MaterialNo = "N/A",
- MaterialType = MaterialType.KONGTUO,
- MaterialName = "N/A",
- MaterialSpec = "N/A",
- MaterialBatch = "N/A",
- MaterialDensity = "N/A",
- StockNumber = 0,
- PlaceCode = wmsPlace.PlaceCode,
- ContainerId = wmsContainer.Id,
- ContainerCode = wmsContainer.ContainerCode,
- AreaId = wmsPlace.AreaId,
- Source = RuKuSourceEnum.KONGTUO,
- };
- await _wmsMaterialStockRep.InsertAsync(wmsMaterialStock);
- }
- // 鏇存柊浠诲姟鐘舵�併�佽澶囦换鍔＄姸鎬併�佹墭鐩樼紪鍙枫�佺洰鏍囦綅缃�佸簱鍖哄悕绉�
- wmsTask.TaskStatus = TaskStatusEnum.WANCHENG;
- wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.W;
- wmsTask.ContainerCode = wmsContainer.ContainerCode;
- wmsTask.ToPlace = wmsPlace.PlaceCode;
- wmsTask.AreaName = wmsPlace.WmsArea.AreaName;
- wmsTask.IsRead = true;
+// foreach (var item in wmsMaterialContainerList)
+// {
+// var wmsMaterialStock = await _wmsMaterialStockRep.FirstOrDefaultAsync(p => p.ContainerCode == wmsContainer.ContainerCode
+// && p.MaterialBatch == item.MaterialBatch);
+// if (wmsMaterialStock != null)
+// {
+// wmsMaterialStock.Source = RuKuSourceEnum.KONGTUO;
+// wmsMaterialStock.AreaId = wmsPlace.AreaId;
+// wmsMaterialStock.PlaceCode = wmsPlace.PlaceCode;
+// wmsMaterialStock.StockNumber += item.BindQuantity;
+// await _wmsMaterialStockRep.UpdateAsync(wmsMaterialStock);
+// }
+// else
+// {
+// wmsMaterialStock = new WmsMaterialStock()
+// {
+// InspectionMethod = MaterialInspection.MIANJIAN,
+// UnitType = UnitType.ZHONGLIANG,
+// UnitNo = UnitNoType.T,
+// MaterialNo = item.MaterialNo,
+// MaterialType = MaterialType.CHENGPING,
+// MaterialName = item.MaterialName,
+// MaterialSpec = item.MaterialSpec,
+// MaterialBatch = item.MaterialBatch,
+// MaterialDensity = item.MaterialDensity,
+// StockNumber = 1,
+// PlaceCode = wmsPlace.PlaceCode,
+// ContainerId = wmsContainer.Id,
+// ContainerCode = wmsContainer.ContainerCode,
+// AreaId = wmsPlace.AreaId,
+// Source = RuKuSourceEnum.KONGTUO,
+// };
+// await _wmsMaterialStockRep.InsertAsync(wmsMaterialStock);
+// }
+// }
+// // 绌烘枡绠卞叆搴�
+// if (wmsTask.OrderNo == "N/A")
+// {
+// var wmsMaterialStock = new WmsMaterialStock()
+// {
+// InspectionMethod = MaterialInspection.MIANJIAN,
+// UnitType = UnitType.ZHONGLIANG,
+// UnitNo = UnitNoType.T,
+// MaterialNo = "N/A",
+// MaterialType = MaterialType.KONGTUO,
+// MaterialName = "N/A",
+// MaterialSpec = "N/A",
+// MaterialBatch = "N/A",
+// MaterialDensity = "N/A",
+// StockNumber = 0,
+// PlaceCode = wmsPlace.PlaceCode,
+// ContainerId = wmsContainer.Id,
+// ContainerCode = wmsContainer.ContainerCode,
+// AreaId = wmsPlace.AreaId,
+// Source = RuKuSourceEnum.KONGTUO,
+// };
+// await _wmsMaterialStockRep.InsertAsync(wmsMaterialStock);
+// }
+// // 鏇存柊浠诲姟鐘舵�併�佽澶囦换鍔＄姸鎬併�佹墭鐩樼紪鍙枫�佺洰鏍囦綅缃�佸簱鍖哄悕绉�
+// wmsTask.TaskStatus = TaskStatusEnum.WANCHENG;
+// wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.W;
+// wmsTask.ContainerCode = wmsContainer.ContainerCode;
+// wmsTask.ToPlace = wmsPlace.PlaceCode;
+// wmsTask.AreaName = wmsPlace.WmsArea.AreaName;
+// wmsTask.IsRead = true;
- // 鏇存柊搴撲綅鐘舵�佷负瀛樿揣
- wmsPlace.PlaceStatus = PlaceStatus.CUNHUO;
- await _wmsPlaceRep.UpdateAsync(wmsPlace);
+// // 鏇存柊搴撲綅鐘舵�佷负瀛樿揣
+// wmsPlace.PlaceStatus = PlaceStatus.CUNHUO;
+// await _wmsPlaceRep.UpdateAsync(wmsPlace);
- // 鏇存柊鎵樼洏鐘舵�佷负鈥滃簱浣嶁��
- wmsContainer.ContainerStatus = ContainerStatus.KUWEI;
- await _wmsContainerRep.UpdateAsync(wmsContainer);
- }
- else if (wmsTask.TaskType == TaskType.CHUKU) //鍑哄簱浠诲姟
- {
- var wmsMaterialContainerList = new List<WmsMaterialContainer>();
- // 鏌ヨ搴撲綅淇℃伅
- var wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.PlaceCode == wmsTask.SourcePlace);
- if (wmsPlace == null) throw Oops.Oh("搴撲綅淇℃伅涓嶅瓨鍦�!");
- if (wmsPlace.Islock == YesOrNot.Y) throw Oops.Oh("搴撲綅琚攣瀹�!");
- //if (wmsPlace != null && wmsPlace.PlaceStatus != PlaceStatus.DAICHU) throw Oops.Oh("搴撲綅寮傚父璐�!");
+// // 鏇存柊鎵樼洏鐘舵�佷负鈥滃簱浣嶁��
+// wmsContainer.ContainerStatus = ContainerStatus.KUWEI;
+// await _wmsContainerRep.UpdateAsync(wmsContainer);
+// }
+// else if (wmsTask.TaskType == TaskType.CHUKU) //鍑哄簱浠诲姟
+// {
+// var wmsMaterialContainerList = new List<WmsMaterialContainer>();
+// // 鏌ヨ搴撲綅淇℃伅
+// var wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.PlaceCode == wmsTask.SourcePlace);
+// if (wmsPlace == null) throw Oops.Oh("搴撲綅淇℃伅涓嶅瓨鍦�!");
+// if (wmsPlace.Islock == YesOrNot.Y) throw Oops.Oh("搴撲綅琚攣瀹�!");
+// //if (wmsPlace != null && wmsPlace.PlaceStatus != PlaceStatus.DAICHU) throw Oops.Oh("搴撲綅寮傚父璐�!");
- // 鏌ヨ鏄惁宸插瓨鍦ㄦ墭鐩樹笌搴撲綅鐨勫叧绯�
- var wmsContainerPlace = await _wmsContainerPlaceRep.FirstOrDefaultAsync(z => z.PlaceId == wmsPlace.Id && z.PlaceCode == wmsPlace.PlaceCode
- && z.ContainerCode == wmsTask.ContainerCode && z.ContainerPlaceStatus == CommonStatus.ENABLE);
- if (wmsContainerPlace == null) throw Oops.Oh("搴撲綅瀹瑰櫒鍏崇郴涓嶅瓨鍦�!");
+// // 鏌ヨ鏄惁宸插瓨鍦ㄦ墭鐩樹笌搴撲綅鐨勫叧绯�
+// var wmsContainerPlace = await _wmsContainerPlaceRep.FirstOrDefaultAsync(z => z.PlaceId == wmsPlace.Id && z.PlaceCode == wmsPlace.PlaceCode
+// && z.ContainerCode == wmsTask.ContainerCode && z.ContainerPlaceStatus == CommonStatus.ENABLE);
+// if (wmsContainerPlace == null) throw Oops.Oh("搴撲綅瀹瑰櫒鍏崇郴涓嶅瓨鍦�!");
- // 涓嶆槸绌烘墭鎵嶄細鏈夌粍鐩樺叧绯�
- if (wmsPlace.EmptyContainer == YesOrNot.N)
- {
- // 妫�鏌ョ墿鏂欎笌绌烘墭鍙峰叧绯�
- wmsMaterialContainerList = await _wmsMaterialContainerRep.Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
- if (wmsMaterialContainerList.Count <= 0) throw Oops.Oh("鎵樼洏鍙蜂笌鐗╂枡鍏崇郴涓嶅瓨鍦�!");
+// // 涓嶆槸绌烘墭鎵嶄細鏈夌粍鐩樺叧绯�
+// if (wmsPlace.EmptyContainer == YesOrNot.N)
+// {
+// // 妫�鏌ョ墿鏂欎笌绌烘墭鍙峰叧绯�
+// wmsMaterialContainerList = await _wmsMaterialContainerRep.Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
+// if (wmsMaterialContainerList.Count <= 0) throw Oops.Oh("鎵樼洏鍙蜂笌鐗╂枡鍏崇郴涓嶅瓨鍦�!");
- }
- else
- {
- // 鏇存柊绌烘枡绠卞簱瀛�
- var wmsMaterialStock = await _wmsMaterialStockRep.FirstOrDefaultAsync(u => u.ContainerCode == wmsContainer.ContainerCode);
- if (wmsMaterialStock.Source == RuKuSourceEnum.KONGTUO)
- {
- await _wmsMaterialStockRep.DeleteAsync(wmsMaterialStock);
- }
- }
+// }
+// else
+// {
+// // 鏇存柊绌烘枡绠卞簱瀛�
+// var wmsMaterialStock = await _wmsMaterialStockRep.FirstOrDefaultAsync(u => u.ContainerCode == wmsContainer.ContainerCode);
+// if (wmsMaterialStock.Source == RuKuSourceEnum.KONGTUO)
+// {
+// await _wmsMaterialStockRep.DeleteAsync(wmsMaterialStock);
+// }
+// }
- //鏋勫缓鍑哄簱鐗╂枡鍜屽懆杞鍙峰叧绯�
- var orderNo = "N/A";
- if (wmsMaterialContainerList.Count > 0) orderNo = YitIdHelper.NextId().ToString();
+// //鏋勫缓鍑哄簱鐗╂枡鍜屽懆杞鍙峰叧绯�
+// var orderNo = "N/A";
+// if (wmsMaterialContainerList.Count > 0) orderNo = YitIdHelper.NextId().ToString();
- foreach (var wmsMaterialContaine in wmsMaterialContainerList)
- {
- //鏇存柊鐘舵�佷负鈥濆垹闄も��
- wmsMaterialContaine.BindStatus = CommonStatus.DELETED;
- await _wmsMaterialContainerRep.UpdateNowAsync(wmsMaterialContaine);
+// foreach (var wmsMaterialContaine in wmsMaterialContainerList)
+// {
+// //鏇存柊鐘舵�佷负鈥濆垹闄も��
+// wmsMaterialContaine.BindStatus = CommonStatus.DELETED;
+// await _wmsMaterialContainerRep.UpdateNowAsync(wmsMaterialContaine);
- //鏂板缁勭洏缁戝畾璁板綍 姝ｅ父
- var addWmsMaterialContainer = wmsMaterialContaine;
- addWmsMaterialContainer.Id = YitIdHelper.NextId();
- addWmsMaterialContainer.OrderNo = orderNo;
- addWmsMaterialContainer.BindStatus = CommonStatus.ENABLE;
- await _wmsMaterialContainerRep.InsertNowAsync(addWmsMaterialContainer);
- // 杩欓噷娌℃湁鍒嗘嫞鎿嶄綔鐩存帴鏇存柊搴撳瓨淇℃伅
- var wmsMaterialStock = await _wmsMaterialStockRep.FirstOrDefaultAsync(u => u.ContainerCode == wmsMaterialContaine.ContainerCode);
- wmsMaterialStock.PlaceCode = "N/A";
- wmsMaterialStock.StockNumber -= wmsMaterialContaine.BindQuantity;
- await _wmsMaterialStockRep.UpdateAsync(wmsMaterialStock);
- }
+// //鏂板缁勭洏缁戝畾璁板綍 姝ｅ父
+// var addWmsMaterialContainer = wmsMaterialContaine;
+// addWmsMaterialContainer.Id = YitIdHelper.NextId();
+// addWmsMaterialContainer.OrderNo = orderNo;
+// addWmsMaterialContainer.BindStatus = CommonStatus.ENABLE;
+// await _wmsMaterialContainerRep.InsertNowAsync(addWmsMaterialContainer);
+// // 杩欓噷娌℃湁鍒嗘嫞鎿嶄綔鐩存帴鏇存柊搴撳瓨淇℃伅
+// var wmsMaterialStock = await _wmsMaterialStockRep.FirstOrDefaultAsync(u => u.ContainerCode == wmsMaterialContaine.ContainerCode);
+// wmsMaterialStock.PlaceCode = "N/A";
+// wmsMaterialStock.StockNumber -= wmsMaterialContaine.BindQuantity;
+// await _wmsMaterialStockRep.UpdateAsync(wmsMaterialStock);
+// }
- //鏇存柊浠诲姟鐘舵��
- wmsTask.TaskStatus = TaskStatusEnum.WANCHENG;
- wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.W;
- wmsTask.IsRead = true;
+// //鏇存柊浠诲姟鐘舵��
+// wmsTask.TaskStatus = TaskStatusEnum.WANCHENG;
+// wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.W;
+// wmsTask.IsRead = true;
- // 绂佺敤鎵樼洏搴撲綅鍏崇郴
- wmsContainerPlace.ContainerPlaceStatus = CommonStatus.DELETED;
- await _wmsContainerPlaceRep.UpdateAsync(wmsContainerPlace);
+// // 绂佺敤鎵樼洏搴撲綅鍏崇郴
+// wmsContainerPlace.ContainerPlaceStatus = CommonStatus.DELETED;
+// await _wmsContainerPlaceRep.UpdateAsync(wmsContainerPlace);
- // 鏇存柊搴撲綅鐘舵�佷负鈥滅┖闂测��
- wmsPlace.PlaceStatus = PlaceStatus.KONGXIAN;
- await _wmsPlaceRep.UpdateAsync(wmsPlace);
+// // 鏇存柊搴撲綅鐘舵�佷负鈥滅┖闂测��
+// wmsPlace.PlaceStatus = PlaceStatus.KONGXIAN;
+// await _wmsPlaceRep.UpdateAsync(wmsPlace);
- // 鏇存柊鎵樼洏鐘舵�佷负鈥滅┖闂测��
- wmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
- await _wmsContainerRep.UpdateAsync(wmsContainer);
- }
- else //绉诲簱浠诲姟
- {
+// // 鏇存柊鎵樼洏鐘舵�佷负鈥滅┖闂测��
+// wmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
+// await _wmsContainerRep.UpdateAsync(wmsContainer);
+// }
+// else //绉诲簱浠诲姟
+// {
- }
- await _wmsTaskRep.UpdateAsync(wmsTask);
- }
+// }
+// await _wmsTaskRep.UpdateAsync(wmsTask);
+// }
- /// <summary>
- /// 鏇存柊浼樺厛绾�(鍚戜笂)
- /// </summary>
- /// <returns></returns>
- [HttpPost("upwardTaskLevel")]
- public async Task UpwardTaskLevel([FromBody] UpdateTaskLevelInput input)
- {
- var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.Id == input.Id);
- if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
- if (wmsTask.TaskStatus != TaskStatusEnum.WEIZHIXING) throw Oops.Oh("鍙湁鏈墽琛岀殑浠诲姟鎵嶈兘鏇存柊浠诲姟浼樺厛绾э紒");
- if(wmsTask.TaskLevel==5) throw Oops.Oh("浠诲姟宸蹭负鏈�楂樼骇鍒紒");
- wmsTask.TaskLevel += 1;
- await _wmsTaskRep.UpdateAsync(wmsTask);
- }
+// /// <summary>
+// /// 鏇存柊浼樺厛绾�(鍚戜笂)
+// /// </summary>
+// /// <returns></returns>
+// [HttpPost("upwardTaskLevel")]
+// public async Task UpwardTaskLevel([FromBody] UpdateTaskLevelInput input)
+// {
+// var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.Id == input.Id);
+// if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
+// if (wmsTask.TaskStatus != TaskStatusEnum.WEIZHIXING) throw Oops.Oh("鍙湁鏈墽琛岀殑浠诲姟鎵嶈兘鏇存柊浠诲姟浼樺厛绾э紒");
+// if(wmsTask.TaskLevel==5) throw Oops.Oh("浠诲姟宸蹭负鏈�楂樼骇鍒紒");
+// wmsTask.TaskLevel += 1;
+// await _wmsTaskRep.UpdateAsync(wmsTask);
+// }
- /// <summary>
- /// 鏇存柊浼樺厛绾�(鍚戜笅)
- /// </summary>
- /// <returns></returns>
- [HttpPost("downTaskLevel")]
- public async Task DownTaskLevel([FromBody] UpdateTaskLevelInput input)
- {
- var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.Id == input.Id);
- if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
- if (wmsTask.TaskStatus != TaskStatusEnum.WEIZHIXING) throw Oops.Oh("鍙湁鏈墽琛岀殑浠诲姟鎵嶈兘鏇存柊浠诲姟浼樺厛绾э紒");
- if (wmsTask.TaskLevel == 1) throw Oops.Oh("浠诲姟宸蹭负鏈�浣庣骇鍒紒");
- wmsTask.TaskLevel -= 1;
- await _wmsTaskRep.UpdateAsync(wmsTask);
- }
+// /// <summary>
+// /// 鏇存柊浼樺厛绾�(鍚戜笅)
+// /// </summary>
+// /// <returns></returns>
+// [HttpPost("downTaskLevel")]
+// public async Task DownTaskLevel([FromBody] UpdateTaskLevelInput input)
+// {
+// var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.Id == input.Id);
+// if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
+// if (wmsTask.TaskStatus != TaskStatusEnum.WEIZHIXING) throw Oops.Oh("鍙湁鏈墽琛岀殑浠诲姟鎵嶈兘鏇存柊浠诲姟浼樺厛绾э紒");
+// if (wmsTask.TaskLevel == 1) throw Oops.Oh("浠诲姟宸蹭负鏈�浣庣骇鍒紒");
+// wmsTask.TaskLevel -= 1;
+// await _wmsTaskRep.UpdateAsync(wmsTask);
+// }
- /// <summary>
- /// 鍙栨秷
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("CancelTask")]
- public async Task CancelTask([FromBody] CancelInput input)
- {
- var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.Id == input.Id);
- if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
+// /// <summary>
+// /// 鍙栨秷
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("CancelTask")]
+// public async Task CancelTask([FromBody] CancelInput input)
+// {
+// var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.Id == input.Id);
+// if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
- if (wmsTask.TaskStatus != TaskStatusEnum.WEIZHIXING) throw Oops.Oh("鍙湁鏈墽琛岀殑浠诲姟鎵嶈兘鍙栨秷浠诲姟锛�");
+// if (wmsTask.TaskStatus != TaskStatusEnum.WEIZHIXING) throw Oops.Oh("鍙湁鏈墽琛岀殑浠诲姟鎵嶈兘鍙栨秷浠诲姟锛�");
- wmsTask.TaskStatus = TaskStatusEnum.QUXIAO;
- wmsTask.IsRead=true;
- await _wmsTaskRep.UpdateAsync(wmsTask);
- }
+// wmsTask.TaskStatus = TaskStatusEnum.QUXIAO;
+// wmsTask.IsRead=true;
+// await _wmsTaskRep.UpdateAsync(wmsTask);
+// }
- /// <summary>
- /// 鎵归噺鍙栨秷
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("batchCancel")]
- public async Task BatchCancel([FromBody] BatchCancelInput input)
- {
- int length = input.Id.Count;
- for (int i = 0; i < length; i++)
- {
- long Id = input.Id[i];
- var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.Id == Id);
- if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
+// /// <summary>
+// /// 鎵归噺鍙栨秷
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("batchCancel")]
+// public async Task BatchCancel([FromBody] BatchCancelInput input)
+// {
+// int length = input.Id.Count;
+// for (int i = 0; i < length; i++)
+// {
+// long Id = input.Id[i];
+// var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.Id == Id);
+// if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
- if (wmsTask.TaskStatus != TaskStatusEnum.WEIZHIXING) throw Oops.Oh("鍙湁鏈墽琛岀殑浠诲姟鎵嶈兘鍙栨秷浠诲姟锛�");
+// if (wmsTask.TaskStatus != TaskStatusEnum.WEIZHIXING) throw Oops.Oh("鍙湁鏈墽琛岀殑浠诲姟鎵嶈兘鍙栨秷浠诲姟锛�");
- wmsTask.TaskStatus = TaskStatusEnum.QUXIAO;
- await _wmsTaskRep.UpdateAsync(wmsTask);
- }
- }
+// wmsTask.TaskStatus = TaskStatusEnum.QUXIAO;
+// await _wmsTaskRep.UpdateAsync(wmsTask);
+// }
+// }
- /// <summary>
- /// 鎵归噺鏆傚仠
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("batchBreak")]
- public async Task BatchBreak([FromBody] BatchBreakInput input)
- {
- int length = input.Id.Count;
- for (int i = 0; i < length; i++)
- {
- long Id = input.Id[i];
- var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.Id == Id);
- if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
+// /// <summary>
+// /// 鎵归噺鏆傚仠
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("batchBreak")]
+// public async Task BatchBreak([FromBody] BatchBreakInput input)
+// {
+// int length = input.Id.Count;
+// for (int i = 0; i < length; i++)
+// {
+// long Id = input.Id[i];
+// var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.Id == Id);
+// if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
- if (wmsTask.TaskStatus != TaskStatusEnum.WEIZHIXING) throw Oops.Oh("鍙湁鏈墽琛岀殑浠诲姟鎵嶈兘鏆傚仠浠诲姟锛�");
+// if (wmsTask.TaskStatus != TaskStatusEnum.WEIZHIXING) throw Oops.Oh("鍙湁鏈墽琛岀殑浠诲姟鎵嶈兘鏆傚仠浠诲姟锛�");
- wmsTask.TaskStatus = TaskStatusEnum.ZANTING;
- await _wmsTaskRep.UpdateAsync(wmsTask);
- }
- }
+// wmsTask.TaskStatus = TaskStatusEnum.ZANTING;
+// await _wmsTaskRep.UpdateAsync(wmsTask);
+// }
+// }
- /// <summary>
- /// 鎵归噺缁х画
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("batchContinue")]
- public async Task BatchContinue([FromBody] BatchContinueInput input)
- {
- int length = input.Id.Count;
- for (int i = 0; i < length; i++)
- {
- long Id = input.Id[i];
- var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.Id == Id);
- if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
+// /// <summary>
+// /// 鎵归噺缁х画
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("batchContinue")]
+// public async Task BatchContinue([FromBody] BatchContinueInput input)
+// {
+// int length = input.Id.Count;
+// for (int i = 0; i < length; i++)
+// {
+// long Id = input.Id[i];
+// var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.Id == Id);
+// if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
- if (wmsTask.TaskStatus != TaskStatusEnum.ZANTING) throw Oops.Oh("鍙湁鏆傚仠鐨勪换鍔℃墠鑳界户缁换鍔★紒");
+// if (wmsTask.TaskStatus != TaskStatusEnum.ZANTING) throw Oops.Oh("鍙湁鏆傚仠鐨勪换鍔℃墠鑳界户缁换鍔★紒");
- wmsTask.TaskStatus = TaskStatusEnum.WEIZHIXING;
- await _wmsTaskRep.UpdateAsync(wmsTask);
- }
- }
+// wmsTask.TaskStatus = TaskStatusEnum.WEIZHIXING;
+// await _wmsTaskRep.UpdateAsync(wmsTask);
+// }
+// }
- /// <summary>
- /// 鑾峰彇鍑哄叆搴撲换鍔＄鐞�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("detail")]
- public async Task<TaskOutput> Get([FromQuery] QueryeWmsTaskInput input)
- {
- return (await _wmsTaskRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<TaskOutput>();
- }
+// /// <summary>
+// /// 鑾峰彇鍑哄叆搴撲换鍔＄鐞�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("detail")]
+// public async Task<TaskOutput> Get([FromQuery] QueryeWmsTaskInput input)
+// {
+// return (await _wmsTaskRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<TaskOutput>();
+// }
- /// <summary>
- /// 鑾峰彇鍑哄叆搴撲换鍔＄鐞嗗垪琛�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("list")]
- public async Task<List<TaskOutput>> List([FromQuery] TaskInput input)
- {
- return await _wmsTaskRep.DetachedEntities.ProjectToType<TaskOutput>().ToListAsync();
- }
+// /// <summary>
+// /// 鑾峰彇鍑哄叆搴撲换鍔＄鐞嗗垪琛�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("list")]
+// public async Task<List<TaskOutput>> List([FromQuery] TaskInput input)
+// {
+// return await _wmsTaskRep.DetachedEntities.ProjectToType<TaskOutput>().ToListAsync();
+// }
- /// <summary>
- /// Excel妯℃澘瀵煎叆鍑哄叆搴撲换鍔＄鐞嗗姛鑳�
- /// </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("WmsTask", "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<TaskOutput> wmsTaskList = DataConvertUtil.ToObjectList(headers, data, sheetName, keys, excelTemplate?.DataStartLine ?? 2, out Dictionary<string, TaskOutput> dict);
- List<Dictionary<string, object>> uniqueKeyValueDictList = wmsTaskList.ParseUniqueKeyValueDictList(keys.ToList(), excelTemplate?.DataStartLine ?? 2, sheetName);
- var filters = DataConvertUtil.GetExpressionListByUniqueDict<WmsTask>(keys.ToList(), uniqueKeyValueDictList, size);
- var selectKeys = keys.ToList();
- if (!selectKeys.Contains("Id")) selectKeys.Add("Id");
- var selector = DataConvertUtil.GetSelectExpressionListByUniqueDict<WmsTask, TaskOutput>(selectKeys);
- List<WmsTask> updates = new();
- List<WmsTask> adds = new();
+// /// <summary>
+// /// Excel妯℃澘瀵煎叆鍑哄叆搴撲换鍔＄鐞嗗姛鑳�
+// /// </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("WmsTask", "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<TaskOutput> wmsTaskList = DataConvertUtil.ToObjectList(headers, data, sheetName, keys, excelTemplate?.DataStartLine ?? 2, out Dictionary<string, TaskOutput> dict);
+// List<Dictionary<string, object>> uniqueKeyValueDictList = wmsTaskList.ParseUniqueKeyValueDictList(keys.ToList(), excelTemplate?.DataStartLine ?? 2, sheetName);
+// var filters = DataConvertUtil.GetExpressionListByUniqueDict<WmsTask>(keys.ToList(), uniqueKeyValueDictList, size);
+// var selectKeys = keys.ToList();
+// if (!selectKeys.Contains("Id")) selectKeys.Add("Id");
+// var selector = DataConvertUtil.GetSelectExpressionListByUniqueDict<WmsTask, TaskOutput>(selectKeys);
+// List<WmsTask> updates = new();
+// List<WmsTask> adds = new();
- lock (_lock)
- {
- foreach (var filter in filters)
- {
- var wmsTaskExistSubList = _wmsTaskRep.Where(filter).Select(selector).ToList();
- wmsTaskExistSubList.ForEach(x =>
- {
- var k = DataConvertUtil.GetKey(x, keys);
- if (dict.ContainsKey(k)) dict[k].Id = x.Id;
- });
- }
+// lock (_lock)
+// {
+// foreach (var filter in filters)
+// {
+// var wmsTaskExistSubList = _wmsTaskRep.Where(filter).Select(selector).ToList();
+// wmsTaskExistSubList.ForEach(x =>
+// {
+// var k = DataConvertUtil.GetKey(x, keys);
+// if (dict.ContainsKey(k)) dict[k].Id = x.Id;
+// });
+// }
- foreach (var wmsTask in wmsTaskList)
- {
- if (wmsTask.Id > 0)
- {
- if (importExcelType == ImportExcelType.ADD_AND_UPDATE) updates.Add(wmsTask.Adapt<WmsTask>());
- }
- else
- {
- adds.Add(wmsTask.Adapt<WmsTask>());
- }
- }
+// foreach (var wmsTask in wmsTaskList)
+// {
+// if (wmsTask.Id > 0)
+// {
+// if (importExcelType == ImportExcelType.ADD_AND_UPDATE) updates.Add(wmsTask.Adapt<WmsTask>());
+// }
+// else
+// {
+// adds.Add(wmsTask.Adapt<WmsTask>());
+// }
+// }
- if (importExcelType == ImportExcelType.ADD_AND_UPDATE) updates.ForEach(x => _wmsTaskRep.Update(x));
+// if (importExcelType == ImportExcelType.ADD_AND_UPDATE) updates.ForEach(x => _wmsTaskRep.Update(x));
- var maxId = _wmsTaskRep.DetachedEntities.OrderByDescending(x => x.Id).Select(x => x.Id).FirstOrDefault();
- adds.ForEach(x => x.Id = ++maxId);
- Db.GetDbContext().Set<WmsTask>().AddRange(adds);
- Db.GetDbContext().SaveChanges();
- }
+// var maxId = _wmsTaskRep.DetachedEntities.OrderByDescending(x => x.Id).Select(x => x.Id).FirstOrDefault();
+// adds.ForEach(x => x.Id = ++maxId);
+// Db.GetDbContext().Set<WmsTask>().AddRange(adds);
+// Db.GetDbContext().SaveChanges();
+// }
- await Task.CompletedTask;
- return adds.Count;
- }
+// await Task.CompletedTask;
+// return adds.Count;
+// }
- /// <summary>
- /// 鏍规嵁鐗堟湰涓嬭浇鍑哄叆搴撲换鍔＄鐞嗙殑Excel瀵煎叆妯℃澘
- /// </summary>
- /// <param name="version">妯℃澘鐗堟湰</param>
- /// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
- [HttpGet("downloadExcelTemplate")]
- public async Task<IActionResult> DownloadExcelTemplate([FromQuery] string version)
- {
- var excelTemplate = await _sysExcelTemplateService.GetByAppNameAndClassNameAndVersionAsync("WmsTask", 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>
+// /// 鏍规嵁鐗堟湰涓嬭浇鍑哄叆搴撲换鍔＄鐞嗙殑Excel瀵煎叆妯℃澘
+// /// </summary>
+// /// <param name="version">妯℃澘鐗堟湰</param>
+// /// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
+// [HttpGet("downloadExcelTemplate")]
+// public async Task<IActionResult> DownloadExcelTemplate([FromQuery] string version)
+// {
+// var excelTemplate = await _sysExcelTemplateService.GetByAppNameAndClassNameAndVersionAsync("WmsTask", 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>
- /// 鏍规嵁鍑哄叆搴撲换鍔＄鐞嗘煡璇㈠弬鏁板鍑篍xcel
- /// </summary>
- /// <param name="input">鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鏌ヨ鍙傛暟</param>
- /// <returns>瀵煎嚭鐨凟xcel鏂囦欢</returns>
- [HttpGet("toExcel")]
- public async Task<IActionResult> ToExcelAsync([FromQuery] WmsTaskSearchNonPage input)
- {
- var wmsTaskList = await ListNonPageAsync(input);
- MemoryStream ms = new();
- DataConvertUtil.ToExcelData(wmsTaskList, _sysDictTypeRep, _sysDictDataRep, out List<string> headers,
- out List<List<object>> data, out string sheetName);
- var excelTemplate = await _sysExcelTemplateService.GetByAppNameAndClassNameAndVersionAsync("WmsTask", "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 };
- }
- }
-}
+// /// <summary>
+// /// 鏍规嵁鍑哄叆搴撲换鍔＄鐞嗘煡璇㈠弬鏁板鍑篍xcel
+// /// </summary>
+// /// <param name="input">鍑哄叆搴撲换鍔＄鐞嗭紙鐔熷寲搴擄級鏌ヨ鍙傛暟</param>
+// /// <returns>瀵煎嚭鐨凟xcel鏂囦欢</returns>
+// [HttpGet("toExcel")]
+// public async Task<IActionResult> ToExcelAsync([FromQuery] WmsTaskSearchNonPage input)
+// {
+// var wmsTaskList = await ListNonPageAsync(input);
+// MemoryStream ms = new();
+// DataConvertUtil.ToExcelData(wmsTaskList, _sysDictTypeRep, _sysDictDataRep, out List<string> headers,
+// out List<List<object>> data, out string sheetName);
+// var excelTemplate = await _sysExcelTemplateService.GetByAppNameAndClassNameAndVersionAsync("WmsTask", "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/WmsOrder/WmsTakeMaterialOrder/WmsTakeMaterialOrderService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsOrder/WmsTakeMaterialOrder/WmsTakeMaterialOrderService.cs
index 7eff9fe..5ad1e29 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsOrder/WmsTakeMaterialOrder/WmsTakeMaterialOrderService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsOrder/WmsTakeMaterialOrder/WmsTakeMaterialOrderService.cs
@@ -1,613 +1,613 @@
-锘縰sing Furion.DatabaseAccessor;
-using Furion.DatabaseAccessor.Extensions;
-using Furion.DependencyInjection;
-using Furion.DynamicApiController;
-using Furion.FriendlyException;
-using Admin.NET.Core;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using System.Linq.Dynamic.Core;
-using Microsoft.AspNetCore.Http;
-using System.Text;
-using System.Web;
-using SixLabors.ImageSharp;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Information;
-using Furion;
-using Serilog;
-using Furion.RemoteRequest.Extensions;
-using HttpMethod = System.Net.Http.HttpMethod;
+锘�//using Furion.DatabaseAccessor;
+//using Furion.DatabaseAccessor.Extensions;
+//using Furion.DependencyInjection;
+//using Furion.DynamicApiController;
+//using Furion.FriendlyException;
+//using Admin.NET.Core;
+//using Mapster;
+//using Microsoft.AspNetCore.Mvc;
+//using Microsoft.EntityFrameworkCore;
+//using System.Linq.Dynamic.Core;
+//using Microsoft.AspNetCore.Http;
+//using System.Text;
+//using System.Web;
+//using SixLabors.ImageSharp;
+//using OfficeOpenXml.FormulaParsing.Excel.Functions.Information;
+//using Furion;
+//using Serilog;
+//using Furion.RemoteRequest.Extensions;
+//using HttpMethod = System.Net.Http.HttpMethod;
-namespace Admin.NET.Application
-{
- /// <summary>
- /// 棰嗘枡鍗曟湇鍔�
- /// </summary>
- [ApiDescriptionSettings("鍗曟嵁绠＄悊", Name = "WmsTakeMaterialOrder", Order = 100)]
- [Route("api/[Controller]")]
- public class WmsTakeMaterialOrderService : IWmsTakeMaterialOrderService, IDynamicApiController, ITransient
- {
- private readonly IRepository<WmsTakeMaterialOrder,MasterDbContextLocator> _wmsTakeMaterialOrderRep;
- private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
- private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
- private readonly ISysExcelTemplateService _sysExcelTemplateService;
- private readonly static object _lock = new();
- private readonly IRepository<WmsTakeMaterialOrderDetail, MasterDbContextLocator> _wmsTakeMaterialOrderDetailRep;
- private readonly IRepository<WmsOrderType, MasterDbContextLocator> _wmsOrderTypeRep;
- private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
- private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
- private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
- private readonly IRepository<WmsSortOrder, MasterDbContextLocator> _wmsSortOrderRep;
- private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
+//namespace Admin.NET.Application
+//{
+// /// <summary>
+// /// 棰嗘枡鍗曟湇鍔�
+// /// </summary>
+// [ApiDescriptionSettings("鍗曟嵁绠＄悊", Name = "WmsTakeMaterialOrder", Order = 100)]
+// [Route("api/[Controller]")]
+// public class WmsTakeMaterialOrderService : IWmsTakeMaterialOrderService, IDynamicApiController, ITransient
+// {
+// private readonly IRepository<WmsTakeMaterialOrder,MasterDbContextLocator> _wmsTakeMaterialOrderRep;
+// private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
+// private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
+// private readonly ISysExcelTemplateService _sysExcelTemplateService;
+// private readonly static object _lock = new();
+// private readonly IRepository<WmsTakeMaterialOrderDetail, MasterDbContextLocator> _wmsTakeMaterialOrderDetailRep;
+// private readonly IRepository<WmsOrderType, MasterDbContextLocator> _wmsOrderTypeRep;
+// private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
+// private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
+// private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
+// private readonly IRepository<WmsSortOrder, MasterDbContextLocator> _wmsSortOrderRep;
+// private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
- public WmsTakeMaterialOrderService(
- IRepository<WmsTakeMaterialOrder,MasterDbContextLocator> wmsTakeMaterialOrderRep
- ,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
- ,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
- ,ISysExcelTemplateService sysExcelTemplateService
- ,IRepository<WmsTakeMaterialOrderDetail, MasterDbContextLocator> wmsTakeMaterialOrderDetailRep
- , IRepository<WmsOrderType, MasterDbContextLocator> wmsOrderTypeRep
- , IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep
- , IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep
- , IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep
- , IRepository<WmsSortOrder, MasterDbContextLocator> wmsSortOrderRep
- , IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep
- )
- {
- _wmsTakeMaterialOrderRep = wmsTakeMaterialOrderRep;
- _sysDictTypeRep = sysDictTypeRep;
- _sysDictDataRep = sysDictDataRep;
- _sysExcelTemplateService = sysExcelTemplateService;
- _wmsTakeMaterialOrderDetailRep = wmsTakeMaterialOrderDetailRep;
- _wmsOrderTypeRep = wmsOrderTypeRep;
- _wmsPlaceRep = wmsPlaceRep;
- _wmsMaterialStockRep = wmsMaterialStockRep;
- _wmsMaterialContainerRep = wmsMaterialContainerRep;
- _wmsSortOrderRep = wmsSortOrderRep;
- _wmsTaskRep = wmsTaskRep;
- }
+// public WmsTakeMaterialOrderService(
+// IRepository<WmsTakeMaterialOrder,MasterDbContextLocator> wmsTakeMaterialOrderRep
+// ,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
+// ,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
+// ,ISysExcelTemplateService sysExcelTemplateService
+// ,IRepository<WmsTakeMaterialOrderDetail, MasterDbContextLocator> wmsTakeMaterialOrderDetailRep
+// , IRepository<WmsOrderType, MasterDbContextLocator> wmsOrderTypeRep
+// , IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep
+// , IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep
+// , IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep
+// , IRepository<WmsSortOrder, MasterDbContextLocator> wmsSortOrderRep
+// , IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep
+// )
+// {
+// _wmsTakeMaterialOrderRep = wmsTakeMaterialOrderRep;
+// _sysDictTypeRep = sysDictTypeRep;
+// _sysDictDataRep = sysDictDataRep;
+// _sysExcelTemplateService = sysExcelTemplateService;
+// _wmsTakeMaterialOrderDetailRep = wmsTakeMaterialOrderDetailRep;
+// _wmsOrderTypeRep = wmsOrderTypeRep;
+// _wmsPlaceRep = wmsPlaceRep;
+// _wmsMaterialStockRep = wmsMaterialStockRep;
+// _wmsMaterialContainerRep = wmsMaterialContainerRep;
+// _wmsSortOrderRep = wmsSortOrderRep;
+// _wmsTaskRep = wmsTaskRep;
+// }
- /// <summary>
- /// 鍒嗛〉鏌ヨ棰嗘枡鍗�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("page")]
- public async Task<PageResult<WmsTakeMaterialOrderOutput>> Page([FromQuery] WmsTakeMaterialOrderSearch input)
- {
- var wmsTakeMaterialOrders = await _wmsTakeMaterialOrderRep.DetachedEntities
- .Where(!string.IsNullOrEmpty(input.MoveType), u => EF.Functions.Like(u.MoveType, $"%{input.MoveType.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.NO), u => EF.Functions.Like(u.NO, $"%{input.NO.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.WBSElementcode), u => EF.Functions.Like(u.WBSElementcode, $"%{input.WBSElementcode.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.BenefitingDepartcode), u => EF.Functions.Like(u.BenefitingDepartcode, $"%{input.BenefitingDepartcode.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.CostCenterID), u => EF.Functions.Like(u.CostCenterID, $"%{input.CostCenterID.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.FI_Client_Analysis_H), u => EF.Functions.Like(u.FI_Client_Analysis_H, $"%{input.FI_Client_Analysis_H.Trim()}%"))
- .Where(input.IsInnerCompany != null, u => u.IsInnerCompany == input.IsInnerCompany)
- .Where(!string.IsNullOrEmpty(input.PickerID), u => EF.Functions.Like(u.PickerID, $"%{input.PickerID.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.WarehouseCentername), u => EF.Functions.Like(u.WarehouseCentername, $"%{input.WarehouseCentername.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.Companyname), u => EF.Functions.Like(u.Companyname, $"%{input.Companyname.Trim()}%"))
- .Where(input.OrderStatus != null, u => u.OrderStatus == input.OrderStatus)
- .OrderBy(PageInputOrder.OrderBuilder<WmsTakeMaterialOrderSearch>(input))
- .ProjectToType<WmsTakeMaterialOrderOutput>()
- .ToADPagedListAsync(input.PageNo, input.PageSize);
- return wmsTakeMaterialOrders;
- }
+// /// <summary>
+// /// 鍒嗛〉鏌ヨ棰嗘枡鍗�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("page")]
+// public async Task<PageResult<WmsTakeMaterialOrderOutput>> Page([FromQuery] WmsTakeMaterialOrderSearch input)
+// {
+// var wmsTakeMaterialOrders = await _wmsTakeMaterialOrderRep.DetachedEntities
+// .Where(!string.IsNullOrEmpty(input.MoveType), u => EF.Functions.Like(u.MoveType, $"%{input.MoveType.Trim()}%"))
+// .Where(!string.IsNullOrEmpty(input.NO), u => EF.Functions.Like(u.NO, $"%{input.NO.Trim()}%"))
+// .Where(!string.IsNullOrEmpty(input.WBSElementcode), u => EF.Functions.Like(u.WBSElementcode, $"%{input.WBSElementcode.Trim()}%"))
+// .Where(!string.IsNullOrEmpty(input.BenefitingDepartcode), u => EF.Functions.Like(u.BenefitingDepartcode, $"%{input.BenefitingDepartcode.Trim()}%"))
+// .Where(!string.IsNullOrEmpty(input.CostCenterID), u => EF.Functions.Like(u.CostCenterID, $"%{input.CostCenterID.Trim()}%"))
+// .Where(!string.IsNullOrEmpty(input.FI_Client_Analysis_H), u => EF.Functions.Like(u.FI_Client_Analysis_H, $"%{input.FI_Client_Analysis_H.Trim()}%"))
+// .Where(input.IsInnerCompany != null, u => u.IsInnerCompany == input.IsInnerCompany)
+// .Where(!string.IsNullOrEmpty(input.PickerID), u => EF.Functions.Like(u.PickerID, $"%{input.PickerID.Trim()}%"))
+// .Where(!string.IsNullOrEmpty(input.WarehouseCentername), u => EF.Functions.Like(u.WarehouseCentername, $"%{input.WarehouseCentername.Trim()}%"))
+// .Where(!string.IsNullOrEmpty(input.Companyname), u => EF.Functions.Like(u.Companyname, $"%{input.Companyname.Trim()}%"))
+// .Where(input.OrderStatus != null, u => u.OrderStatus == input.OrderStatus)
+// .OrderBy(PageInputOrder.OrderBuilder<WmsTakeMaterialOrderSearch>(input))
+// .ProjectToType<WmsTakeMaterialOrderOutput>()
+// .ToADPagedListAsync(input.PageNo, input.PageSize);
+// return wmsTakeMaterialOrders;
+// }
- /// <summary>
- /// 涓嶅垎椤垫煡璇㈤鏂欏崟鍒楄〃
- /// </summary>
- /// <param name="input">棰嗘枡鍗曟煡璇㈠弬鏁�</param>
- /// <returns>(棰嗘枡鍗�)瀹炰緥鍒楄〃</returns>
- [HttpGet("listNonPage")]
- public async Task<List<WmsTakeMaterialOrderOutput>> ListNonPageAsync([FromQuery] WmsTakeMaterialOrderSearchNonPage input)
- {
- var pMoveType = input.MoveType?.Trim() ?? "";
- var pNO = input.NO?.Trim() ?? "";
- var pWBSElementcode = input.WBSElementcode?.Trim() ?? "";
- var pBenefitingDepartcode = input.BenefitingDepartcode?.Trim() ?? "";
- var pCostCenterID = input.CostCenterID?.Trim() ?? "";
- var pFI_Client_Analysis_H = input.FI_Client_Analysis_H?.Trim() ?? "";
- var pIsInnerCompany = input.IsInnerCompany;
- var pPickerID = input.PickerID?.Trim() ?? "";
- var pWarehouseCentername = input.WarehouseCentername?.Trim() ?? "";
- var pCompanyname = input.Companyname?.Trim() ?? "";
- var pOrderStatus = input.OrderStatus;
- var wmsTakeMaterialOrders = await _wmsTakeMaterialOrderRep.DetachedEntities
- .Where(!string.IsNullOrEmpty(pMoveType), u => EF.Functions.Like(u.MoveType, $"%{pMoveType}%"))
- .Where(!string.IsNullOrEmpty(pNO), u => EF.Functions.Like(u.NO, $"%{pNO}%"))
- .Where(!string.IsNullOrEmpty(pWBSElementcode), u => EF.Functions.Like(u.WBSElementcode, $"%{pWBSElementcode}%"))
- .Where(!string.IsNullOrEmpty(pBenefitingDepartcode), u => EF.Functions.Like(u.BenefitingDepartcode, $"%{pBenefitingDepartcode}%"))
- .Where(!string.IsNullOrEmpty(pCostCenterID), u => EF.Functions.Like(u.CostCenterID, $"%{pCostCenterID}%"))
- .Where(!string.IsNullOrEmpty(pFI_Client_Analysis_H), u => EF.Functions.Like(u.FI_Client_Analysis_H, $"%{pFI_Client_Analysis_H}%"))
- .Where(pIsInnerCompany != null, u => u.IsInnerCompany == pIsInnerCompany)
- .Where(!string.IsNullOrEmpty(pPickerID), u => EF.Functions.Like(u.PickerID, $"%{pPickerID}%"))
- .Where(!string.IsNullOrEmpty(pWarehouseCentername), u => EF.Functions.Like(u.WarehouseCentername, $"%{pWarehouseCentername}%"))
- .Where(!string.IsNullOrEmpty(pCompanyname), u => EF.Functions.Like(u.Companyname, $"%{pCompanyname}%"))
- .Where(pOrderStatus != null, u => u.OrderStatus == pOrderStatus)
- .OrderBy(PageInputOrder.OrderNonPageBuilder(input))
- .ProjectToType<WmsTakeMaterialOrderOutput>()
- .ToListAsync();
- return wmsTakeMaterialOrders;
- }
+// /// <summary>
+// /// 涓嶅垎椤垫煡璇㈤鏂欏崟鍒楄〃
+// /// </summary>
+// /// <param name="input">棰嗘枡鍗曟煡璇㈠弬鏁�</param>
+// /// <returns>(棰嗘枡鍗�)瀹炰緥鍒楄〃</returns>
+// [HttpGet("listNonPage")]
+// public async Task<List<WmsTakeMaterialOrderOutput>> ListNonPageAsync([FromQuery] WmsTakeMaterialOrderSearchNonPage input)
+// {
+// var pMoveType = input.MoveType?.Trim() ?? "";
+// var pNO = input.NO?.Trim() ?? "";
+// var pWBSElementcode = input.WBSElementcode?.Trim() ?? "";
+// var pBenefitingDepartcode = input.BenefitingDepartcode?.Trim() ?? "";
+// var pCostCenterID = input.CostCenterID?.Trim() ?? "";
+// var pFI_Client_Analysis_H = input.FI_Client_Analysis_H?.Trim() ?? "";
+// var pIsInnerCompany = input.IsInnerCompany;
+// var pPickerID = input.PickerID?.Trim() ?? "";
+// var pWarehouseCentername = input.WarehouseCentername?.Trim() ?? "";
+// var pCompanyname = input.Companyname?.Trim() ?? "";
+// var pOrderStatus = input.OrderStatus;
+// var wmsTakeMaterialOrders = await _wmsTakeMaterialOrderRep.DetachedEntities
+// .Where(!string.IsNullOrEmpty(pMoveType), u => EF.Functions.Like(u.MoveType, $"%{pMoveType}%"))
+// .Where(!string.IsNullOrEmpty(pNO), u => EF.Functions.Like(u.NO, $"%{pNO}%"))
+// .Where(!string.IsNullOrEmpty(pWBSElementcode), u => EF.Functions.Like(u.WBSElementcode, $"%{pWBSElementcode}%"))
+// .Where(!string.IsNullOrEmpty(pBenefitingDepartcode), u => EF.Functions.Like(u.BenefitingDepartcode, $"%{pBenefitingDepartcode}%"))
+// .Where(!string.IsNullOrEmpty(pCostCenterID), u => EF.Functions.Like(u.CostCenterID, $"%{pCostCenterID}%"))
+// .Where(!string.IsNullOrEmpty(pFI_Client_Analysis_H), u => EF.Functions.Like(u.FI_Client_Analysis_H, $"%{pFI_Client_Analysis_H}%"))
+// .Where(pIsInnerCompany != null, u => u.IsInnerCompany == pIsInnerCompany)
+// .Where(!string.IsNullOrEmpty(pPickerID), u => EF.Functions.Like(u.PickerID, $"%{pPickerID}%"))
+// .Where(!string.IsNullOrEmpty(pWarehouseCentername), u => EF.Functions.Like(u.WarehouseCentername, $"%{pWarehouseCentername}%"))
+// .Where(!string.IsNullOrEmpty(pCompanyname), u => EF.Functions.Like(u.Companyname, $"%{pCompanyname}%"))
+// .Where(pOrderStatus != null, u => u.OrderStatus == pOrderStatus)
+// .OrderBy(PageInputOrder.OrderNonPageBuilder(input))
+// .ProjectToType<WmsTakeMaterialOrderOutput>()
+// .ToListAsync();
+// return wmsTakeMaterialOrders;
+// }
- /// <summary>
- /// 鑾峰彇鍗曟嵁鏄庣粏
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("PageDetail")]
- public async Task<PageResult<WmsTakeMaterialOrderDetailOutput>> PageDetail([FromQuery] TakePageDetailInput input)
- {
- var wmsOrders = await _wmsTakeMaterialOrderDetailRep.DetachedEntities
- .Where(input.Id != null, u => u.OrderId == input.Id)
- .ProjectToType<WmsTakeMaterialOrderDetailOutput>()
- .ToADPagedListAsync(input.PageNo, input.PageSize);
- return wmsOrders;
- }
+// /// <summary>
+// /// 鑾峰彇鍗曟嵁鏄庣粏
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("PageDetail")]
+// public async Task<PageResult<WmsTakeMaterialOrderDetailOutput>> PageDetail([FromQuery] TakePageDetailInput input)
+// {
+// var wmsOrders = await _wmsTakeMaterialOrderDetailRep.DetachedEntities
+// .Where(input.Id != null, u => u.OrderId == input.Id)
+// .ProjectToType<WmsTakeMaterialOrderDetailOutput>()
+// .ToADPagedListAsync(input.PageNo, input.PageSize);
+// return wmsOrders;
+// }
- /// <summary>
- /// 鍒嗛〉鏌ヨ鐗╂枡搴撳瓨
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("stockPage")]
- public async Task<PageResult<TakeMaterialStockOutput>> StockPage([FromQuery] TakeMaterialStockSearch input)
- {
- //浠庢湭鎵ц鍜屾墽琛屼腑鐨勪换鍔′腑鑾峰彇搴撲綅杩涜绛涢��(鏈啓)
+// /// <summary>
+// /// 鍒嗛〉鏌ヨ鐗╂枡搴撳瓨
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("stockPage")]
+// public async Task<PageResult<TakeMaterialStockOutput>> StockPage([FromQuery] TakeMaterialStockSearch input)
+// {
+// //浠庢湭鎵ц鍜屾墽琛屼腑鐨勪换鍔′腑鑾峰彇搴撲綅杩涜绛涢��(鏈啓)
- //鏌ヨ鎵�鏈夎閿佸畾搴撲綅鍜屽緟鍑虹殑搴撳瓨
- var lockPlace = await _wmsPlaceRep.DetachedEntities.Where(x => x.Islock == YesOrNot.Y || x.PlaceStatus == PlaceStatus.DAICHU).Select(x => x.PlaceCode).ToListAsync();
+// //鏌ヨ鎵�鏈夎閿佸畾搴撲綅鍜屽緟鍑虹殑搴撳瓨
+// var lockPlace = await _wmsPlaceRep.DetachedEntities.Where(x => x.Islock == YesOrNot.Y || x.PlaceStatus == PlaceStatus.DAICHU).Select(x => x.PlaceCode).ToListAsync();
- var wmsMaterialStocks = await _wmsMaterialStockRep.DetachedEntities
- .Where(u => u.StockNumber != 0)
- .Where(!string.IsNullOrEmpty(input.MaterialNo), u => EF.Functions.Like(u.MaterialNo, $"%{input.MaterialNo.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.MaterialName), u => EF.Functions.Like(u.MaterialName, $"%{input.MaterialName.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.ProjectCode), u => EF.Functions.Like(u.ProjectCode, $"%{input.ProjectCode.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.ContractCode), u => EF.Functions.Like(u.ContractCode, $"%{input.ContractCode.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.TACode), u => EF.Functions.Like(u.TACode, $"%{input.TACode.Trim()}%"))
- .Where(input.SearchBeginTime != null && input.SearchEndTime != null, u => u.CreatedTime >= DateTime.Parse(input.SearchBeginTime.Trim()) &&
- u.CreatedTime <= DateTime.Parse(input.SearchEndTime.Trim()))
- .Where(u => u.AreaId == 472817877401669)
- .Where(u => !lockPlace.Contains(u.PlaceCode))
- .ProjectToType<TakeMaterialStockOutput>()
- .ToADPagedListAsync(input.PageNo, input.PageSize);
- return wmsMaterialStocks;
- }
+// var wmsMaterialStocks = await _wmsMaterialStockRep.DetachedEntities
+// .Where(u => u.StockNumber != 0)
+// .Where(!string.IsNullOrEmpty(input.MaterialNo), u => EF.Functions.Like(u.MaterialNo, $"%{input.MaterialNo.Trim()}%"))
+// .Where(!string.IsNullOrEmpty(input.MaterialName), u => EF.Functions.Like(u.MaterialName, $"%{input.MaterialName.Trim()}%"))
+// .Where(!string.IsNullOrEmpty(input.ProjectCode), u => EF.Functions.Like(u.ProjectCode, $"%{input.ProjectCode.Trim()}%"))
+// .Where(!string.IsNullOrEmpty(input.ContractCode), u => EF.Functions.Like(u.ContractCode, $"%{input.ContractCode.Trim()}%"))
+// .Where(!string.IsNullOrEmpty(input.TACode), u => EF.Functions.Like(u.TACode, $"%{input.TACode.Trim()}%"))
+// .Where(input.SearchBeginTime != null && input.SearchEndTime != null, u => u.CreatedTime >= DateTime.Parse(input.SearchBeginTime.Trim()) &&
+// u.CreatedTime <= DateTime.Parse(input.SearchEndTime.Trim()))
+// .Where(u => u.AreaId == 472817877401669)
+// .Where(u => !lockPlace.Contains(u.PlaceCode))
+// .ProjectToType<TakeMaterialStockOutput>()
+// .ToADPagedListAsync(input.PageNo, input.PageSize);
+// return wmsMaterialStocks;
+// }
- /// <summary>
- /// 鐗╂枡缂栫爜涓嬫媺妗�
- /// </summary>
- /// <returns></returns>
- [HttpGet("GetMaterialNoList")]
- public async Task<List<MaterialNoListOutput>> GetMaterialNoList()
- {
- // 鏌ヨ搴撲綅琛ㄧ姸鎬佷负瀛樿揣鐨勫簱浣嶄綔涓烘煡璇㈠簱瀛樼殑鏉′欢 鍥哄畾搴撳尯
- List<string> wmsPlaceCodes = await _wmsPlaceRep.Where(u => u.PlaceStatus == PlaceStatus.CUNHUO && u.AreaId == 472817877401669)
- .Select(t => t.PlaceCode).ToListAsync();
- //浠庢湭鎵ц鍜屾墽琛屼腑鐨勪换鍔′腑鑾峰彇搴撲綅杩涜绛涢��(鏈啓)
- //鏌ヨ鎵�鏈夎閿佸畾搴撲綅鍜屽緟鍑虹殑搴撳瓨
- var lockPlace = await _wmsPlaceRep.DetachedEntities.Where(x => x.Islock == YesOrNot.Y || x.PlaceStatus == PlaceStatus.DAICHU).Select(x => x.PlaceCode).ToListAsync();
- //鏌ヨ搴撳瓨
- var wmsMaterialStocks = await _wmsMaterialStockRep.DetachedEntities
- .ToListAsync();
- //鏈墽琛屾垨鎵ц涓殑鏄庣粏鎵樼洏鐩稿叧搴撳瓨涓嶇户缁樉绀�
- wmsMaterialStocks = wmsMaterialStocks
- .Where(u => !lockPlace.Contains(u.PlaceCode))
- .GroupBy(x => x.MaterialNo).Select(x => x.First()).ToList();
- List<MaterialNoListOutput> MaterialNoListOutputLists = new List<MaterialNoListOutput>();
- foreach (var item in wmsMaterialStocks)
- {
- MaterialNoListOutput MaterialNoListOutput = new MaterialNoListOutput();
- MaterialNoListOutput.Code = item.MaterialNo;
- MaterialNoListOutput.MaterialNo = item.MaterialNo;
- MaterialNoListOutputLists.Add(MaterialNoListOutput);
- }
- return MaterialNoListOutputLists;
- }
+// /// <summary>
+// /// 鐗╂枡缂栫爜涓嬫媺妗�
+// /// </summary>
+// /// <returns></returns>
+// [HttpGet("GetMaterialNoList")]
+// public async Task<List<MaterialNoListOutput>> GetMaterialNoList()
+// {
+// // 鏌ヨ搴撲綅琛ㄧ姸鎬佷负瀛樿揣鐨勫簱浣嶄綔涓烘煡璇㈠簱瀛樼殑鏉′欢 鍥哄畾搴撳尯
+// List<string> wmsPlaceCodes = await _wmsPlaceRep.Where(u => u.PlaceStatus == PlaceStatus.CUNHUO && u.AreaId == 472817877401669)
+// .Select(t => t.PlaceCode).ToListAsync();
+// //浠庢湭鎵ц鍜屾墽琛屼腑鐨勪换鍔′腑鑾峰彇搴撲綅杩涜绛涢��(鏈啓)
+// //鏌ヨ鎵�鏈夎閿佸畾搴撲綅鍜屽緟鍑虹殑搴撳瓨
+// var lockPlace = await _wmsPlaceRep.DetachedEntities.Where(x => x.Islock == YesOrNot.Y || x.PlaceStatus == PlaceStatus.DAICHU).Select(x => x.PlaceCode).ToListAsync();
+// //鏌ヨ搴撳瓨
+// var wmsMaterialStocks = await _wmsMaterialStockRep.DetachedEntities
+// .ToListAsync();
+// //鏈墽琛屾垨鎵ц涓殑鏄庣粏鎵樼洏鐩稿叧搴撳瓨涓嶇户缁樉绀�
+// wmsMaterialStocks = wmsMaterialStocks
+// .Where(u => !lockPlace.Contains(u.PlaceCode))
+// .GroupBy(x => x.MaterialNo).Select(x => x.First()).ToList();
+// List<MaterialNoListOutput> MaterialNoListOutputLists = new List<MaterialNoListOutput>();
+// foreach (var item in wmsMaterialStocks)
+// {
+// MaterialNoListOutput MaterialNoListOutput = new MaterialNoListOutput();
+// MaterialNoListOutput.Code = item.MaterialNo;
+// MaterialNoListOutput.MaterialNo = item.MaterialNo;
+// MaterialNoListOutputLists.Add(MaterialNoListOutput);
+// }
+// return MaterialNoListOutputLists;
+// }
- /// <summary>
- /// 椤圭洰缂栫爜涓嬫媺妗�
- /// </summary>
- /// <returns></returns>
- [HttpGet("GetProjectCodeList")]
- public async Task<List<ProjectCodeListOutput>> GetProjectCodeList()
- {
- // 鏌ヨ搴撲綅琛ㄧ姸鎬佷负瀛樿揣鐨勫簱浣嶄綔涓烘煡璇㈠簱瀛樼殑鏉′欢 鍥哄畾搴撳尯
- List<string> wmsPlaceCodes = await _wmsPlaceRep.Where(u => u.PlaceStatus == PlaceStatus.CUNHUO && u.AreaId == 472817877401669)
- .Select(t => t.PlaceCode).ToListAsync();
- //浠庢湭鎵ц鍜屾墽琛屼腑鐨勪换鍔′腑鑾峰彇搴撲綅杩涜绛涢��(鏈啓)
- //鏌ヨ鎵�鏈夎閿佸畾搴撲綅鍜屽緟鍑虹殑搴撳瓨
- var lockPlace = await _wmsPlaceRep.DetachedEntities.Where(x => x.Islock == YesOrNot.Y || x.PlaceStatus == PlaceStatus.DAICHU).Select(x => x.PlaceCode).ToListAsync();
- //鏌ヨ搴撳瓨
- var wmsMaterialStocks = await _wmsMaterialStockRep.DetachedEntities
- .ToListAsync();
- //鏈墽琛屾垨鎵ц涓殑鏄庣粏鎵樼洏鐩稿叧搴撳瓨涓嶇户缁樉绀�
- wmsMaterialStocks = wmsMaterialStocks
- .Where(u => !lockPlace.Contains(u.PlaceCode))
- .GroupBy(x => x.ProjectCode).Select(x => x.First()).ToList();
- List<ProjectCodeListOutput> ProjectCodeListOutputLists = new List<ProjectCodeListOutput>();
- foreach (var item in wmsMaterialStocks)
- {
- ProjectCodeListOutput ProjectCodeListOutput = new ProjectCodeListOutput();
- ProjectCodeListOutput.Code = item.ProjectCode;
- ProjectCodeListOutput.ProjectCode = item.ProjectCode;
- ProjectCodeListOutputLists.Add(ProjectCodeListOutput);
- }
- return ProjectCodeListOutputLists;
- }
+// /// <summary>
+// /// 椤圭洰缂栫爜涓嬫媺妗�
+// /// </summary>
+// /// <returns></returns>
+// [HttpGet("GetProjectCodeList")]
+// public async Task<List<ProjectCodeListOutput>> GetProjectCodeList()
+// {
+// // 鏌ヨ搴撲綅琛ㄧ姸鎬佷负瀛樿揣鐨勫簱浣嶄綔涓烘煡璇㈠簱瀛樼殑鏉′欢 鍥哄畾搴撳尯
+// List<string> wmsPlaceCodes = await _wmsPlaceRep.Where(u => u.PlaceStatus == PlaceStatus.CUNHUO && u.AreaId == 472817877401669)
+// .Select(t => t.PlaceCode).ToListAsync();
+// //浠庢湭鎵ц鍜屾墽琛屼腑鐨勪换鍔′腑鑾峰彇搴撲綅杩涜绛涢��(鏈啓)
+// //鏌ヨ鎵�鏈夎閿佸畾搴撲綅鍜屽緟鍑虹殑搴撳瓨
+// var lockPlace = await _wmsPlaceRep.DetachedEntities.Where(x => x.Islock == YesOrNot.Y || x.PlaceStatus == PlaceStatus.DAICHU).Select(x => x.PlaceCode).ToListAsync();
+// //鏌ヨ搴撳瓨
+// var wmsMaterialStocks = await _wmsMaterialStockRep.DetachedEntities
+// .ToListAsync();
+// //鏈墽琛屾垨鎵ц涓殑鏄庣粏鎵樼洏鐩稿叧搴撳瓨涓嶇户缁樉绀�
+// wmsMaterialStocks = wmsMaterialStocks
+// .Where(u => !lockPlace.Contains(u.PlaceCode))
+// .GroupBy(x => x.ProjectCode).Select(x => x.First()).ToList();
+// List<ProjectCodeListOutput> ProjectCodeListOutputLists = new List<ProjectCodeListOutput>();
+// foreach (var item in wmsMaterialStocks)
+// {
+// ProjectCodeListOutput ProjectCodeListOutput = new ProjectCodeListOutput();
+// ProjectCodeListOutput.Code = item.ProjectCode;
+// ProjectCodeListOutput.ProjectCode = item.ProjectCode;
+// ProjectCodeListOutputLists.Add(ProjectCodeListOutput);
+// }
+// return ProjectCodeListOutputLists;
+// }
- /// <summary>
- /// 澧炲姞棰嗘枡鍗�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("add")]
- public async Task Add(AddWmsTakeMaterialOrderInput input)
- {
- // 鏌ヨ鍗曟嵁灏忕被鏄�滅敓浜у叆搴撯�濈殑Id
- var wmsOrderType = await _wmsOrderTypeRep.FirstOrDefaultAsync(z => z.Name.Contains("棰嗘枡鍑哄簱"));
- var wmsTakeMaterialOrder = input.Adapt<WmsTakeMaterialOrder>();
- wmsTakeMaterialOrder.SOID = 66666;
- wmsTakeMaterialOrder.OrderLargeCategory = wmsOrderType != null ? wmsOrderType.Pid : 0;
- wmsTakeMaterialOrder.OrderSubclass = wmsOrderType != null ? wmsOrderType.Id : 0;
- wmsTakeMaterialOrder.OrderStatus = OrderStatusEnum.WEIXIAFA;
- await _wmsTakeMaterialOrderRep.InsertAsync(wmsTakeMaterialOrder);
- }
+// /// <summary>
+// /// 澧炲姞棰嗘枡鍗�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("add")]
+// public async Task Add(AddWmsTakeMaterialOrderInput input)
+// {
+// // 鏌ヨ鍗曟嵁灏忕被鏄�滅敓浜у叆搴撯�濈殑Id
+// var wmsOrderType = await _wmsOrderTypeRep.FirstOrDefaultAsync(z => z.Name.Contains("棰嗘枡鍑哄簱"));
+// var wmsTakeMaterialOrder = input.Adapt<WmsTakeMaterialOrder>();
+// wmsTakeMaterialOrder.SOID = 66666;
+// wmsTakeMaterialOrder.OrderLargeCategory = wmsOrderType != null ? wmsOrderType.Pid : 0;
+// wmsTakeMaterialOrder.OrderSubclass = wmsOrderType != null ? wmsOrderType.Id : 0;
+// wmsTakeMaterialOrder.OrderStatus = OrderStatusEnum.WEIXIAFA;
+// await _wmsTakeMaterialOrderRep.InsertAsync(wmsTakeMaterialOrder);
+// }
- /// <summary>
- /// 澧炲姞棰嗘枡鍗�(yigo绯荤粺鑾峰彇)
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("TakeOrderAdd")]
- [UnitOfWork]
- public async Task TakeOrderAdd()
- {
- //鑾峰彇棰嗘枡鐢宠鍗�
- string url = App.Configuration["YiGoWebApi:QueryOutBoundNotice"];
- var Billdate_S = DateTime.Now.AddDays(-15).ToString("yyyy-MM-dd");
- var Billdate_E = DateTime.Now.AddDays(15).ToString("yyyy-MM-dd");
- //鍐欐棩蹇楁枃浠�
- //Log.Error($"[TransferContainerCode][ContainerCode:{input.ContainerCode}][url:{url}]");
- var response = await url.SetHttpMethod(System.Net.Http.HttpMethod.Post)
- .SetBody(new Dictionary<string, object> {
- { "Billdate_S", Billdate_S },
- { "Billdate_E", Billdate_E},
- }, "application/json").PostAsStringAsync();
- var Data = response.FromJson<WmsTakeMaterialOrderOutputByYiGO>();
- var wmsOrderType = await _wmsOrderTypeRep.FirstOrDefaultAsync(z => z.Name.Contains("棰嗘枡鍑哄簱"));
- foreach (var item in Data.Data)
- {
- item.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- var wmsTakeMaterialOrder = item.Adapt<WmsTakeMaterialOrder>();
- var isExcit = await _wmsTakeMaterialOrderRep.AnyAsync(x => x.NO == item.NO);
- if (!isExcit)
- {
- wmsTakeMaterialOrder.OrderLargeCategory = wmsOrderType != null ? wmsOrderType.Pid : 0;
- wmsTakeMaterialOrder.OrderSubclass = wmsOrderType != null ? wmsOrderType.Id : 0;
- await _wmsTakeMaterialOrderRep.InsertNowAsync(wmsTakeMaterialOrder);
- foreach (var item1 in item.Dtls)
- {
- var wmsTakeMaterialDeatail = item1.Adapt<WmsTakeMaterialOrderDetail>();
- wmsTakeMaterialDeatail.OrderId = item.Id;
- await _wmsTakeMaterialOrderDetailRep.InsertNowAsync(wmsTakeMaterialDeatail);
- }
- }
- }
- }
- /// <summary>
- /// 棰嗘枡涓嬫灦鎺ュ彛(yigo绯荤粺)
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("ReturnTakeOrder")]
- [UnifyResult(typeof(object))]
- [UnitOfWork]
- public async Task<object> ReturnTakeOrder([FromBody] ReturnTakeOrderInput input)
- {
- try
- {
- //鍒涘缓鎸囧畾鍚嶇О鐨勮鍗曟搷浣�
- string url = App.Configuration["YiGoWebApi:CreateTX211"];
- //鑾峰彇涓诲崟鎹�
- var wmsTakeMaterialOrderModal = await _wmsTakeMaterialOrderRep.FirstOrDefaultAsync(x => x.Id == input.Id);
- if (wmsTakeMaterialOrderModal == null) throw Oops.Oh("鍗曟嵁淇℃伅涓嶅瓨鍦�!");
- // 鍐欐棩蹇楁枃浠�
- Log.Error($"[棰嗘枡涓嬫灦][鍗曟嵁鍙�:{wmsTakeMaterialOrderModal.NO}][url:{url}]");
+// /// <summary>
+// /// 澧炲姞棰嗘枡鍗�(yigo绯荤粺鑾峰彇)
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("TakeOrderAdd")]
+// [UnitOfWork]
+// public async Task TakeOrderAdd()
+// {
+// //鑾峰彇棰嗘枡鐢宠鍗�
+// string url = App.Configuration["YiGoWebApi:QueryOutBoundNotice"];
+// var Billdate_S = DateTime.Now.AddDays(-15).ToString("yyyy-MM-dd");
+// var Billdate_E = DateTime.Now.AddDays(15).ToString("yyyy-MM-dd");
+// //鍐欐棩蹇楁枃浠�
+// //Log.Error($"[TransferContainerCode][ContainerCode:{input.ContainerCode}][url:{url}]");
+// var response = await url.SetHttpMethod(System.Net.Http.HttpMethod.Post)
+// .SetBody(new Dictionary<string, object> {
+// { "Billdate_S", Billdate_S },
+// { "Billdate_E", Billdate_E},
+// }, "application/json").PostAsStringAsync();
+// var Data = response.FromJson<WmsTakeMaterialOrderOutputByYiGO>();
+// var wmsOrderType = await _wmsOrderTypeRep.FirstOrDefaultAsync(z => z.Name.Contains("棰嗘枡鍑哄簱"));
+// foreach (var item in Data.Data)
+// {
+// item.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// var wmsTakeMaterialOrder = item.Adapt<WmsTakeMaterialOrder>();
+// var isExcit = await _wmsTakeMaterialOrderRep.AnyAsync(x => x.NO == item.NO);
+// if (!isExcit)
+// {
+// wmsTakeMaterialOrder.OrderLargeCategory = wmsOrderType != null ? wmsOrderType.Pid : 0;
+// wmsTakeMaterialOrder.OrderSubclass = wmsOrderType != null ? wmsOrderType.Id : 0;
+// await _wmsTakeMaterialOrderRep.InsertNowAsync(wmsTakeMaterialOrder);
+// foreach (var item1 in item.Dtls)
+// {
+// var wmsTakeMaterialDeatail = item1.Adapt<WmsTakeMaterialOrderDetail>();
+// wmsTakeMaterialDeatail.OrderId = item.Id;
+// await _wmsTakeMaterialOrderDetailRep.InsertNowAsync(wmsTakeMaterialDeatail);
+// }
+// }
+// }
+// }
+// /// <summary>
+// /// 棰嗘枡涓嬫灦鎺ュ彛(yigo绯荤粺)
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("ReturnTakeOrder")]
+// [UnifyResult(typeof(object))]
+// [UnitOfWork]
+// public async Task<object> ReturnTakeOrder([FromBody] ReturnTakeOrderInput input)
+// {
+// try
+// {
+// //鍒涘缓鎸囧畾鍚嶇О鐨勮鍗曟搷浣�
+// string url = App.Configuration["YiGoWebApi:CreateTX211"];
+// //鑾峰彇涓诲崟鎹�
+// var wmsTakeMaterialOrderModal = await _wmsTakeMaterialOrderRep.FirstOrDefaultAsync(x => x.Id == input.Id);
+// if (wmsTakeMaterialOrderModal == null) throw Oops.Oh("鍗曟嵁淇℃伅涓嶅瓨鍦�!");
+// // 鍐欐棩蹇楁枃浠�
+// Log.Error($"[棰嗘枡涓嬫灦][鍗曟嵁鍙�:{wmsTakeMaterialOrderModal.NO}][url:{url}]");
- var response = await url.SetHttpMethod(HttpMethod.Post)
- .SetBody(input, "application/json")
- .PostAsAsync<ReturnTakeOrderOutput>();
- // 鍐欐棩蹇楁枃浠�
- Log.Error($"[棰嗘枡涓嬫灦][鍗曟嵁鍙�:{wmsTakeMaterialOrderModal.NO}][response:{response.ToJson()}]");
+// var response = await url.SetHttpMethod(HttpMethod.Post)
+// .SetBody(input, "application/json")
+// .PostAsAsync<ReturnTakeOrderOutput>();
+// // 鍐欐棩蹇楁枃浠�
+// Log.Error($"[棰嗘枡涓嬫灦][鍗曟嵁鍙�:{wmsTakeMaterialOrderModal.NO}][response:{response.ToJson()}]");
- return XnRestfulResultProvider.RESTfulResult(response);
- }
- catch (Exception ex)
- {
- throw Oops.Oh(ex.Message);
- }
- }
+// return XnRestfulResultProvider.RESTfulResult(response);
+// }
+// catch (Exception ex)
+// {
+// throw Oops.Oh(ex.Message);
+// }
+// }
- /// <summary>
- /// 涓嬪彂棰嗘枡鍗�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("DistributeOrder")]
- [UnitOfWork]
- public async Task DistributeOrder(DistributeOrderInput input)
- {
- // 鏌ヨ鍗曟嵁灏忕被鏄�滅敓浜у叆搴撯�濈殑Id
- var wmsOrderType = await _wmsOrderTypeRep.FirstOrDefaultAsync(z => z.Name.Contains("棰嗘枡鍑哄簱"));
- //鑾峰彇棰嗘枡鍗曟嵁
- var wmsTakeMaterialOrder = await _wmsTakeMaterialOrderRep
- .Where(x=>x.Id == input.Id && x.OrderLargeCategory == wmsOrderType.Pid && x.OrderSubclass == wmsOrderType.Id)
- .ProjectToType<WmsTakeMaterialOrder>()
- .FirstOrDefaultAsync();
- if (wmsTakeMaterialOrder == null) throw Oops.Oh("鍗曟嵁涓嶅瓨鍦�!");
- wmsTakeMaterialOrder.OrderStatus = OrderStatusEnum.YIXIAFA;
- //鏇存敼鍗曟嵁鐘舵�佷负宸蹭笅鍙�
- await _wmsTakeMaterialOrderRep.UpdateAsync(wmsTakeMaterialOrder);
- //鏍规嵁棰嗘枡鍗曟槑缁嗙敓鎴愬垎鎷ｅ崟
- foreach (var item in wmsTakeMaterialOrder.WmsTakeMaterialOrderDetail)
- {
- //鑾峰彇鎵�鏈変负璇ユ槑缁嗙墿鏂欑紪鐮佺殑搴撳瓨(涓嶄负瀹屾垚鐘舵�佺殑鍑哄簱浠诲姟鐨勫簱浣嶈鎺掗櫎锛屽緟寮�鍙�)
- var wmsMaterialStocks = await _wmsMaterialStockRep.DetachedEntities.Where(x => x.MaterialNo == item.Materialcode)
- .OrderBy(n=>n.CreatedTime)
- .OrderByDescending(n => n.StockNumber)
- .ToListAsync();
- List<FjStock> FjStockList = new List<FjStock>();
- //浼樺厛浠庡簱浣嶄负绌虹殑搴撳瓨杩涜鍒嗘嫞
- var fjstockModel = wmsMaterialStocks.Where(p => p.PlaceCode == "N/A").ToList();
- if (fjstockModel != null)
- {
- foreach (var a in fjstockModel)
- {
- var FjStockModal = a.Adapt<FjStock>();
- FjStockModal.FjQty = a.StockNumber;
- if (item.DistributeQty + a.StockNumber > item.Qty)
- {
- FjStockModal.FjQty = item.Qty - item.DistributeQty;
- item.DistributeQty = item.Qty;
- FjStockList.Add(FjStockModal);
- break;
- }
- else
- {
- item.DistributeQty += a.StockNumber;
- };
- FjStockList.Add(FjStockModal);
- }
- }
- if (item.DistributeQty < item.Qty)
- {
- foreach (var b in wmsMaterialStocks.Where(x=>x.PlaceCode!="N/A"))
- {
- var FjStockModal = b.Adapt<FjStock>();
- FjStockModal.FjQty = b.StockNumber;
- if (item.DistributeQty + b.StockNumber > item.Qty)
- {
- FjStockModal.FjQty = item.Qty - item.DistributeQty;
- item.DistributeQty = item.Qty;
- FjStockList.Add(FjStockModal);
- break;
- }
- else
- {
- item.DistributeQty += b.StockNumber;
- };
- FjStockList.Add(FjStockModal);
- }
- }
+// /// <summary>
+// /// 涓嬪彂棰嗘枡鍗�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("DistributeOrder")]
+// [UnitOfWork]
+// public async Task DistributeOrder(DistributeOrderInput input)
+// {
+// // 鏌ヨ鍗曟嵁灏忕被鏄�滅敓浜у叆搴撯�濈殑Id
+// var wmsOrderType = await _wmsOrderTypeRep.FirstOrDefaultAsync(z => z.Name.Contains("棰嗘枡鍑哄簱"));
+// //鑾峰彇棰嗘枡鍗曟嵁
+// var wmsTakeMaterialOrder = await _wmsTakeMaterialOrderRep
+// .Where(x=>x.Id == input.Id && x.OrderLargeCategory == wmsOrderType.Pid && x.OrderSubclass == wmsOrderType.Id)
+// .ProjectToType<WmsTakeMaterialOrder>()
+// .FirstOrDefaultAsync();
+// if (wmsTakeMaterialOrder == null) throw Oops.Oh("鍗曟嵁涓嶅瓨鍦�!");
+// wmsTakeMaterialOrder.OrderStatus = OrderStatusEnum.YIXIAFA;
+// //鏇存敼鍗曟嵁鐘舵�佷负宸蹭笅鍙�
+// await _wmsTakeMaterialOrderRep.UpdateAsync(wmsTakeMaterialOrder);
+// //鏍规嵁棰嗘枡鍗曟槑缁嗙敓鎴愬垎鎷ｅ崟
+// foreach (var item in wmsTakeMaterialOrder.WmsTakeMaterialOrderDetail)
+// {
+// //鑾峰彇鎵�鏈変负璇ユ槑缁嗙墿鏂欑紪鐮佺殑搴撳瓨(涓嶄负瀹屾垚鐘舵�佺殑鍑哄簱浠诲姟鐨勫簱浣嶈鎺掗櫎锛屽緟寮�鍙�)
+// var wmsMaterialStocks = await _wmsMaterialStockRep.DetachedEntities.Where(x => x.MaterialNo == item.Materialcode)
+// .OrderBy(n=>n.CreatedTime)
+// .OrderByDescending(n => n.StockNumber)
+// .ToListAsync();
+// List<FjStock> FjStockList = new List<FjStock>();
+// //浼樺厛浠庡簱浣嶄负绌虹殑搴撳瓨杩涜鍒嗘嫞
+// var fjstockModel = wmsMaterialStocks.Where(p => p.PlaceCode == "N/A").ToList();
+// if (fjstockModel != null)
+// {
+// foreach (var a in fjstockModel)
+// {
+// var FjStockModal = a.Adapt<FjStock>();
+// FjStockModal.FjQty = a.StockNumber;
+// if (item.DistributeQty + a.StockNumber > item.Qty)
+// {
+// FjStockModal.FjQty = item.Qty - item.DistributeQty;
+// item.DistributeQty = item.Qty;
+// FjStockList.Add(FjStockModal);
+// break;
+// }
+// else
+// {
+// item.DistributeQty += a.StockNumber;
+// };
+// FjStockList.Add(FjStockModal);
+// }
+// }
+// if (item.DistributeQty < item.Qty)
+// {
+// foreach (var b in wmsMaterialStocks.Where(x=>x.PlaceCode!="N/A"))
+// {
+// var FjStockModal = b.Adapt<FjStock>();
+// FjStockModal.FjQty = b.StockNumber;
+// if (item.DistributeQty + b.StockNumber > item.Qty)
+// {
+// FjStockModal.FjQty = item.Qty - item.DistributeQty;
+// item.DistributeQty = item.Qty;
+// FjStockList.Add(FjStockModal);
+// break;
+// }
+// else
+// {
+// item.DistributeQty += b.StockNumber;
+// };
+// FjStockList.Add(FjStockModal);
+// }
+// }
- if (item.DistributeQty< item.Qty) throw Oops.Oh(item.Materialname+"搴撳瓨鏁伴噺涓嶈冻!");
- //寰幆闇�瑕佸嚭搴撶殑搴撳瓨鐢熸垚浠诲姟鍜屽垎鎷ｅ崟
- foreach (var stock in FjStockList)
- {
- //鑾峰彇搴撲綅淇℃伅
- var wmsPlacModal = await _wmsPlaceRep.FirstOrDefaultAsync(x => x.PlaceCode == stock.PlaceCode);
- //鐗╂枡鍜屽鍣ㄧ殑鍏崇郴
- var fjcvmModelList = await _wmsMaterialContainerRep.Where(z =>
- z.ContainerCode == stock.ContainerCode && z.BindStatus == CommonStatus.ENABLE).ToListAsync();
- if (wmsPlacModal!=null)
- {
- //浠诲姟
- var takmodel = new WmsTask()
- {
- TaskNo = Yitter.IdGenerator.YitIdHelper.NextId().ToString(),
- TaskModel = TaskModel.QUANZIDONG,
- TaskType = TaskType.CHUKU,
- TaskLevel = 1,
- TaskStatus = TaskStatusEnum.WEIZHIXING,
- OrderNo = fjcvmModelList.FirstOrDefault().OrderNo,
- OrderDetailsId = item.Id,
- ContainerCode = stock.ContainerCode,
- SourcePlace = stock.PlaceCode,
- ToPlace = wmsPlacModal.Aisle.ToString(), //鐩爣浣�
- AreaName = "缁濈紭绔嬪簱",
- IsRead = true, //WCS鏄惁鍙互璇诲彇
- SendTimes = 1, //鍙戦�佹鏁�
- Aisle = wmsPlacModal.Aisle,
- TaskDodeviceStatus = TaskDodeviceStatusEnum.W,
- Description = "鐗╂枡"
- };
- await _wmsTaskRep.InsertAsync(takmodel);
- }
- // 鏂板鍒嗘嫞
- var wmsSortOrder = new WmsSortOrder()
- {
- OrderNo = wmsTakeMaterialOrder.NO,
- Materialcode = stock.MaterialNo,
- Materialname = stock.MaterialName,
- OrderDetailID = item.Id,
- ContainerOrderNo = fjcvmModelList.FirstOrDefault().OrderNo,
- ProjectCode = item.ProjectCode,
- TACode = item.TACode,
- PartCode = item.PartCode,
- PlaceCode = item.PlaceCode,
- ContainerCode = stock.ContainerCode,
- SortQuantity = stock.FjQty,
- ActualQuantity = new decimal(0.00),
- SortStatus = SortStatusEnum.WEIFENJIAN
- };
- await _wmsSortOrderRep.InsertNowAsync(wmsSortOrder);
- }
- }
+// if (item.DistributeQty< item.Qty) throw Oops.Oh(item.Materialname+"搴撳瓨鏁伴噺涓嶈冻!");
+// //寰幆闇�瑕佸嚭搴撶殑搴撳瓨鐢熸垚浠诲姟鍜屽垎鎷ｅ崟
+// foreach (var stock in FjStockList)
+// {
+// //鑾峰彇搴撲綅淇℃伅
+// var wmsPlacModal = await _wmsPlaceRep.FirstOrDefaultAsync(x => x.PlaceCode == stock.PlaceCode);
+// //鐗╂枡鍜屽鍣ㄧ殑鍏崇郴
+// var fjcvmModelList = await _wmsMaterialContainerRep.Where(z =>
+// z.ContainerCode == stock.ContainerCode && z.BindStatus == CommonStatus.ENABLE).ToListAsync();
+// if (wmsPlacModal!=null)
+// {
+// //浠诲姟
+// var takmodel = new WmsTask()
+// {
+// TaskNo = Yitter.IdGenerator.YitIdHelper.NextId().ToString(),
+// TaskModel = TaskModel.QUANZIDONG,
+// TaskType = TaskType.CHUKU,
+// TaskLevel = 1,
+// TaskStatus = TaskStatusEnum.WEIZHIXING,
+// OrderNo = fjcvmModelList.FirstOrDefault().OrderNo,
+// OrderDetailsId = item.Id,
+// ContainerCode = stock.ContainerCode,
+// SourcePlace = stock.PlaceCode,
+// ToPlace = wmsPlacModal.Aisle.ToString(), //鐩爣浣�
+// AreaName = "缁濈紭绔嬪簱",
+// IsRead = true, //WCS鏄惁鍙互璇诲彇
+// SendTimes = 1, //鍙戦�佹鏁�
+// Aisle = wmsPlacModal.Aisle,
+// TaskDodeviceStatus = TaskDodeviceStatusEnum.W,
+// Description = "鐗╂枡"
+// };
+// await _wmsTaskRep.InsertAsync(takmodel);
+// }
+// // 鏂板鍒嗘嫞
+// var wmsSortOrder = new WmsSortOrder()
+// {
+// OrderNo = wmsTakeMaterialOrder.NO,
+// Materialcode = stock.MaterialNo,
+// Materialname = stock.MaterialName,
+// OrderDetailID = item.Id,
+// ContainerOrderNo = fjcvmModelList.FirstOrDefault().OrderNo,
+// ProjectCode = item.ProjectCode,
+// TACode = item.TACode,
+// PartCode = item.PartCode,
+// PlaceCode = item.PlaceCode,
+// ContainerCode = stock.ContainerCode,
+// SortQuantity = stock.FjQty,
+// ActualQuantity = new decimal(0.00),
+// SortStatus = SortStatusEnum.WEIFENJIAN
+// };
+// await _wmsSortOrderRep.InsertNowAsync(wmsSortOrder);
+// }
+// }
- }
+// }
- /// <summary>
- /// 鍒犻櫎棰嗘枡鍗�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("delete")]
- public async Task Delete(DeleteWmsTakeMaterialOrderInput input)
- {
- var wmsTakeMaterialOrder = await _wmsTakeMaterialOrderRep.FirstOrDefaultAsync(u => u.Id == input.Id);
- await _wmsTakeMaterialOrderRep.DeleteAsync(wmsTakeMaterialOrder);
- }
+// /// <summary>
+// /// 鍒犻櫎棰嗘枡鍗�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("delete")]
+// public async Task Delete(DeleteWmsTakeMaterialOrderInput input)
+// {
+// var wmsTakeMaterialOrder = await _wmsTakeMaterialOrderRep.FirstOrDefaultAsync(u => u.Id == input.Id);
+// await _wmsTakeMaterialOrderRep.DeleteAsync(wmsTakeMaterialOrder);
+// }
- /// <summary>
- /// 鏇存柊棰嗘枡鍗�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("edit")]
- public async Task Update(UpdateWmsTakeMaterialOrderInput input)
- {
- var isExist = await _wmsTakeMaterialOrderRep.AnyAsync(u => u.Id == input.Id, false);
- if (!isExist) throw Oops.Oh(ErrorCode.D3000);
+// /// <summary>
+// /// 鏇存柊棰嗘枡鍗�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("edit")]
+// public async Task Update(UpdateWmsTakeMaterialOrderInput input)
+// {
+// var isExist = await _wmsTakeMaterialOrderRep.AnyAsync(u => u.Id == input.Id, false);
+// if (!isExist) throw Oops.Oh(ErrorCode.D3000);
- var wmsTakeMaterialOrder = input.Adapt<WmsTakeMaterialOrder>();
- await _wmsTakeMaterialOrderRep.UpdateAsync(wmsTakeMaterialOrder,ignoreNullValues:true);
- }
+// var wmsTakeMaterialOrder = input.Adapt<WmsTakeMaterialOrder>();
+// await _wmsTakeMaterialOrderRep.UpdateAsync(wmsTakeMaterialOrder,ignoreNullValues:true);
+// }
- /// <summary>
- /// 鑾峰彇棰嗘枡鍗�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("detail")]
- public async Task<WmsTakeMaterialOrderOutput> Get([FromQuery] QueryeWmsTakeMaterialOrderInput input)
- {
- return (await _wmsTakeMaterialOrderRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<WmsTakeMaterialOrderOutput>();
- }
+// /// <summary>
+// /// 鑾峰彇棰嗘枡鍗�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("detail")]
+// public async Task<WmsTakeMaterialOrderOutput> Get([FromQuery] QueryeWmsTakeMaterialOrderInput input)
+// {
+// return (await _wmsTakeMaterialOrderRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<WmsTakeMaterialOrderOutput>();
+// }
- /// <summary>
- /// 鑾峰彇棰嗘枡鍗曞垪琛�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("list")]
- public async Task<List<WmsTakeMaterialOrderOutput>> List([FromQuery] WmsTakeMaterialOrderInput input)
- {
- return await _wmsTakeMaterialOrderRep.DetachedEntities.ProjectToType<WmsTakeMaterialOrderOutput>().ToListAsync();
- }
- /// <summary>
- /// Excel妯℃澘瀵煎叆棰嗘枡鍗曞姛鑳�
- /// </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("WmsTakeMaterialOrder", "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<WmsTakeMaterialOrderOutput> wmsTakeMaterialOrderList = DataConvertUtil.ToObjectList(headers, data, sheetName, keys, excelTemplate?.DataStartLine ?? 2, out Dictionary<string, WmsTakeMaterialOrderOutput> dict);
- List<Dictionary<string, object>> uniqueKeyValueDictList = wmsTakeMaterialOrderList.ParseUniqueKeyValueDictList(keys.ToList(), excelTemplate?.DataStartLine ?? 2, sheetName);
- var filters = DataConvertUtil.GetExpressionListByUniqueDict<WmsTakeMaterialOrder>(keys.ToList(), uniqueKeyValueDictList, size);
- var selectKeys = keys.ToList();
- if(!selectKeys.Contains("Id")) selectKeys.Add("Id");
- var selector = DataConvertUtil.GetSelectExpressionListByUniqueDict<WmsTakeMaterialOrder, WmsTakeMaterialOrderOutput>(selectKeys);
- List<WmsTakeMaterialOrder> updates = new();
- List<WmsTakeMaterialOrder> adds = new();
+// /// <summary>
+// /// 鑾峰彇棰嗘枡鍗曞垪琛�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("list")]
+// public async Task<List<WmsTakeMaterialOrderOutput>> List([FromQuery] WmsTakeMaterialOrderInput input)
+// {
+// return await _wmsTakeMaterialOrderRep.DetachedEntities.ProjectToType<WmsTakeMaterialOrderOutput>().ToListAsync();
+// }
+// /// <summary>
+// /// Excel妯℃澘瀵煎叆棰嗘枡鍗曞姛鑳�
+// /// </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("WmsTakeMaterialOrder", "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<WmsTakeMaterialOrderOutput> wmsTakeMaterialOrderList = DataConvertUtil.ToObjectList(headers, data, sheetName, keys, excelTemplate?.DataStartLine ?? 2, out Dictionary<string, WmsTakeMaterialOrderOutput> dict);
+// List<Dictionary<string, object>> uniqueKeyValueDictList = wmsTakeMaterialOrderList.ParseUniqueKeyValueDictList(keys.ToList(), excelTemplate?.DataStartLine ?? 2, sheetName);
+// var filters = DataConvertUtil.GetExpressionListByUniqueDict<WmsTakeMaterialOrder>(keys.ToList(), uniqueKeyValueDictList, size);
+// var selectKeys = keys.ToList();
+// if(!selectKeys.Contains("Id")) selectKeys.Add("Id");
+// var selector = DataConvertUtil.GetSelectExpressionListByUniqueDict<WmsTakeMaterialOrder, WmsTakeMaterialOrderOutput>(selectKeys);
+// List<WmsTakeMaterialOrder> updates = new();
+// List<WmsTakeMaterialOrder> adds = new();
- lock (_lock)
- {
- foreach (var filter in filters)
- {
- var wmsTakeMaterialOrderExistSubList = _wmsTakeMaterialOrderRep.Where(filter).Select(selector).ToList();
- wmsTakeMaterialOrderExistSubList.ForEach(x =>
- {
- var k = DataConvertUtil.GetKey(x, keys);
- if (dict.ContainsKey(k)) dict[k].Id = x.Id;
- });
- }
- foreach (var wmsTakeMaterialOrder in wmsTakeMaterialOrderList)
- {
- if (wmsTakeMaterialOrder.Id > 0)
- {
- if (importExcelType == ImportExcelType.ADD_AND_UPDATE) updates.Add(wmsTakeMaterialOrder.Adapt<WmsTakeMaterialOrder>());
- }
- else
- {
- adds.Add(wmsTakeMaterialOrder.Adapt<WmsTakeMaterialOrder>());
- }
- }
+// lock (_lock)
+// {
+// foreach (var filter in filters)
+// {
+// var wmsTakeMaterialOrderExistSubList = _wmsTakeMaterialOrderRep.Where(filter).Select(selector).ToList();
+// wmsTakeMaterialOrderExistSubList.ForEach(x =>
+// {
+// var k = DataConvertUtil.GetKey(x, keys);
+// if (dict.ContainsKey(k)) dict[k].Id = x.Id;
+// });
+// }
+// foreach (var wmsTakeMaterialOrder in wmsTakeMaterialOrderList)
+// {
+// if (wmsTakeMaterialOrder.Id > 0)
+// {
+// if (importExcelType == ImportExcelType.ADD_AND_UPDATE) updates.Add(wmsTakeMaterialOrder.Adapt<WmsTakeMaterialOrder>());
+// }
+// else
+// {
+// adds.Add(wmsTakeMaterialOrder.Adapt<WmsTakeMaterialOrder>());
+// }
+// }
- if (importExcelType == ImportExcelType.ADD_AND_UPDATE) updates.ForEach(x => _wmsTakeMaterialOrderRep.Update(x));
+// if (importExcelType == ImportExcelType.ADD_AND_UPDATE) updates.ForEach(x => _wmsTakeMaterialOrderRep.Update(x));
- var maxId = _wmsTakeMaterialOrderRep.DetachedEntities.OrderByDescending(x => x.Id).Select(x => x.Id).FirstOrDefault();
- adds.ForEach(x => x.Id = ++maxId);
- Db.GetDbContext().Set<WmsTakeMaterialOrder>().AddRange(adds);
- Db.GetDbContext().SaveChanges();
+// var maxId = _wmsTakeMaterialOrderRep.DetachedEntities.OrderByDescending(x => x.Id).Select(x => x.Id).FirstOrDefault();
+// adds.ForEach(x => x.Id = ++maxId);
+// Db.GetDbContext().Set<WmsTakeMaterialOrder>().AddRange(adds);
+// Db.GetDbContext().SaveChanges();
- }
- await Task.CompletedTask;
- return adds.Count;
- }
+// }
+// await Task.CompletedTask;
+// return adds.Count;
+// }
- /// <summary>
- /// 鏍规嵁鐗堟湰涓嬭浇棰嗘枡鍗曠殑Excel瀵煎叆妯℃澘
- /// </summary>
- /// <param name="version">妯℃澘鐗堟湰</param>
- /// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
- [HttpGet("downloadExcelTemplate")]
- public async Task<IActionResult> DownloadExcelTemplate([FromQuery] string version)
- {
- var excelTemplate = await _sysExcelTemplateService.GetByAppNameAndClassNameAndVersionAsync("WmsTakeMaterialOrder", 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>
- /// 鏍规嵁棰嗘枡鍗曟煡璇㈠弬鏁板鍑篍xcel
- /// </summary>
- /// <param name="input">棰嗘枡鍗曟煡璇㈠弬鏁�</param>
- /// <returns>瀵煎嚭鐨凟xcel鏂囦欢</returns>
- [HttpGet("toExcel")]
- public async Task<IActionResult> ToExcelAsync([FromQuery] WmsTakeMaterialOrderSearchNonPage input)
- {
- var wmsTakeMaterialOrderList = await ListNonPageAsync(input);
- MemoryStream ms = new();
- DataConvertUtil.ToExcelData(wmsTakeMaterialOrderList, _sysDictTypeRep, _sysDictDataRep, out List<string> headers,
- out List<List<object>> data, out string sheetName);
- var excelTemplate = await _sysExcelTemplateService.GetByAppNameAndClassNameAndVersionAsync("WmsTakeMaterialOrder", "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 };
- }
- }
-}
+// /// <summary>
+// /// 鏍规嵁鐗堟湰涓嬭浇棰嗘枡鍗曠殑Excel瀵煎叆妯℃澘
+// /// </summary>
+// /// <param name="version">妯℃澘鐗堟湰</param>
+// /// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
+// [HttpGet("downloadExcelTemplate")]
+// public async Task<IActionResult> DownloadExcelTemplate([FromQuery] string version)
+// {
+// var excelTemplate = await _sysExcelTemplateService.GetByAppNameAndClassNameAndVersionAsync("WmsTakeMaterialOrder", 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>
+// /// 鏍规嵁棰嗘枡鍗曟煡璇㈠弬鏁板鍑篍xcel
+// /// </summary>
+// /// <param name="input">棰嗘枡鍗曟煡璇㈠弬鏁�</param>
+// /// <returns>瀵煎嚭鐨凟xcel鏂囦欢</returns>
+// [HttpGet("toExcel")]
+// public async Task<IActionResult> ToExcelAsync([FromQuery] WmsTakeMaterialOrderSearchNonPage input)
+// {
+// var wmsTakeMaterialOrderList = await ListNonPageAsync(input);
+// MemoryStream ms = new();
+// DataConvertUtil.ToExcelData(wmsTakeMaterialOrderList, _sysDictTypeRep, _sysDictDataRep, out List<string> headers,
+// out List<List<object>> data, out string sheetName);
+// var excelTemplate = await _sysExcelTemplateService.GetByAppNameAndClassNameAndVersionAsync("WmsTakeMaterialOrder", "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/WmsPda/CallEmpty/CallEmptyService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/CallEmpty/CallEmptyService.cs
index 0f0cb29..ff50579 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/CallEmpty/CallEmptyService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/CallEmpty/CallEmptyService.cs
@@ -1,107 +1,107 @@
-锘縰sing Furion.DatabaseAccessor;
-using Furion.DependencyInjection;
-using Furion.DynamicApiController;
-using Furion.FriendlyException;
-using Mapster;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using System.Linq.Dynamic.Core;
-using Admin.NET.Core;
-using Yitter.IdGenerator;
-using Microsoft.Extensions.Logging;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-using StackExchange.Redis;
+锘�//using Furion.DatabaseAccessor;
+//using Furion.DependencyInjection;
+//using Furion.DynamicApiController;
+//using Furion.FriendlyException;
+//using Mapster;
+//using Microsoft.AspNetCore.Authorization;
+//using Microsoft.AspNetCore.Mvc;
+//using Microsoft.EntityFrameworkCore;
+//using System.Linq.Dynamic.Core;
+//using Admin.NET.Core;
+//using Yitter.IdGenerator;
+//using Microsoft.Extensions.Logging;
+//using Microsoft.AspNetCore.Mvc.RazorPages;
+//using StackExchange.Redis;
-namespace Admin.NET.Application
-{
- /// <summary>
- /// Pda绌烘墭鍑哄簱
- /// </summary>
- [ApiDescriptionSettings("Pda绌烘墭鍑哄簱", Name = "CallEmpty", Order = 100)]
- [Route("api/[Controller]")]
- public class CallEmptyService : IDynamicApiController, ITransient
- {
- private readonly IRepository<WmsOrder, MasterDbContextLocator> _wmsOrderRep;
- private readonly IRepository<WmsOrderDetails, MasterDbContextLocator> _wmsOrderDetailsRep;
- private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
- private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
- private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
- private readonly IRepository<WmsWarehouseEntrance, MasterDbContextLocator> _wmsWarehouseEntranceRep;
- private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
- private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
- private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
- private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
- private readonly IRepository<WmsOrderType, MasterDbContextLocator> _wmsOrderTypeRep;
+//namespace Admin.NET.Application
+//{
+// /// <summary>
+// /// Pda绌烘墭鍑哄簱
+// /// </summary>
+// [ApiDescriptionSettings("Pda绌烘墭鍑哄簱", Name = "CallEmpty", Order = 100)]
+// [Route("api/[Controller]")]
+// public class CallEmptyService : IDynamicApiController, ITransient
+// {
+// private readonly IRepository<WmsOrder, MasterDbContextLocator> _wmsOrderRep;
+// private readonly IRepository<WmsOrderDetails, MasterDbContextLocator> _wmsOrderDetailsRep;
+// private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
+// private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
+// private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
+// private readonly IRepository<WmsWarehouseEntrance, MasterDbContextLocator> _wmsWarehouseEntranceRep;
+// private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
+// private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
+// private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
+// private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
+// private readonly IRepository<WmsOrderType, MasterDbContextLocator> _wmsOrderTypeRep;
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- public CallEmptyService(
- IRepository<WmsOrder, MasterDbContextLocator> wmsOrderRep,
- IRepository<WmsOrderDetails, MasterDbContextLocator> wmsOrderDetailsRep,
- IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
- IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
- IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
- IRepository<WmsWarehouseEntrance, MasterDbContextLocator> wmsWarehouseEntranceRep,
- IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep,
- IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
- IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
- IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
- IRepository<WmsOrderType, MasterDbContextLocator> wmsOrderTypeRep
- )
- {
- _wmsOrderRep = wmsOrderRep;
- _wmsOrderDetailsRep = wmsOrderDetailsRep;
- _wmsTaskRep = wmsTaskRep;
- _wmsPlaceRep = wmsPlaceRep;
- _wmsAreaRep = wmsAreaRep;
- _wmsWarehouseEntranceRep = wmsWarehouseEntranceRep;
- _wmsMaterialContainerRep = wmsMaterialContainerRep;
- _wmsContainerRep = wmsContainerRep;
- _wmsContainerPlaceRep = wmsContainerPlaceRep;
- _wmsMaterialStockRep = wmsMaterialStockRep;
- _wmsOrderTypeRep = wmsOrderTypeRep;
- }
+// /// <summary>
+// /// 鏋勯�犲嚱鏁�
+// /// </summary>
+// public CallEmptyService(
+// IRepository<WmsOrder, MasterDbContextLocator> wmsOrderRep,
+// IRepository<WmsOrderDetails, MasterDbContextLocator> wmsOrderDetailsRep,
+// IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
+// IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
+// IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
+// IRepository<WmsWarehouseEntrance, MasterDbContextLocator> wmsWarehouseEntranceRep,
+// IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep,
+// IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
+// IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
+// IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
+// IRepository<WmsOrderType, MasterDbContextLocator> wmsOrderTypeRep
+// )
+// {
+// _wmsOrderRep = wmsOrderRep;
+// _wmsOrderDetailsRep = wmsOrderDetailsRep;
+// _wmsTaskRep = wmsTaskRep;
+// _wmsPlaceRep = wmsPlaceRep;
+// _wmsAreaRep = wmsAreaRep;
+// _wmsWarehouseEntranceRep = wmsWarehouseEntranceRep;
+// _wmsMaterialContainerRep = wmsMaterialContainerRep;
+// _wmsContainerRep = wmsContainerRep;
+// _wmsContainerPlaceRep = wmsContainerPlaceRep;
+// _wmsMaterialStockRep = wmsMaterialStockRep;
+// _wmsOrderTypeRep = wmsOrderTypeRep;
+// }
- /// <summary>
- /// 鎻愪氦鍑哄簱
- /// </summary>
- /// <returns></returns>
- [HttpPost("PdaContainerOut")]
- [UnitOfWork]
- public async Task PdaContainerOut([FromBody] PdaContainerOutInput input)
- {
- //鏍规嵁杈撳叆鏁伴噺寰幆鍑哄簱鐨勬墭鐩樻暟閲�
- for (int i = 1; i < input.Qty+1; i++)
- {
- //鑾峰彇搴撳瓨涓殑绌烘墭鐩�
- var wmsMaterialStockModal = await _wmsMaterialStockRep.FirstOrDefaultAsync(x => x.Source == RuKuSourceEnum.KONGTUO);
- //鑾峰彇搴撲綅淇℃伅
- var wmsPlacModal = await _wmsPlaceRep.FirstOrDefaultAsync(x => x.PlaceCode == wmsMaterialStockModal.PlaceCode);
- //浠诲姟
- var takmodel = new WmsTask()
- {
- TaskNo = Yitter.IdGenerator.YitIdHelper.NextId().ToString(),
- TaskModel = TaskModel.QUANZIDONG,
- TaskType = TaskType.CHUKU,
- TaskLevel = 1,
- TaskStatus = TaskStatusEnum.WEIZHIXING,
- OrderNo = "N/A",
- OrderDetailsId = 0,
- ContainerCode = wmsMaterialStockModal.ContainerCode,
- SourcePlace = wmsMaterialStockModal.PlaceCode,
- ToPlace = wmsPlacModal.Aisle.ToString(), //鐩爣浣�
- AreaName = "缁濈紭绔嬪簱",
- IsRead = true, //WCS鏄惁鍙互璇诲彇
- SendTimes = 1, //鍙戦�佹鏁�
- Aisle = wmsPlacModal.Aisle,
- TaskDodeviceStatus = TaskDodeviceStatusEnum.W,
- Description = "绌烘墭"
- };
- await _wmsTaskRep.InsertAsync(takmodel);
- }
- }
- }
-}
+// /// <summary>
+// /// 鎻愪氦鍑哄簱
+// /// </summary>
+// /// <returns></returns>
+// [HttpPost("PdaContainerOut")]
+// [UnitOfWork]
+// public async Task PdaContainerOut([FromBody] PdaContainerOutInput input)
+// {
+// //鏍规嵁杈撳叆鏁伴噺寰幆鍑哄簱鐨勬墭鐩樻暟閲�
+// for (int i = 1; i < input.Qty+1; i++)
+// {
+// //鑾峰彇搴撳瓨涓殑绌烘墭鐩�
+// var wmsMaterialStockModal = await _wmsMaterialStockRep.FirstOrDefaultAsync(x => x.Source == RuKuSourceEnum.KONGTUO);
+// //鑾峰彇搴撲綅淇℃伅
+// var wmsPlacModal = await _wmsPlaceRep.FirstOrDefaultAsync(x => x.PlaceCode == wmsMaterialStockModal.PlaceCode);
+// //浠诲姟
+// var takmodel = new WmsTask()
+// {
+// TaskNo = Yitter.IdGenerator.YitIdHelper.NextId().ToString(),
+// TaskModel = TaskModel.QUANZIDONG,
+// TaskType = TaskType.CHUKU,
+// TaskLevel = 1,
+// TaskStatus = TaskStatusEnum.WEIZHIXING,
+// OrderNo = "N/A",
+// OrderDetailsId = 0,
+// ContainerCode = wmsMaterialStockModal.ContainerCode,
+// SourcePlace = wmsMaterialStockModal.PlaceCode,
+// ToPlace = wmsPlacModal.Aisle.ToString(), //鐩爣浣�
+// AreaName = "缁濈紭绔嬪簱",
+// IsRead = true, //WCS鏄惁鍙互璇诲彇
+// SendTimes = 1, //鍙戦�佹鏁�
+// Aisle = wmsPlacModal.Aisle,
+// TaskDodeviceStatus = TaskDodeviceStatusEnum.W,
+// Description = "绌烘墭"
+// };
+// await _wmsTaskRep.InsertAsync(takmodel);
+// }
+// }
+// }
+//}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsArea.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsArea.cs
index d335688..15a4491 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsArea.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsArea.cs
@@ -4,7 +4,7 @@
/*
* @author : 鍒樻枃濂�
- * @date : 2024/4/23涓嬪崍5:20:46
+ * @date : 2024/4/23涓嬪崍5:33:52
* @desc : 搴撳尯琛�
*/
namespace Admin.NET.Core
@@ -98,6 +98,15 @@
public bool IsVirtually { get; set; }
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ [Comment("鏄惁绂佺敤")]
+ [Required]
+
+ public bool IsDisabled { get; set; }
+
+
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs
index 0429a33..aa4612d 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs
@@ -2,6 +2,11 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
+/*
+ * @author : 鍒樻枃濂�
+ * @date : 2024/4/23涓嬪崍5:35:14
+ * @desc : 搴撲綅琛�
+ */
namespace Admin.NET.Core
{
/// <summary>
@@ -11,6 +16,8 @@
[Comment("搴撲綅琛�")]
public class WmsPlace : DEntityBase
{
+
+
/// <summary>
/// 搴撲綅缂栫爜
/// </summary>
@@ -19,88 +26,101 @@
[MaxLength(50)]
public string PlaceCode { get; set; }
- /// <summary>
- /// 搴撲綅瀵瑰簲AGV缂栫爜
- /// </summary>
- [Comment("搴撲綅瀵瑰簲AGV缂栫爜")]
- [MaxLength(50)]
- public string AgvCode { get; set; }
/// <summary>
- /// 搴撲綅鐘舵��;鏁版嵁瀛楀吀
+ /// 搴撲綅鍚嶇О
+ /// </summary>
+ [Comment("搴撲綅鍚嶇О")]
+ [Required]
+ [MaxLength(255)]
+ public string PlaceName { get; set; }
+
+
+ /// <summary>
+ /// 搴撲綅鍒悕
+ /// </summary>
+ [Comment("搴撲綅鍒悕")]
+ [MaxLength(255)]
+ public string PlaceNickName { get; set; }
+
+
+ /// <summary>
+ /// 搴撲綅鐘舵��
/// </summary>
[Comment("搴撲綅鐘舵��")]
[Required]
- public PlaceStatus PlaceStatus { get; set; }
+
+ public int PlaceStatus { get; set; }
+
/// <summary>
/// 鎵�鍦ㄥ簱鍖�
/// </summary>
[Comment("鎵�鍦ㄥ簱鍖�")]
[Required]
+
public long AreaId { get; set; }
+
+
+ /// <summary>
+ /// 搴撳尯鍚嶇О
+ /// </summary>
+ [Comment("搴撳尯鍚嶇О")]
+ [MaxLength(255)]
+ public string WarehouseName { get; set; }
+
+
+ /// <summary>
+ /// 妫�楠岀爜
+ /// </summary>
+ [Comment("妫�楠岀爜")]
+ [MaxLength(255)]
+ public string VerificationCode { get; set; }
+
/// <summary>
/// 鎺�
/// </summary>
[Comment("鎺�")]
[Required]
+
public int RowNo { get; set; }
+
/// <summary>
/// 鍒�
/// </summary>
[Comment("鍒�")]
[Required]
+
public int ColumnNo { get; set; }
+
/// <summary>
/// 灞�
/// </summary>
[Comment("灞�")]
[Required]
+
public int LayerNo { get; set; }
- /// <summary>
- /// 杩涙繁鍙�
- /// </summary>
- [Comment("杩涙繁鍙�")]
- [Required]
- public int DeepcellNo { get; set; }
/// <summary>
/// 宸烽亾
/// </summary>
[Comment("宸烽亾")]
[Required]
- public int Aisle { get; set; }
+
+ public int LaneNo { get; set; }
+
/// <summary>
- /// 绾垮彿
+ /// 鍫嗗灈鏈哄簱浣嶅彿
/// </summary>
- [Comment("绾垮彿")]
- [Required]
- public int Line { get; set; }
-
- /// <summary>
- /// 鏄惁閿佸畾;鏁版嵁瀛楀吀
- /// </summary>
- [Comment("鏄惁閿佸畾")]
- [Required]
- public YesOrNot Islock { get; set; }
-
- /// <summary>
- /// 鏄惁绌烘墭;鏁版嵁瀛楀吀
- /// </summary>
- [Comment("鏄惁绌烘墭")]
- public YesOrNot EmptyContainer { get; set; }
-
- /// <summary>
- /// 鍫嗗灈鏈哄唴閮ㄧ殑浣嶇疆
- /// </summary>
- [Comment("鍫嗗灈鏈哄唴閮ㄧ殑浣嶇疆")]
+ [Comment("鍫嗗灈鏈哄簱浣嶅彿")]
[MaxLength(50)]
- public string PositionnoForSrm { get; set; }
+ public string SrmNo { get; set; }
+
/// <summary>
/// 搴撲綅X鍧愭爣
@@ -109,12 +129,14 @@
[MaxLength(50)]
public string Xzb { get; set; }
+
/// <summary>
/// 搴撲綅Y鍧愭爣
/// </summary>
[Comment("搴撲綅Y鍧愭爣")]
[MaxLength(50)]
public string Yzb { get; set; }
+
/// <summary>
/// 搴撲綅Z鍧愭爣
@@ -123,51 +145,76 @@
[MaxLength(50)]
public string Zzb { get; set; }
+
/// <summary>
/// 搴撲綅闀垮害
/// </summary>
[Comment("搴撲綅闀垮害")]
+ [Required]
+ [Column("Length", TypeName = "decimal(18,2)")]
public decimal Length { get; set; }
+
/// <summary>
/// 搴撲綅瀹藉害
/// </summary>
[Comment("搴撲綅瀹藉害")]
+ [Required]
+ [Column("Width", TypeName = "decimal(18,2)")]
public decimal Width { get; set; }
+
/// <summary>
/// 搴撲綅楂樺害
/// </summary>
[Comment("搴撲綅楂樺害")]
+ [Required]
+ [Column("Height", TypeName = "decimal(18,2)")]
public decimal Height { get; set; }
+
/// <summary>
/// 鏈�澶ф壙閲�
/// </summary>
[Comment("鏈�澶ф壙閲�")]
+ [Required]
+ [Column("MaxWeight", TypeName = "decimal(18,2)")]
public decimal MaxWeight { get; set; }
+
/// <summary>
- /// 搴撲綅楂樺害灞炴��;鏁版嵁瀛楀吀
+ /// 搴撲綅楂樺害灞炴��
/// </summary>
[Comment("搴撲綅楂樺害灞炴��")]
- public Heightlevel HeightLevel { get; set; }
+ [Required]
+
+ public int HeightLevel { get; set; }
+
/// <summary>
/// 浼樺厛绾�
/// </summary>
[Comment("浼樺厛绾�")]
+ [Required]
+
public int Priority { get; set; }
+
/// <summary>
/// 閫昏緫鍖哄煙
/// </summary>
[Comment("閫昏緫鍖哄煙")]
+ [Required]
+
public int LogicalName { get; set; }
- /// <summary>
- /// 搴撳尯琛�
- /// </summary>
- public WmsArea WmsArea { get; set; }
+
+
+
+
+
+
+
+
}
}
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsWarehouse.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsWarehouse.cs
index f938ed5..0bf0931 100755
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsWarehouse.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsWarehouse.cs
@@ -4,7 +4,7 @@
/*
* @author : 鍒樻枃濂�
- * @date : 2024/4/23涓嬪崍4:40:38
+ * @date : 2024/4/23涓嬪崍5:30:19
* @desc : 浠撳簱琛�
*/
namespace Admin.NET.Core
@@ -96,6 +96,15 @@
/// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ [Comment("鏄惁绂佺敤")]
+ [Required]
+
+ public bool IsDisabled { get; set; }
+
+
+ /// <summary>
/// 澶囨敞
/// </summary>
[Comment("澶囨敞")]
--
Gitblit v1.9.3