From db55a671a547c0877ed6ceb9e1b4a7046c407d7a Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 23 4月 2024 14:51:39 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
/dev/null | 157 ----
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialType.cs | 64 +
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/BindEntrance/BindEntranceService.cs | 944 +++++++++++++-------------
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialUnit.cs | 64 +
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs | 83 ++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterial.cs | 232 +++--
iWare_RawMaterialWarehouse_Wms/Admin.NET.EntityFramework.Core/Admin.NET.EntityFramework.Core.csproj | 1
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml | 524 --------------
8 files changed, 816 insertions(+), 1,253 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 fc93696..2777b13 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
@@ -55,49 +55,6 @@
</summary>
<param name="config"></param>
</member>
- <member name="T:Admin.NET.Application.BindEntranceService">
- <summary>
- 鍏ュ簱绠＄悊鏈嶅姟
- </summary>
- </member>
- <member name="M:Admin.NET.Application.BindEntranceService.#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.BindEntranceService.GetContainer(Admin.NET.Application.BindEntranceInput)">
- <summary>
- 鎵樼洏鏌ヨ缁勭洏鐗╂枡
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.BindEntranceService.GetMaterial(Admin.NET.Application.GetMaterialInput)">
- <summary>
- 鎵爜鑾峰彇鐗╂枡
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.BindEntranceService.AutoWare(Admin.NET.Application.WarehousingInput)">
- <summary>
- 缁勭洏
- </summary>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.BindEntranceService.AutomaticWarehousing(Admin.NET.Application.WarehousingInput)">
- <summary>
- 鑷姩鍏ュ簱
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.BindEntranceService.ManualWarehousing(Admin.NET.Application.WarehousingInput)">
- <summary>
- 浜哄伐鍏ュ簱
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
<member name="T:Admin.NET.Application.BindEntranceInput">
<summary>
@@ -1447,487 +1404,6 @@
</summary>
<param name="input">鎵樼洏淇℃伅鏌ヨ鍙傛暟</param>
<returns>瀵煎嚭鐨凟xcel鏂囦欢</returns>
- </member>
- <member name="T:Admin.NET.Application.WmsMaterialDto">
- <summary>
- 鐗╂枡淇℃伅
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialDto.MaterialName">
- <summary>
- 鐗╂枡鍚嶇О
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialDto.MaterialNo">
- <summary>
- 鐗╂枡缂栧彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialDto.MaterialBatch">
- <summary>
- 鐗╂枡鎵规
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialDto.Description">
- <summary>
- 鎻忚堪
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialDto.MaterialType">
- <summary>
- 鐗╂枡绫诲埆
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialDto.MaterialSpec">
- <summary>
- 鐗╂枡瑙勬牸
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialDto.MaterialDensity">
- <summary>
- 鐗╂枡瀵嗗害
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialDto.AreaNameParameter">
- <summary>
- 搴撳尯鍙傛暟
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialDto.StationNameParameter">
- <summary>
- 宸ヤ綔鍖哄弬鏁�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialDto.MaturationTime">
- <summary>
- 鐔熷寲鏃堕棿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialDto.IsMaturation">
- <summary>
- 鏄惁闇�瑕佺啛鍖�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialDto.Id">
- <summary>
- Id涓婚敭
- </summary>
- </member>
- <member name="T:Admin.NET.Application.WmsMaterialSearch">
- <summary>
- 鐗╂枡淇℃伅鏌ヨ鍙傛暟
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialName">
- <summary>
- 鐗╂枡鍚嶇О
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialNo">
- <summary>
- 鐗╂枡缂栧彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialBatch">
- <summary>
- 鐗╂枡鎵规
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.Description">
- <summary>
- 鎻忚堪
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialType">
- <summary>
- 鐗╂枡绫诲埆
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialSpec">
- <summary>
- 鐗╂枡瑙勬牸
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialDensity">
- <summary>
- 鐗╂枡瀵嗗害
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.MaterialUnit">
- <summary>
- 鐗╂枡鍗曚綅
- </summary>
-
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.AreaNameParameter">
- <summary>
- 搴撳尯鍙傛暟
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.StationNameParameter">
- <summary>
- 宸ヤ綔鍖哄弬鏁�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.MaturationTime">
- <summary>
- 鐔熷寲鏃堕棿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.IsMaturation">
- <summary>
- 鏄惁闇�瑕佺啛鍖�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.InspectionMethod">
- <summary>
- 妫�楠屾柟寮�;鏁版嵁瀛楀吀
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.Safeqty">
- <summary>
- 瀹夊叏瀛橀噺
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.MaxImumqty">
- <summary>
- 鏈�澶у瓨閲�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.MinstorageAge">
- <summary>
- 鏈�灏忓簱榫�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialSearch.MaxstorageAge">
- <summary>
- 鏈�澶у簱榫�
- </summary>
- </member>
- <member name="T:Admin.NET.Application.WmsMaterialInput">
- <summary>
- 鐗╂枡淇℃伅杈撳叆鍙傛暟
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialName">
- <summary>
- 鐗╂枡鍚嶇О
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialNo">
- <summary>
- 鐗╂枡缂栧彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialBatch">
- <summary>
- 鐗╂枡鎵规
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.Description">
- <summary>
- 鎻忚堪
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialType">
- <summary>
- 鐗╂枡绫诲埆
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialSpec">
- <summary>
- 鐗╂枡瑙勬牸
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialDensity">
- <summary>
- 鐗╂枡瀵嗗害
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.MaterialUnit">
- <summary>
- 鐗╂枡鍗曚綅
- </summary>
-
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.AreaIds">
- <summary>
- 搴撳尯Ids
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.AreaNameParameter">
- <summary>
- 搴撳尯鍙傛暟
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.StationIds">
- <summary>
- 宸ヤ綔鍖篒ds
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.StationNameParameter">
- <summary>
- 宸ヤ綔鍖哄弬鏁�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.MaturationTime">
- <summary>
- 鐔熷寲鏃堕棿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.IsMaturation">
- <summary>
- 鏄惁闇�瑕佺啛鍖�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.LesWorkshopSection">
- <summary>
- 宸ユ
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.InspectionMethod">
- <summary>
- 妫�楠屾柟寮�;鏁版嵁瀛楀吀
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.Safeqty">
- <summary>
- 瀹夊叏瀛橀噺
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.MaxImumqty">
- <summary>
- 鏈�澶у瓨閲�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.MinstorageAge">
- <summary>
- 鏈�灏忓簱榫�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialInput.MaxstorageAge">
- <summary>
- 鏈�澶у簱榫�
- </summary>
- </member>
- <member name="T:Admin.NET.Application.AddWmsMaterialInput">
- <summary>
-
- </summary>
- </member>
- <member name="T:Admin.NET.Application.DeleteWmsMaterialInput">
- <summary>
-
- </summary>
- </member>
- <member name="T:Admin.NET.Application.UpdateWmsMaterialInput">
- <summary>
-
- </summary>
- </member>
- <member name="P:Admin.NET.Application.UpdateWmsMaterialInput.Id">
- <summary>
- Id涓婚敭
- </summary>
- </member>
- <member name="T:Admin.NET.Application.QueryeWmsMaterialInput">
- <summary>
-
- </summary>
- </member>
- <member name="T:Admin.NET.Application.WmsMaterialOutput">
- <summary>
- 鐗╂枡淇℃伅杈撳嚭鍙傛暟
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialName">
- <summary>
- 鐗╂枡鍚嶇О
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialNo">
- <summary>
- 鐗╂枡缂栧彿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialBatch">
- <summary>
- 鐗╂枡鎵规
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.Description">
- <summary>
- 鎻忚堪
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialType">
- <summary>
- 鐗╂枡绫诲埆
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialSpec">
- <summary>
- 鐗╂枡瑙勬牸
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialDensity">
- <summary>
- 鐗╂枡瀵嗗害
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.MaterialUnit">
- <summary>
- 鐗╂枡鍗曚綅
- </summary>
-
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.AreaIds">
- <summary>
- 搴撳尯Ids
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.AreaNameParameter">
- <summary>
- 搴撳尯鍙傛暟
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.StationIds">
- <summary>
- 宸ヤ綔鍖篒ds
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.StationNameParameter">
- <summary>
- 宸ヤ綔鍖哄弬鏁�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.MaturationTime">
- <summary>
- 鐔熷寲鏃堕棿
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.IsMaturation">
- <summary>
- 鏄惁闇�瑕佺啛鍖�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.Id">
- <summary>
- Id涓婚敭
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.InspectionMethod">
- <summary>
- 妫�楠屾柟寮�;鏁版嵁瀛楀吀
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.Safeqty">
- <summary>
- 瀹夊叏瀛橀噺
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.MaxImumqty">
- <summary>
- 鏈�澶у瓨閲�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.MinstorageAge">
- <summary>
- 鏈�灏忓簱榫�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.WmsMaterialOutput.MaxstorageAge">
- <summary>
- 鏈�澶у簱榫�
- </summary>
- </member>
- <member name="T:Admin.NET.Application.AreaListOutput">
- <summary>
- 搴撳尯涓嬫媺妗嗚緭鍑哄弬鏁�
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AreaListOutput.AreaId">
- <summary>
- 鎵�鍦ㄥ簱鍖篒d
- </summary>
- </member>
- <member name="P:Admin.NET.Application.AreaListOutput.AreaName">
- <summary>
- 搴撳尯鍚嶇О
- </summary>
- </member>
- <member name="T:Admin.NET.Application.StationListOutput">
- <summary>
- 宸ヤ綔鍖猴紙宸ヤ綅锛変笅鎷夋杈撳嚭鍙傛暟
- </summary>
- </member>
- <member name="P:Admin.NET.Application.StationListOutput.StationId">
- <summary>
- 绔欑偣Id
- </summary>
- </member>
- <member name="P:Admin.NET.Application.StationListOutput.StationName">
- <summary>
- 绔欑偣鍚嶇О
- </summary>
- </member>
- <member name="T:Admin.NET.Application.WmsMaterialService">
- <summary>
- 鐗╂枡淇℃伅鏈嶅姟
- </summary>
- </member>
- <member name="M:Admin.NET.Application.WmsMaterialService.#ctor(Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsMaterial,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.WmsArea,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{Admin.NET.Core.LesStation,Furion.DatabaseAccessor.MasterDbContextLocator})">
- <summary>
- 鏋勯�犲嚱鏁�
- </summary>
- </member>
- <member name="M:Admin.NET.Application.WmsMaterialService.Page(Admin.NET.Application.WmsMaterialSearch)">
- <summary>
- 鍒嗛〉鏌ヨ鐗╂枡淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsMaterialService.Add(Admin.NET.Application.AddWmsMaterialInput)">
- <summary>
- 澧炲姞鐗╂枡淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsMaterialService.Delete(Admin.NET.Application.DeleteWmsMaterialInput)">
- <summary>
- 鍒犻櫎鐗╂枡淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsMaterialService.Update(Admin.NET.Application.UpdateWmsMaterialInput)">
- <summary>
- 鏇存柊鐗╂枡淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsMaterialService.Get(Admin.NET.Application.QueryeWmsMaterialInput)">
- <summary>
- 鑾峰彇鐗╂枡淇℃伅
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsMaterialService.List(Admin.NET.Application.WmsMaterialInput)">
- <summary>
- 鑾峰彇鐗╂枡淇℃伅鍒楄〃
- </summary>
- <param name="input"></param>
- <returns></returns>
- </member>
- <member name="M:Admin.NET.Application.WmsMaterialService.GetAreaList">
- <summary>
- 搴撳尯涓嬫媺妗�
- </summary>
- <returns></returns>
</member>
<member name="T:Admin.NET.Application.WmsMerchantinfoDto">
<summary>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/BindEntrance/BindEntranceService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/BindEntrance/BindEntranceService.cs
index 60da52f..97474d1 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/BindEntrance/BindEntranceService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/BindEntrance/BindEntranceService.cs
@@ -1,518 +1,518 @@
-锘縰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 = "BindEntrance", Order = 100)]
- [Route("api/[Controller]")]
- public class BindEntranceService : 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 = "BindEntrance", Order = 100)]
+// [Route("api/[Controller]")]
+// public class BindEntranceService : 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 BindEntranceService(
- 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 BindEntranceService(
+// 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("getcontainer")]
- [UnifyResult(typeof(BindEntranceOutput))]
- public async Task<object> GetContainer([FromQuery] BindEntranceInput input)
- {
- var bindEntranceOutputModel = new BindEntranceOutput();
+// /// <summary>
+// /// 鎵樼洏鏌ヨ缁勭洏鐗╂枡
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("getcontainer")]
+// [UnifyResult(typeof(BindEntranceOutput))]
+// public async Task<object> GetContainer([FromQuery] BindEntranceInput input)
+// {
+// var bindEntranceOutputModel = new BindEntranceOutput();
- var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(n => n.ContainerCode == input.ContainerCode && n.ContainerStatus != ContainerStatus.JINYONG);
- if (wmsContainer == null)
- {
- var newWmsContainer = new WmsContainerDto();
- newWmsContainer.ContainerCode = input.ContainerCode;
- newWmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
- newWmsContainer.ContainerType = ContainerType.SULIAO;
+// var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(n => n.ContainerCode == input.ContainerCode && n.ContainerStatus != ContainerStatus.JINYONG);
+// if (wmsContainer == null)
+// {
+// var newWmsContainer = new WmsContainerDto();
+// newWmsContainer.ContainerCode = input.ContainerCode;
+// newWmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
+// newWmsContainer.ContainerType = ContainerType.SULIAO;
- bindEntranceOutputModel.ContainerCode = input.ContainerCode;
- bindEntranceOutputModel.WmsContainer = newWmsContainer;
+// bindEntranceOutputModel.ContainerCode = input.ContainerCode;
+// bindEntranceOutputModel.WmsContainer = newWmsContainer;
- if (wmsContainer != null)
- {
- var isWmsTask = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
- if (isWmsTask) return XnRestfulResultProvider.RESTfulMesaage("鍛ㄨ浆绠卞彿瀛樺湪鏈畬鎴愪换鍔�!");
+// if (wmsContainer != null)
+// {
+// var isWmsTask = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
+// if (isWmsTask) return XnRestfulResultProvider.RESTfulMesaage("鍛ㄨ浆绠卞彿瀛樺湪鏈畬鎴愪换鍔�!");
- bindEntranceOutputModel.WmsContainer = wmsContainer.Adapt<WmsContainerDto>();
- bindEntranceOutputModel.ContainerCode = wmsContainer.ContainerCode;
+// bindEntranceOutputModel.WmsContainer = wmsContainer.Adapt<WmsContainerDto>();
+// bindEntranceOutputModel.ContainerCode = wmsContainer.ContainerCode;
- // 鍛ㄨ浆绠卞彿缁勭洏鐘舵��
- if (wmsContainer.ContainerStatus == ContainerStatus.ZUPANG)
- {
- bindEntranceOutputModel.WmsMaterials = await _wmsMaterialContainerRep
- .Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ProjectToType<GetMaterialContainerOutput>().ToListAsync();
+// // 鍛ㄨ浆绠卞彿缁勭洏鐘舵��
+// if (wmsContainer.ContainerStatus == ContainerStatus.ZUPANG)
+// {
+// bindEntranceOutputModel.WmsMaterials = await _wmsMaterialContainerRep
+// .Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ProjectToType<GetMaterialContainerOutput>().ToListAsync();
- return XnRestfulResultProvider.RESTfulResult(bindEntranceOutputModel);
- }
- // 鍛ㄨ浆绠卞彿搴撲綅鐘舵��
- if (wmsContainer.ContainerStatus == ContainerStatus.KUWEI)
- {
- // 鏌ヨ鍛ㄨ浆绠卞彿涓庡簱浣嶅叧绯�
- var wmsContainerPlace = await _wmsContainerPlaceRep.FirstOrDefaultAsync(u => u.ContainerId == wmsContainer.Id && u.ContainerCode == wmsContainer.ContainerCode);
+// return XnRestfulResultProvider.RESTfulResult(bindEntranceOutputModel);
+// }
+// // 鍛ㄨ浆绠卞彿搴撲綅鐘舵��
+// if (wmsContainer.ContainerStatus == ContainerStatus.KUWEI)
+// {
+// // 鏌ヨ鍛ㄨ浆绠卞彿涓庡簱浣嶅叧绯�
+// var wmsContainerPlace = await _wmsContainerPlaceRep.FirstOrDefaultAsync(u => u.ContainerId == wmsContainer.Id && u.ContainerCode == wmsContainer.ContainerCode);
- if (wmsContainerPlace != null) bindEntranceOutputModel.PlaceCode = wmsContainerPlace.PlaceCode;
+// if (wmsContainerPlace != null) bindEntranceOutputModel.PlaceCode = wmsContainerPlace.PlaceCode;
- return XnRestfulResultProvider.RESTfulResult(bindEntranceOutputModel);
- }
- }
- }
- return XnRestfulResultProvider.RESTfulResult(bindEntranceOutputModel);
- }
+// return XnRestfulResultProvider.RESTfulResult(bindEntranceOutputModel);
+// }
+// }
+// }
+// return XnRestfulResultProvider.RESTfulResult(bindEntranceOutputModel);
+// }
- /// <summary>
- /// 鎵爜鑾峰彇鐗╂枡
- /// </summary>
- /// <returns></returns>
- [HttpGet("GetMaterial")]
- [UnifyResult(typeof(MaterialOutput))]
- public async Task<object> GetMaterial([FromQuery] GetMaterialInput input)
- {
- var material = new MaterialOutput();
- material.MaterialName = "鑳跺悎鏉�";
- material.MaterialNo = "JHB20110101";
- material.MaterialId = 43214325321513;
- material.MaterialBatch = "DIYIPICI001";
- material.MaterialType = MaterialType.BAOZHUANGCAILIAO;
- material.InspectionMethod = MaterialInspection.MIANJIAN;
- material.MaterialSpec = "";
- material.MaterialDensity = "";
- material.MaterialUnit = "";
- material.LesWorkshopSection = LesWorkshopSection.CNC;
- return XnRestfulResultProvider.RESTfulResult(material);
+// /// <summary>
+// /// 鎵爜鑾峰彇鐗╂枡
+// /// </summary>
+// /// <returns></returns>
+// [HttpGet("GetMaterial")]
+// [UnifyResult(typeof(MaterialOutput))]
+// public async Task<object> GetMaterial([FromQuery] GetMaterialInput input)
+// {
+// var material = new MaterialOutput();
+// material.MaterialName = "鑳跺悎鏉�";
+// material.MaterialNo = "JHB20110101";
+// material.MaterialId = 43214325321513;
+// material.MaterialBatch = "DIYIPICI001";
+// material.MaterialType = MaterialType.BAOZHUANGCAILIAO;
+// material.InspectionMethod = MaterialInspection.MIANJIAN;
+// material.MaterialSpec = "";
+// material.MaterialDensity = "";
+// material.MaterialUnit = "";
+// material.LesWorkshopSection = LesWorkshopSection.CNC;
+// return XnRestfulResultProvider.RESTfulResult(material);
- }
+// }
- /// <summary>
- /// 缁勭洏
- /// </summary>
- /// <returns></returns>
- [HttpPost("AutoWare")]
- public async Task AutoWare(WarehousingInput input)
- {
- // 鏍规嵁鎵樼洏鍙锋煡璇㈡墭鐩樺彿淇℃伅鏄惁宸插瓨鍦�
- var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(u => u.ContainerCode == input.ContainerCode);
- if (wmsContainer == null)
- {
- // 涓嶅瓨鍦ㄥ垯娣诲姞鎵樼洏鍙蜂俊鎭�
- wmsContainer = new WmsContainer
- {
- ContainerCode = input.ContainerCode,
- ContainerType = ContainerType.SULIAO,
- ContainerStatus = ContainerStatus.KOUXIAN,
- AssetNo = "N/A",
- ErpNo = "N/A"
- };
- await _wmsContainerRep.InsertNowAsync(wmsContainer);
- }
- // 鏌ヨ鏄惁浠诲姟宸插瓨鍦�
- var isExit = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
- if (isExit) throw Oops.Oh("鎵樼洏鍙峰瓨鍦ㄦ湭瀹屾垚浠诲姟涓�!");
+// /// <summary>
+// /// 缁勭洏
+// /// </summary>
+// /// <returns></returns>
+// [HttpPost("AutoWare")]
+// public async Task AutoWare(WarehousingInput input)
+// {
+// // 鏍规嵁鎵樼洏鍙锋煡璇㈡墭鐩樺彿淇℃伅鏄惁宸插瓨鍦�
+// var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(u => u.ContainerCode == input.ContainerCode);
+// if (wmsContainer == null)
+// {
+// // 涓嶅瓨鍦ㄥ垯娣诲姞鎵樼洏鍙蜂俊鎭�
+// wmsContainer = new WmsContainer
+// {
+// ContainerCode = input.ContainerCode,
+// ContainerType = ContainerType.SULIAO,
+// ContainerStatus = ContainerStatus.KOUXIAN,
+// AssetNo = "N/A",
+// ErpNo = "N/A"
+// };
+// await _wmsContainerRep.InsertNowAsync(wmsContainer);
+// }
+// // 鏌ヨ鏄惁浠诲姟宸插瓨鍦�
+// var isExit = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
+// if (isExit) throw Oops.Oh("鎵樼洏鍙峰瓨鍦ㄦ湭瀹屾垚浠诲姟涓�!");
- // 鏌ヨ宸茬粍鐩樹俊鎭�
- var wmsMaterialContainerList = await _wmsMaterialContainerRep
- .Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
- await _wmsMaterialContainerRep.DeleteAsync(wmsMaterialContainerList);
- var orderNo = "N/A";
- if (input.WmsMaterials.Count > 0)
- {
- wmsContainer.ContainerStatus = ContainerStatus.ZUPANG;
- orderNo = YitIdHelper.NextId().ToString();
- await _wmsContainerRep.UpdateAsync(wmsContainer);
- }
- // 鍒涘缓鏂扮粍鐩樿褰�
- foreach (var item in input.WmsMaterials)
- {
- //鍒涘缓缁勭洏璁板綍
- var bindentranceModel = new WmsMaterialContainer();
- bindentranceModel.ContainerId = wmsContainer.Id;
- bindentranceModel.ContainerCode = wmsContainer.ContainerCode;
- bindentranceModel.MaterialNo = item.MaterialNo;
- bindentranceModel.MaterialId = 478183507525701;
- bindentranceModel.MaterialBatch = item.MaterialBatch;
- bindentranceModel.BindQuantity = 1;
- bindentranceModel.BindStatus = CommonStatus.ENABLE;
- bindentranceModel.OrderNo = orderNo;
- bindentranceModel.MaterialName = item.MaterialName;
- bindentranceModel.MaterialDensity = "N/A";
- await _wmsMaterialContainerRep.InsertNowAsync(bindentranceModel);
- }
- }
+// // 鏌ヨ宸茬粍鐩樹俊鎭�
+// var wmsMaterialContainerList = await _wmsMaterialContainerRep
+// .Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
+// await _wmsMaterialContainerRep.DeleteAsync(wmsMaterialContainerList);
+// var orderNo = "N/A";
+// if (input.WmsMaterials.Count > 0)
+// {
+// wmsContainer.ContainerStatus = ContainerStatus.ZUPANG;
+// orderNo = YitIdHelper.NextId().ToString();
+// await _wmsContainerRep.UpdateAsync(wmsContainer);
+// }
+// // 鍒涘缓鏂扮粍鐩樿褰�
+// foreach (var item in input.WmsMaterials)
+// {
+// //鍒涘缓缁勭洏璁板綍
+// var bindentranceModel = new WmsMaterialContainer();
+// bindentranceModel.ContainerId = wmsContainer.Id;
+// bindentranceModel.ContainerCode = wmsContainer.ContainerCode;
+// bindentranceModel.MaterialNo = item.MaterialNo;
+// bindentranceModel.MaterialId = 478183507525701;
+// bindentranceModel.MaterialBatch = item.MaterialBatch;
+// bindentranceModel.BindQuantity = 1;
+// bindentranceModel.BindStatus = CommonStatus.ENABLE;
+// bindentranceModel.OrderNo = orderNo;
+// bindentranceModel.MaterialName = item.MaterialName;
+// bindentranceModel.MaterialDensity = "N/A";
+// await _wmsMaterialContainerRep.InsertNowAsync(bindentranceModel);
+// }
+// }
- /// <summary>
- /// 鑷姩鍏ュ簱
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("automaticWarehousing")]
- [UnitOfWork]
- public async Task AutomaticWarehousing(WarehousingInput input)
- {
- // 鏌ヨ娣峰悎鏂欏簱鍖轰俊鎭�
- var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.AreaName.Contains("缁濈紭绔嬪簱"));
- // 鏍规嵁鏂欑鍙锋煡璇㈠懆杞鍙蜂俊鎭槸鍚﹀凡瀛樺湪
- var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(u => u.ContainerCode == input.ContainerCode);
- if (wmsContainer == null)
- {
- // 涓嶅瓨鍦ㄥ垯娣诲姞鍛ㄨ浆绠卞彿淇℃伅
- wmsContainer = new WmsContainer
- {
- ContainerCode = input.ContainerCode,
- ContainerType = ContainerType.JINSHU,
- ContainerStatus = ContainerStatus.KOUXIAN,
- AssetNo = "N/A",
- ErpNo = "N/A"
- };
- await _wmsContainerRep.InsertNowAsync(wmsContainer);
- }
- else
- {
- // 鏇存柊鍛ㄨ浆绠卞彿鐘舵�佷负鈥滃簱浣嶁��
- wmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
- await _wmsContainerRep.UpdateAsync(wmsContainer);
- }
+// /// <summary>
+// /// 鑷姩鍏ュ簱
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("automaticWarehousing")]
+// [UnitOfWork]
+// public async Task AutomaticWarehousing(WarehousingInput input)
+// {
+// // 鏌ヨ娣峰悎鏂欏簱鍖轰俊鎭�
+// var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.AreaName.Contains("缁濈紭绔嬪簱"));
+// // 鏍规嵁鏂欑鍙锋煡璇㈠懆杞鍙蜂俊鎭槸鍚﹀凡瀛樺湪
+// var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(u => u.ContainerCode == input.ContainerCode);
+// if (wmsContainer == null)
+// {
+// // 涓嶅瓨鍦ㄥ垯娣诲姞鍛ㄨ浆绠卞彿淇℃伅
+// wmsContainer = new WmsContainer
+// {
+// ContainerCode = input.ContainerCode,
+// ContainerType = ContainerType.JINSHU,
+// ContainerStatus = ContainerStatus.KOUXIAN,
+// AssetNo = "N/A",
+// ErpNo = "N/A"
+// };
+// await _wmsContainerRep.InsertNowAsync(wmsContainer);
+// }
+// else
+// {
+// // 鏇存柊鍛ㄨ浆绠卞彿鐘舵�佷负鈥滃簱浣嶁��
+// wmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
+// await _wmsContainerRep.UpdateAsync(wmsContainer);
+// }
- // 鏌ヨ鍛ㄨ浆绠卞彿鏄惁宸插瓨鍦ㄤ换鍔�
- var isWmsTask = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
- if (isWmsTask) throw Oops.Oh("鍛ㄨ浆绠卞彿瀛樺湪鏈畬鎴愪换鍔′腑!");
+// // 鏌ヨ鍛ㄨ浆绠卞彿鏄惁宸插瓨鍦ㄤ换鍔�
+// var isWmsTask = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
+// if (isWmsTask) throw Oops.Oh("鍛ㄨ浆绠卞彿瀛樺湪鏈畬鎴愪换鍔′腑!");
- // 鍒犻櫎宸茬粍鐩樹俊鎭�
- var oldWmsMaterialContainerList = await _wmsMaterialContainerRep
- .Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
+// // 鍒犻櫎宸茬粍鐩樹俊鎭�
+// var oldWmsMaterialContainerList = await _wmsMaterialContainerRep
+// .Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
- foreach (var item in oldWmsMaterialContainerList)
- {
- await _wmsMaterialContainerRep.DeleteAsync(item);
- }
+// foreach (var item in oldWmsMaterialContainerList)
+// {
+// await _wmsMaterialContainerRep.DeleteAsync(item);
+// }
- // 缁勭洏鍗曟嵁 榛樿绌烘枡绠卞崟鎹�
- var source = ""; //瀹氫箟鍏ュ簱鏉ユ簮
- var orderNo = "N/A";
- if (input.WmsMaterials.Count > 0)
- {
- wmsContainer.ContainerStatus = ContainerStatus.ZUPANG;
- orderNo = YitIdHelper.NextId().ToString();
- await _wmsContainerRep.UpdateAsync(wmsContainer);
- source = "鐗╂枡";
- }
- else
- {
- source = "绌烘墭";
- }
- // 鏌ヨ鐗╂枡Id
- var wmsMaterial = await _wmsMaterialRep.FirstOrDefaultAsync(u => u.MaterialNo == "N/A" && u.MaterialName == "N/A" && u.MaterialBatch == "N/A");
+// // 缁勭洏鍗曟嵁 榛樿绌烘枡绠卞崟鎹�
+// var source = ""; //瀹氫箟鍏ュ簱鏉ユ簮
+// var orderNo = "N/A";
+// if (input.WmsMaterials.Count > 0)
+// {
+// wmsContainer.ContainerStatus = ContainerStatus.ZUPANG;
+// orderNo = YitIdHelper.NextId().ToString();
+// await _wmsContainerRep.UpdateAsync(wmsContainer);
+// source = "鐗╂枡";
+// }
+// else
+// {
+// source = "绌烘墭";
+// }
+// // 鏌ヨ鐗╂枡Id
+// var wmsMaterial = await _wmsMaterialRep.FirstOrDefaultAsync(u => u.MaterialNo == "N/A" && u.MaterialName == "N/A" && u.MaterialBatch == "N/A");
- // 鍒涘缓鏂扮粍鐩樿褰�
- foreach (var item in input.WmsMaterials)
- {
- var wmsMaterialContainer = item.Adapt<WmsMaterialContainer>();
- wmsMaterialContainer.OrderNo = orderNo;
- wmsMaterialContainer.ContainerId = wmsContainer.Id;
- wmsMaterialContainer.ContainerCode = wmsContainer.ContainerCode;
- wmsMaterialContainer.MaterialId = wmsMaterial.Id;
- wmsMaterialContainer.BindStatus = CommonStatus.ENABLE;
- await _wmsMaterialContainerRep.InsertNowAsync(wmsMaterialContainer);
- }
+// // 鍒涘缓鏂扮粍鐩樿褰�
+// foreach (var item in input.WmsMaterials)
+// {
+// var wmsMaterialContainer = item.Adapt<WmsMaterialContainer>();
+// wmsMaterialContainer.OrderNo = orderNo;
+// wmsMaterialContainer.ContainerId = wmsContainer.Id;
+// wmsMaterialContainer.ContainerCode = wmsContainer.ContainerCode;
+// wmsMaterialContainer.MaterialId = wmsMaterial.Id;
+// wmsMaterialContainer.BindStatus = CommonStatus.ENABLE;
+// await _wmsMaterialContainerRep.InsertNowAsync(wmsMaterialContainer);
+// }
- //if (input.Source == RuKuSourceEnum.KONGTUO)
- //else if (input.Source == RuKuSourceEnum.WULIAO)
+// //if (input.Source == RuKuSourceEnum.KONGTUO)
+// //else if (input.Source == RuKuSourceEnum.WULIAO)
- //鍒涘缓宸烽亾鍒嗛厤
- var wmsPlace = await _wmsPlaceRep.Where(u => u.PlaceStatus == PlaceStatus.KONGXIAN).ToListAsync();
- var one = wmsPlace.Where(s => s.Aisle==1).ToList().Count;
- var two = wmsPlace.Where(s => s.Aisle == 2).ToList().Count;
- var three = wmsPlace.Where(s => s.Aisle == 3).ToList().Count;
- var Aisle = 0;
- if (one >= two && one >= three)
- {
- Aisle = 1;
- }
- else if (two >= one && two >= three)
- {
- Aisle = 2;
- }
- else
- {
- Aisle = 3;
- }
+// //鍒涘缓宸烽亾鍒嗛厤
+// var wmsPlace = await _wmsPlaceRep.Where(u => u.PlaceStatus == PlaceStatus.KONGXIAN).ToListAsync();
+// var one = wmsPlace.Where(s => s.Aisle==1).ToList().Count;
+// var two = wmsPlace.Where(s => s.Aisle == 2).ToList().Count;
+// var three = wmsPlace.Where(s => s.Aisle == 3).ToList().Count;
+// var Aisle = 0;
+// if (one >= two && one >= three)
+// {
+// Aisle = 1;
+// }
+// else if (two >= one && two >= three)
+// {
+// Aisle = 2;
+// }
+// else
+// {
+// Aisle = 3;
+// }
- string taskNo = "RUKU"+ 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);
- }
+// string taskNo = "RUKU"+ 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.RUKU,
- TaskLevel = 1,
- Aisle = Aisle,
- TaskStatus = TaskStatusEnum.WEIZHIXING,
- ContainerCode = wmsContainer.ContainerCode,
- SourcePlace = "鍏ュ簱鍙�",
- ToPlace = "",
- AreaName = wmsArea != null ? wmsArea.AreaName : "",
- OrderNo = orderNo,
- Description = source, //鍏ュ簱鏉ユ簮
- TaskDodeviceStatus = TaskDodeviceStatusEnum.WZX,
- IsRead = true
- };
- await _wmsTaskRep.InsertAsync(takmodel);
- }
+// // 鍒涘缓浠诲姟
+// var takmodel = new WmsTask()
+// {
+// TaskNo = taskNo,//YitIdHelper.NextId().ToString(),
+// TaskModel = TaskModel.QUANZIDONG,
+// TaskType = TaskType.RUKU,
+// TaskLevel = 1,
+// Aisle = Aisle,
+// TaskStatus = TaskStatusEnum.WEIZHIXING,
+// ContainerCode = wmsContainer.ContainerCode,
+// SourcePlace = "鍏ュ簱鍙�",
+// ToPlace = "",
+// AreaName = wmsArea != null ? wmsArea.AreaName : "",
+// OrderNo = orderNo,
+// Description = source, //鍏ュ簱鏉ユ簮
+// TaskDodeviceStatus = TaskDodeviceStatusEnum.WZX,
+// IsRead = true
+// };
+// await _wmsTaskRep.InsertAsync(takmodel);
+// }
- /// <summary>
- /// 浜哄伐鍏ュ簱
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("manualWarehousing")]
- [UnitOfWork]
- public async Task ManualWarehousing(WarehousingInput input)
- {
- // 鏌ヨ娣峰悎鏂欏簱鍖轰俊鎭�
- var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.AreaName.Contains("缁濈紭绔嬪簱"));
- // 鏍规嵁鏂欑鍙锋煡璇㈠懆杞鍙蜂俊鎭槸鍚﹀凡瀛樺湪
- var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(u => u.ContainerCode == input.ContainerCode);
- if (wmsContainer == null)
- {
- // 涓嶅瓨鍦ㄥ垯娣诲姞鍛ㄨ浆绠卞彿淇℃伅
- wmsContainer = new WmsContainer
- {
- ContainerCode = input.ContainerCode,
- ContainerType = ContainerType.JINSHU,
- ContainerStatus = ContainerStatus.KUWEI,
- AssetNo = "N/A",
- ErpNo = "N/A"
- };
- await _wmsContainerRep.InsertNowAsync(wmsContainer);
- }
- else
- {
- // 鏇存柊鍛ㄨ浆绠卞彿鐘舵�佷负鈥滃簱浣嶁��
- wmsContainer.ContainerStatus = ContainerStatus.KUWEI;
- await _wmsContainerRep.UpdateAsync(wmsContainer);
- }
+// /// <summary>
+// /// 浜哄伐鍏ュ簱
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("manualWarehousing")]
+// [UnitOfWork]
+// public async Task ManualWarehousing(WarehousingInput input)
+// {
+// // 鏌ヨ娣峰悎鏂欏簱鍖轰俊鎭�
+// var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.AreaName.Contains("缁濈紭绔嬪簱"));
+// // 鏍规嵁鏂欑鍙锋煡璇㈠懆杞鍙蜂俊鎭槸鍚﹀凡瀛樺湪
+// var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(u => u.ContainerCode == input.ContainerCode);
+// if (wmsContainer == null)
+// {
+// // 涓嶅瓨鍦ㄥ垯娣诲姞鍛ㄨ浆绠卞彿淇℃伅
+// wmsContainer = new WmsContainer
+// {
+// ContainerCode = input.ContainerCode,
+// ContainerType = ContainerType.JINSHU,
+// ContainerStatus = ContainerStatus.KUWEI,
+// AssetNo = "N/A",
+// ErpNo = "N/A"
+// };
+// await _wmsContainerRep.InsertNowAsync(wmsContainer);
+// }
+// else
+// {
+// // 鏇存柊鍛ㄨ浆绠卞彿鐘舵�佷负鈥滃簱浣嶁��
+// wmsContainer.ContainerStatus = ContainerStatus.KUWEI;
+// await _wmsContainerRep.UpdateAsync(wmsContainer);
+// }
- // 鏌ヨ鍛ㄨ浆绠卞彿鏄惁宸插瓨鍦ㄤ换鍔�
- var isWmsTask = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
- if (isWmsTask) throw Oops.Oh("鍛ㄨ浆绠卞彿瀛樺湪鏈畬鎴愪换鍔′腑!");
+// // 鏌ヨ鍛ㄨ浆绠卞彿鏄惁宸插瓨鍦ㄤ换鍔�
+// var isWmsTask = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
+// if (isWmsTask) throw Oops.Oh("鍛ㄨ浆绠卞彿瀛樺湪鏈畬鎴愪换鍔′腑!");
- // 鍒犻櫎宸茬粍鐩樹俊鎭�
- var oldWmsMaterialContainerList = await _wmsMaterialContainerRep
- .Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
+// // 鍒犻櫎宸茬粍鐩樹俊鎭�
+// var oldWmsMaterialContainerList = await _wmsMaterialContainerRep
+// .Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
- foreach (var item in oldWmsMaterialContainerList)
- {
- await _wmsMaterialContainerRep.DeleteAsync(item);
- }
+// foreach (var item in oldWmsMaterialContainerList)
+// {
+// await _wmsMaterialContainerRep.DeleteAsync(item);
+// }
- // 鏌ヨ搴撲綅淇℃伅 闅忔満鍒嗛厤搴撲綅
- var wmsPlace = new WmsPlace();
- if (string.IsNullOrEmpty(input.PlaceCode))
- 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 == input.PlaceCode);
- 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;
+// // 鏌ヨ搴撲綅淇℃伅 闅忔満鍒嗛厤搴撲綅
+// var wmsPlace = new WmsPlace();
+// if (string.IsNullOrEmpty(input.PlaceCode))
+// 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 == input.PlaceCode);
+// 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;
- // 缁勭洏鍗曟嵁 榛樿绌烘枡绠卞崟鎹�
- var orderNo = "N/A";
- var source = ""; //瀹氫箟鍏ュ簱鏉ユ簮
- if (input.WmsMaterials.Count > 0)
- {
- orderNo = YitIdHelper.NextId().ToString();
- source = "鐗╂枡";
- }
- else
- {
- wmsPlace.EmptyContainer = YesOrNot.Y; //鏄惁绌烘墭
- source = "绌烘墭";
- }
- // 鏌ヨ鐗╂枡Id
- var wmsMaterial = await _wmsMaterialRep.FirstOrDefaultAsync(u => u.MaterialNo == "N/A" && u.MaterialName == "N/A" && u.MaterialBatch == "N/A");
+// // 缁勭洏鍗曟嵁 榛樿绌烘枡绠卞崟鎹�
+// var orderNo = "N/A";
+// var source = ""; //瀹氫箟鍏ュ簱鏉ユ簮
+// if (input.WmsMaterials.Count > 0)
+// {
+// orderNo = YitIdHelper.NextId().ToString();
+// source = "鐗╂枡";
+// }
+// else
+// {
+// wmsPlace.EmptyContainer = YesOrNot.Y; //鏄惁绌烘墭
+// source = "绌烘墭";
+// }
+// // 鏌ヨ鐗╂枡Id
+// var wmsMaterial = await _wmsMaterialRep.FirstOrDefaultAsync(u => u.MaterialNo == "N/A" && u.MaterialName == "N/A" && u.MaterialBatch == "N/A");
- // 鍒涘缓鏂扮粍鐩樿褰�
- foreach (var item in input.WmsMaterials)
- {
- var wmsMaterialContainer = item.Adapt<WmsMaterialContainer>();
- wmsMaterialContainer.OrderNo = orderNo;
- wmsMaterialContainer.ContainerId = wmsContainer.Id;
- wmsMaterialContainer.ContainerCode = wmsContainer.ContainerCode;
- wmsMaterialContainer.MaterialId = wmsMaterial.Id;
- wmsMaterialContainer.BindStatus = CommonStatus.ENABLE;
+// // 鍒涘缓鏂扮粍鐩樿褰�
+// foreach (var item in input.WmsMaterials)
+// {
+// var wmsMaterialContainer = item.Adapt<WmsMaterialContainer>();
+// wmsMaterialContainer.OrderNo = orderNo;
+// wmsMaterialContainer.ContainerId = wmsContainer.Id;
+// wmsMaterialContainer.ContainerCode = wmsContainer.ContainerCode;
+// wmsMaterialContainer.MaterialId = wmsMaterial.Id;
+// wmsMaterialContainer.BindStatus = CommonStatus.ENABLE;
- await _wmsMaterialContainerRep.InsertNowAsync(wmsMaterialContainer);
- }
+// await _wmsMaterialContainerRep.InsertNowAsync(wmsMaterialContainer);
+// }
- string taskNo = "RUKU" + 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);
- }
+// string taskNo = "RUKU" + 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.SHOUDONG,
- TaskType = TaskType.RUKU,
- TaskLevel = 1,
- Aisle = wmsPlace.Aisle,
- TaskStatus = TaskStatusEnum.WANCHENG,
- ContainerCode = wmsContainer.ContainerCode,
- SourcePlace = "鍏ュ簱鍙�",
- ToPlace = wmsPlace.PlaceCode,
- AreaName = wmsArea != null ? wmsArea.AreaName : "",
- OrderNo = orderNo,
- Description = source, //鍏ュ簱鏉ユ簮
- TaskDodeviceStatus = TaskDodeviceStatusEnum.W,
- UpdatedTime = DateTime.Now,
- };
- await _wmsTaskRep.InsertAsync(takmodel);
+// // 鍒涘缓浠诲姟
+// var takmodel = new WmsTask()
+// {
+// TaskNo = taskNo,//YitIdHelper.NextId().ToString(),
+// TaskModel = TaskModel.SHOUDONG,
+// TaskType = TaskType.RUKU,
+// TaskLevel = 1,
+// Aisle = wmsPlace.Aisle,
+// TaskStatus = TaskStatusEnum.WANCHENG,
+// ContainerCode = wmsContainer.ContainerCode,
+// SourcePlace = "鍏ュ簱鍙�",
+// ToPlace = wmsPlace.PlaceCode,
+// AreaName = wmsArea != null ? wmsArea.AreaName : "",
+// OrderNo = orderNo,
+// Description = source, //鍏ュ簱鏉ユ簮
+// TaskDodeviceStatus = TaskDodeviceStatusEnum.W,
+// UpdatedTime = DateTime.Now,
+// };
+// await _wmsTaskRep.InsertAsync(takmodel);
- // 鍒涘缓鎵樼洏鍙峰簱浣嶅叧绯昏〃
- 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 == orderNo && p.BindStatus == CommonStatus.ENABLE).ProjectToType<WmsMaterialContainer>().ToListAsync();
+// // 鏇存柊搴撳瓨
+// var wmsMaterialContainerList = await _wmsMaterialContainerRep.DetachedEntities
+// .Where(p => p.OrderNo == 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.WULIAO;
- 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.WULIAO
- };
- await _wmsMaterialStockRep.InsertAsync(wmsMaterialStock);
- }
- }
- // 绌烘枡绠卞叆搴�
- if (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);
- }
- }
- }
-}
\ No newline at end of file
+// 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.WULIAO;
+// 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.WULIAO
+// };
+// await _wmsMaterialStockRep.InsertAsync(wmsMaterialStock);
+// }
+// }
+// // 绌烘枡绠卞叆搴�
+// if (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);
+// }
+// }
+// }
+//}
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsMaterial/Dto/WmsMaterialDto.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsMaterial/Dto/WmsMaterialDto.cs
deleted file mode 100644
index 5e4efad..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsMaterial/Dto/WmsMaterialDto.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-锘縰sing Admin.NET.Core;
-
-namespace Admin.NET.Application
-{
- /// <summary>
- /// 鐗╂枡淇℃伅
- /// </summary>
- public class WmsMaterialDto
- {
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- public string MaterialBatch { get; set; }
-
- /// <summary>
- /// 鎻忚堪
- /// </summary>
- public string Description { get; set; }
-
- /// <summary>
- /// 鐗╂枡绫诲埆
- /// </summary>
- public MaterialType? MaterialType { get; set; }
-
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- public string MaterialSpec { get; set; }
-
- /// <summary>
- /// 鐗╂枡瀵嗗害
- /// </summary>
- public string MaterialDensity { get; set; }
-
- /// <summary>
- /// 搴撳尯鍙傛暟
- /// </summary>
- public string AreaNameParameter { get; set; }
-
- /// <summary>
- /// 宸ヤ綔鍖哄弬鏁�
- /// </summary>
- public string StationNameParameter { get; set; }
-
- /// <summary>
- /// 鐔熷寲鏃堕棿
- /// </summary>
- public int MaturationTime { get; set; }
-
- /// <summary>
- /// 鏄惁闇�瑕佺啛鍖�
- /// </summary>
- public bool? IsMaturation { get; set; }
-
- /// <summary>
- /// Id涓婚敭
- /// </summary>
- public long Id { get; set; }
- }
-}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsMaterial/Dto/WmsMaterialInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsMaterial/Dto/WmsMaterialInput.cs
deleted file mode 100644
index 0914106..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsMaterial/Dto/WmsMaterialInput.cs
+++ /dev/null
@@ -1,261 +0,0 @@
-锘縰sing Microsoft.EntityFrameworkCore;
-using System.ComponentModel.DataAnnotations;
-using Admin.NET.Core;
-using Admin.NET.Core.Service;
-
-namespace Admin.NET.Application
-{
- /// <summary>
- /// 鐗╂枡淇℃伅鏌ヨ鍙傛暟
- /// </summary>
- public class WmsMaterialSearch : PageInputBase
- {
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public virtual string MaterialName { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- public virtual string MaterialNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- public virtual string MaterialBatch { get; set; }
-
- /// <summary>
- /// 鎻忚堪
- /// </summary>
- public virtual string Description { get; set; }
-
- /// <summary>
- /// 鐗╂枡绫诲埆
- /// </summary>
- public virtual MaterialType? MaterialType { get; set; }
-
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- public virtual string MaterialSpec { get; set; }
-
- /// <summary>
- /// 鐗╂枡瀵嗗害
- /// </summary>
- public virtual string MaterialDensity { get; set; }
-
-
- /// <summary>
- /// 鐗╂枡鍗曚綅
- /// </summary>
- ///
- public string MaterialUnit { get; set; }
-
- /// <summary>
- /// 搴撳尯鍙傛暟
- /// </summary>
- public virtual string AreaNameParameter { get; set; }
-
- /// <summary>
- /// 宸ヤ綔鍖哄弬鏁�
- /// </summary>
- public virtual string StationNameParameter { get; set; }
-
- /// <summary>
- /// 鐔熷寲鏃堕棿
- /// </summary>
- public virtual int? MaturationTime { get; set; }
-
- /// <summary>
- /// 鏄惁闇�瑕佺啛鍖�
- /// </summary>
- public virtual bool? IsMaturation { get; set; }
-
-
- //1217
-
- /// <summary>
- /// 妫�楠屾柟寮�;鏁版嵁瀛楀吀
- /// </summary>
-
- public MaterialInspection InspectionMethod { get; set; }
-
-
- /// <summary>
- /// 瀹夊叏瀛橀噺
- /// </summary>
-
- public decimal Safeqty { get; set; }
-
- /// <summary>
- /// 鏈�澶у瓨閲�
- /// </summary>
-
- public decimal MaxImumqty { get; set; }
-
- /// <summary>
- /// 鏈�灏忓簱榫�
- /// </summary>
-
- public decimal MinstorageAge { get; set; }
-
- /// <summary>
- /// 鏈�澶у簱榫�
- /// </summary>
-
- public decimal MaxstorageAge { get; set; }
-
- }
-
- /// <summary>
- /// 鐗╂枡淇℃伅杈撳叆鍙傛暟
- /// </summary>
- public class WmsMaterialInput
- {
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public virtual string MaterialName { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- public virtual string MaterialNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- public virtual string MaterialBatch { get; set; }
-
- /// <summary>
- /// 鎻忚堪
- /// </summary>
- public virtual string Description { get; set; }
-
- /// <summary>
- /// 鐗╂枡绫诲埆
- /// </summary>
- public virtual MaterialType? MaterialType { get; set; }
-
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- public virtual string MaterialSpec { get; set; }
-
- /// <summary>
- /// 鐗╂枡瀵嗗害
- /// </summary>
- public virtual string MaterialDensity { get; set; }
-
-
- /// <summary>
- /// 鐗╂枡鍗曚綅
- /// </summary>
- ///
- public string MaterialUnit { get; set; }
-
-
- /// <summary>
- /// 搴撳尯Ids
- /// </summary>
-
- public string AreaIds { get; set; }
-
- /// <summary>
- /// 搴撳尯鍙傛暟
- /// </summary>
- public virtual string AreaNameParameter { get; set; }
-
- /// <summary>
- /// 宸ヤ綔鍖篒ds
- /// </summary>
-
- public string StationIds { get; set; }
-
- /// <summary>
- /// 宸ヤ綔鍖哄弬鏁�
- /// </summary>
- public virtual string StationNameParameter { get; set; }
-
- /// <summary>
- /// 鐔熷寲鏃堕棿
- /// </summary>
- public virtual int MaturationTime { get; set; }
-
- /// <summary>
- /// 鏄惁闇�瑕佺啛鍖�
- /// </summary>
- public virtual bool IsMaturation { get; set; }
-
- /// <summary>
- /// 宸ユ
- /// </summary>
- public LesWorkshopSection? LesWorkshopSection { get; set; }
-
- //1217
-
- /// <summary>
- /// 妫�楠屾柟寮�;鏁版嵁瀛楀吀
- /// </summary>
-
- public MaterialInspection InspectionMethod { get; set; }
- /// <summary>
- /// 瀹夊叏瀛橀噺
- /// </summary>
- public decimal Safeqty { get; set; }
-
- /// <summary>
- /// 鏈�澶у瓨閲�
- /// </summary>
-
- public decimal MaxImumqty { get; set; }
-
- /// <summary>
- /// 鏈�灏忓簱榫�
- /// </summary>
-
- public decimal MinstorageAge { get; set; }
-
- /// <summary>
- /// 鏈�澶у簱榫�
- /// </summary>
-
- public decimal MaxstorageAge { get; set; }
-
- }
-
- /// <summary>
- ///
- /// </summary>
- public class AddWmsMaterialInput : WmsMaterialInput
- {
- }
-
- /// <summary>
- ///
- /// </summary>
- public class DeleteWmsMaterialInput : BaseId
- {
- }
-
- /// <summary>
- ///
- /// </summary>
- public class UpdateWmsMaterialInput : WmsMaterialInput
- {
- /// <summary>
- /// Id涓婚敭
- /// </summary>
- [Required(ErrorMessage = "Id涓婚敭涓嶈兘涓虹┖")]
- public long Id { get; set; }
- }
-
- /// <summary>
- ///
- /// </summary>
- public class QueryeWmsMaterialInput : BaseId
- {
-
- }
-}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsMaterial/Dto/WmsMaterialOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsMaterial/Dto/WmsMaterialOutput.cs
deleted file mode 100644
index f93ade9..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsMaterial/Dto/WmsMaterialOutput.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-锘縰sing Microsoft.EntityFrameworkCore;
-using System.ComponentModel.DataAnnotations;
-using Admin.NET.Core;
-
-namespace Admin.NET.Application
-{
- /// <summary>
- /// 鐗╂枡淇℃伅杈撳嚭鍙傛暟
- /// </summary>
- public class WmsMaterialOutput
- {
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- public string MaterialBatch { get; set; }
-
- /// <summary>
- /// 鎻忚堪
- /// </summary>
- public string Description { get; set; }
-
- /// <summary>
- /// 鐗╂枡绫诲埆
- /// </summary>
- public MaterialType MaterialType { get; set; }
-
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- public string MaterialSpec { get; set; }
-
- /// <summary>
- /// 鐗╂枡瀵嗗害
- /// </summary>
- public string MaterialDensity { get; set; }
- /// <summary>
- /// 鐗╂枡鍗曚綅
- /// </summary>
- ///
- public string MaterialUnit { get; set; }
- /// <summary>
- /// 搴撳尯Ids
- /// </summary>
- public string AreaIds { get; set; }
-
- /// <summary>
- /// 搴撳尯鍙傛暟
- /// </summary>
- public string AreaNameParameter { get; set; }
-
- /// <summary>
- /// 宸ヤ綔鍖篒ds
- /// </summary>
- public string StationIds { get; set; }
-
- /// <summary>
- /// 宸ヤ綔鍖哄弬鏁�
- /// </summary>
- public string StationNameParameter { get; set; }
-
- /// <summary>
- /// 鐔熷寲鏃堕棿
- /// </summary>
- public int MaturationTime { get; set; }
-
- /// <summary>
- /// 鏄惁闇�瑕佺啛鍖�
- /// </summary>
- public bool IsMaturation { get; set; }
-
- /// <summary>
- /// Id涓婚敭
- /// </summary>
- public long Id { get; set; }
-
- //1217
-
- /// <summary>
- /// 妫�楠屾柟寮�;鏁版嵁瀛楀吀
- /// </summary>
-
- public MaterialInspection InspectionMethod { get; set; }
- /// <summary>
- /// 瀹夊叏瀛橀噺
- /// </summary>
- public decimal Safeqty { get; set; }
-
- /// <summary>
- /// 鏈�澶у瓨閲�
- /// </summary>
-
- public decimal MaxImumqty { get; set; }
-
- /// <summary>
- /// 鏈�灏忓簱榫�
- /// </summary>
-
- public decimal MinstorageAge { get; set; }
-
- /// <summary>
- /// 鏈�澶у簱榫�
- /// </summary>
-
- public decimal MaxstorageAge { get; set; }
-
-
-
-
- }
-
- /// <summary>
- /// 搴撳尯涓嬫媺妗嗚緭鍑哄弬鏁�
- /// </summary>
- public class AreaListOutput
- {
- /// <summary>
- /// 鎵�鍦ㄥ簱鍖篒d
- /// </summary>
- public string AreaId { get; set; }
-
- /// <summary>
- /// 搴撳尯鍚嶇О
- /// </summary>
- public string AreaName { get; set; }
- }
-
- /// <summary>
- /// 宸ヤ綔鍖猴紙宸ヤ綅锛変笅鎷夋杈撳嚭鍙傛暟
- /// </summary>
- public class StationListOutput
- {
- /// <summary>
- /// 绔欑偣Id
- /// </summary>
- public string StationId { get; set; }
-
- /// <summary>
- /// 绔欑偣鍚嶇О
- /// </summary>
- public string StationName { get; set; }
- }
-}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsMaterial/WmsMaterialService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsMaterial/WmsMaterialService.cs
deleted file mode 100644
index 0613d96..0000000
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsMaterial/WmsMaterialService.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-锘縰sing Furion.DatabaseAccessor;
-using Furion.DependencyInjection;
-using Furion.DynamicApiController;
-using Furion.FriendlyException;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using System.Linq.Dynamic.Core;
-using Admin.NET.Core;
-
-namespace Admin.NET.Application
-{
- /// <summary>
- /// 鐗╂枡淇℃伅鏈嶅姟
- /// </summary>
- [ApiDescriptionSettings("鑷繁鐨勪笟鍔�", Name = "WmsMaterial", Order = 100)]
- [Route("api/[Controller]")]
- public class WmsMaterialService : IDynamicApiController, ITransient
- {
- private readonly IRepository<WmsMaterial, MasterDbContextLocator> _wmsMaterialRep;
- private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
- private readonly IRepository<LesStation, MasterDbContextLocator> _lesStationRep;
-
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- public WmsMaterialService(
- IRepository<WmsMaterial, MasterDbContextLocator> wmsMaterialRep,
- IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
- IRepository<LesStation, MasterDbContextLocator> lesStationRep
- )
- {
- _wmsMaterialRep = wmsMaterialRep;
- _wmsAreaRep = wmsAreaRep;
- _lesStationRep = lesStationRep;
- }
-
- /// <summary>
- /// 鍒嗛〉鏌ヨ鐗╂枡淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("page")]
- public async Task<PageResult<WmsMaterialOutput>> Page([FromQuery] WmsMaterialSearch input)
- {
- var wmsMaterials = await _wmsMaterialRep.DetachedEntities
- .Where(!string.IsNullOrEmpty(input.MaterialName), u => EF.Functions.Like(u.MaterialName, $"%{input.MaterialName.Trim()}%"))
- .Where(input.MaterialType != null, u => u.MaterialType == input.MaterialType)
- .Where(!string.IsNullOrEmpty(input.MaterialSpec), u => EF.Functions.Like(u.MaterialSpec, $"%{input.MaterialSpec.Trim()}%"))
- .Where(!string.IsNullOrEmpty(input.MaterialDensity), u => EF.Functions.Like(u.MaterialDensity, $"%{input.MaterialDensity.Trim()}%"))
- //.Where(input.IsMaturation != null, u => u.IsMaturation == input.IsMaturation)
- .OrderBy(PageInputOrder.OrderBuilder<WmsMaterialSearch>(input))
- .ProjectToType<WmsMaterialOutput>()
- .ToADPagedListAsync(input.PageNo, input.PageSize);
- return wmsMaterials;
- }
-
- /// <summary>
- /// 澧炲姞鐗╂枡淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("add")]
- public async Task Add(AddWmsMaterialInput input)
- {
- var wmsMaterial = input.Adapt<WmsMaterial>();
- await _wmsMaterialRep.InsertAsync(wmsMaterial);
- }
-
- /// <summary>
- /// 鍒犻櫎鐗╂枡淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("delete")]
- public async Task Delete(DeleteWmsMaterialInput input)
- {
- var wmsMaterial = await _wmsMaterialRep.FirstOrDefaultAsync(u => u.Id == input.Id);
- await _wmsMaterialRep.DeleteAsync(wmsMaterial);
- }
-
- /// <summary>
- /// 鏇存柊鐗╂枡淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("edit")]
- public async Task Update(UpdateWmsMaterialInput input)
- {
- var isExist = await _wmsMaterialRep.AnyAsync(u => u.Id == input.Id, false);
- if (!isExist) throw Oops.Oh(ErrorCode.D3000);
-
- var wmsMaterial = input.Adapt<WmsMaterial>();
- await _wmsMaterialRep.UpdateAsync(wmsMaterial, ignoreNullValues: true);
- }
-
- /// <summary>
- /// 鑾峰彇鐗╂枡淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("detail")]
- public async Task<WmsMaterialOutput> Get([FromQuery] QueryeWmsMaterialInput input)
- {
- return (await _wmsMaterialRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<WmsMaterialOutput>();
- }
-
- /// <summary>
- /// 鑾峰彇鐗╂枡淇℃伅鍒楄〃
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("list")]
- public async Task<List<WmsMaterialOutput>> List([FromQuery] WmsMaterialInput input)
- {
- return await _wmsMaterialRep.DetachedEntities.ProjectToType<WmsMaterialOutput>().ToListAsync();
- }
-
- /// <summary>
- /// 搴撳尯涓嬫媺妗�
- /// </summary>
- /// <returns></returns>
- [HttpGet("GetAreaList")]
- public async Task<List<AreaListOutput>> GetAreaList()
- {
- var data = await _wmsAreaRep.DetachedEntities.ProjectToType<WmsAreaOutput>().ToListAsync();
- List<AreaListOutput> areaListOutputLists = new List<AreaListOutput>();
- foreach (var item in data)
- {
- AreaListOutput areaListOutputList = new AreaListOutput();
- areaListOutputList.AreaId = item.Id.ToString();
- areaListOutputList.AreaName = item.AreaName;
- areaListOutputLists.Add(areaListOutputList);
- }
- return areaListOutputLists;
- }
-
- /// <summary>
- /// 宸ヤ綔鍖猴紙宸ヤ綅锛変笅鎷夋
- /// </summary>
- /// <returns></returns>
- //[HttpGet("GetStationList")]
- //public async Task<List<StationListOutput>> GetStationList()
- //{
- // var data = await _lesStationRep.DetachedEntities.ProjectToType<LesStationOutput>().ToListAsync();
- // List<StationListOutput> stationListOutputLists = new List<StationListOutput>();
- // foreach (var item in data)
- // {
- // StationListOutput stationListOutputList = new StationListOutput();
- // stationListOutputList.StationId = item.Id.ToString();
- // stationListOutputList.StationName = item.Name;
- // stationListOutputLists.Add(stationListOutputList);
- // }
- // return stationListOutputLists;
- //}
- }
-}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterial.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterial.cs
index 6cc53d6..3fe526a 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterial.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterial.cs
@@ -1,9 +1,12 @@
-锘縰sing Furion.DatabaseAccessor;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
+锘縰sing Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
+/*
+ * @author : 鍒樻枃濂�
+ * @date : 2024/4/23涓嬪崍1:36:22
+ * @desc : 鐗╂枡淇℃伅琛�
+ */
namespace Admin.NET.Core
{
/// <summary>
@@ -11,8 +14,10 @@
/// </summary>
[Table("wms_material")]
[Comment("鐗╂枡淇℃伅琛�")]
- public class WmsMaterial : DEntityBase, IEntityTypeBuilder<WmsMaterial>
+ public class WmsMaterial : DEntityBase
{
+
+
/// <summary>
/// 鐗╂枡鍚嶇О
/// </summary>
@@ -21,154 +26,181 @@
[MaxLength(50)]
public string MaterialName { get; set; }
+
/// <summary>
/// 鐗╂枡缂栧彿
/// </summary>
[Comment("鐗╂枡缂栧彿")]
[Required]
[MaxLength(50)]
- public string MaterialNo { get; set; }
+ public string MaterialCode { get; set; }
+
/// <summary>
- /// 鐗╂枡鎵规
+ /// ERP缂栧彿
/// </summary>
- [Comment("鐗╂枡鎵规")]
+ [Comment("ERP缂栧彿")]
+ [MaxLength(255)]
+ public string ErpCode { get; set; }
+
+
+ /// <summary>
+ /// 鐗╂枡绫诲瀷鍚嶇О
+ /// </summary>
+ [Comment("鐗╂枡绫诲瀷鍚嶇О")]
+ [Required]
[MaxLength(50)]
- public string MaterialBatch { get; set; }
+ public string MaterialTypeName { get; set; }
+
/// <summary>
- /// 鐗╂枡绫诲埆;鏁版嵁瀛楀吀
+ /// 鐗╂枡绫诲瀷鎻忚堪
/// </summary>
- [Comment("鐗╂枡绫诲埆")]
- public MaterialType MaterialType { get; set; }
+ [Comment("鐗╂枡绫诲瀷鎻忚堪")]
+ [MaxLength(255)]
+ public string MaterialTypeDescr { get; set; }
+
/// <summary>
- /// 鐗╂枡妫�楠�
+ /// 鐗╂枡绫诲瀷
/// </summary>
- [Comment("鐗╂枡妫�楠�")]
- public MaterialInspection InspectionMethod { get; set; }
+ [Comment("鐗╂枡绫诲瀷")]
+ [Required]
+
+ public int MaterialType { get; set; }
+
+
+ /// <summary>
+ /// 鐗╂枡缁�
+ /// </summary>
+ [Comment("鐗╂枡缁�")]
+ [MaxLength(50)]
+ public string MaterialGroup { get; set; }
+
+
+ /// <summary>
+ /// ABC鍒嗙被鍚嶇О
+ /// </summary>
+ [Comment("ABC鍒嗙被鍚嶇О")]
+ [MaxLength(50)]
+ public string ABCClassName { get; set; }
+
+
+ /// <summary>
+ /// ABC鍒嗙被
+ /// </summary>
+ [Comment("ABC鍒嗙被")]
+
+ public int? ABCClass { get; set; }
+
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
[Comment("鐗╂枡瑙勬牸")]
- [MaxLength(50)]
+ [MaxLength(255)]
public string MaterialSpec { get; set; }
- /// <summary>
- /// 鐗╂枡瀵嗗害
- /// </summary>
- [Comment("鐗╂枡瀵嗗害")]
- [MaxLength(50)]
- public string MaterialDensity { get; set; }
/// <summary>
- /// 鐗╂枡鍗曚綅
+ /// 榛樿鍏ュ簱搴撲綅
/// </summary>
- [Comment("鐗╂枡鍗曚綅")]
+ [Comment("榛樿鍏ュ簱搴撲綅")]
+ [MaxLength(50)]
+ public string InPlaceCode { get; set; }
+
+
+ /// <summary>
+ /// 搴撳瓨鍗曚綅
+ /// </summary>
+ [Comment("搴撳瓨鍗曚綅")]
+ [Required]
[MaxLength(50)]
public string MaterialUnit { get; set; }
- /// <summary>
- /// 搴撳尯Ids
- /// </summary>
- [Comment("搴撳尯Ids")]
- public string AreaIds { get; set; }
/// <summary>
- /// 搴撳尯鍙傛暟
+ /// 閲囪喘鍗曚綅
/// </summary>
- [Comment("搴撳尯鍙傛暟")]
- public string AreaNameParameter { get; set; }
+ [Comment("閲囪喘鍗曚綅")]
+ [Required]
+ [MaxLength(50)]
+ public string POUnit { get; set; }
+
/// <summary>
- /// 宸ヤ綔鍖篒ds
+ /// 棰滆壊
/// </summary>
- [Comment("宸ヤ綔鍖篒ds")]
- public string StationIds { get; set; }
+ [Comment("棰滆壊")]
+ [MaxLength(50)]
+ public string Color { get; set; }
+
/// <summary>
- /// 宸ヤ綔鍖哄弬鏁�
+ /// 閲嶉噺
/// </summary>
- [Comment("宸ヤ綔鍖哄弬鏁�")]
- public string StationNameParameter { get; set; }
+ [Comment("閲嶉噺")]
+ [MaxLength(50)]
+ public string Weight { get; set; }
+
/// <summary>
- /// 宸ユ
+ /// 鏍囧寘鏁伴噺
/// </summary>
- //[Comment("宸ユ")]
- //[Required]
- //public LesWorkshopSection LesWorkshopSection { get; set; }
+ [Comment("鏍囧寘鏁伴噺")]
- //1215
+ [Column("SNP", TypeName = "decimal(10,3)")]
+ public decimal? SNP { get; set; }
+
+
+ /// <summary>
+ /// 鎹㈢畻鐜�
+ /// </summary>
+ [Comment("鎹㈢畻鐜�")]
+
+ [Column("TranslateRate", TypeName = "decimal(10,3)")]
+ public decimal? TranslateRate { get; set; }
+
+
+ /// <summary>
+ /// 鎵规灞炴�ц鍒�
+ /// </summary>
+ [Comment("鎵规灞炴�ц鍒�")]
+
+ public long? BatchRuleId { get; set; }
+
+
+ /// <summary>
+ /// 鎺у埗灞炴�ц鍒�
+ /// </summary>
+ [Comment("鎺у埗灞炴�ц鍒�")]
+
+ public long? ControlRuleId { get; set; }
+
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ [Comment("鏄惁绂佺敤")]
+ [Required]
+
+ public bool IsDisabled { get; set; }
+
/// <summary>
/// 鎻忚堪
/// </summary>
[Comment("鎻忚堪")]
-
- [MaxLength(500)]
- public string Description { get; set; }
-
- /// <summary>
- /// 瀹夊叏瀛橀噺
- /// </summary>
- [Comment("瀹夊叏瀛橀噺")]
-
- public decimal Safeqty { get; set; }
-
- /// <summary>
- /// 鏈�澶у瓨閲�
- /// </summary>
- [Comment("鏈�澶у瓨閲�")]
-
- public decimal MaxImumqty { get; set; }
-
- /// <summary>
- /// 鏈�灏忓簱榫�
- /// </summary>
- [Comment("鏈�灏忓簱榫�")]
-
- public decimal MinstorageAge { get; set; }
-
- /// <summary>
- /// 鏈�澶у簱榫�
- /// </summary>
- [Comment("鏈�澶у簱榫�")]
-
- public decimal MaxstorageAge { get; set; }
-
-
+ [MaxLength(255)]
+ public string MaterialDesc { get; set; }
- /// <summary>
- /// 鐗╂枡鎵樼洏鍏崇郴琛�
- /// </summary>
- public ICollection<WmsMaterialContainer> WmsFoamingMaterialContainer { get; set; }
- /// <summary>
- /// 鐗╂枡鎵樼洏鍘嗗彶琛�
- /// </summary>
- public ICollection<WmsHistoryMaterialContainer> WmsFoamingHistoryMaterialContainer { get; set; }
- /// <summary>
- /// 鏋勫缓涓�瀵瑰鐨勫叧绯�
- /// </summary>
- /// <param name="entityBuilder"></param>
- /// <param name="dbContext"></param>
- /// <param name="dbContextLocator"></param>
- public void Configure(EntityTypeBuilder<WmsMaterial> entityBuilder, DbContext dbContext, Type dbContextLocator)
- {
- entityBuilder.HasMany(x => x.WmsFoamingMaterialContainer)
- .WithOne(x => x.WmsMaterial)
- .HasForeignKey(x => x.MaterialId).IsRequired(false);
- entityBuilder.HasMany(x => x.WmsFoamingHistoryMaterialContainer)
- .WithOne(x => x.WmsMaterial)
- .HasForeignKey(x => x.MaterialId).IsRequired(false);
- }
+
+
}
-}
-
+}
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs
new file mode 100755
index 0000000..1127786
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs
@@ -0,0 +1,83 @@
+锘縰sing Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+/*
+ * @author : 鍒樻枃濂�
+ * @date : 2024/4/23涓嬪崍1:55:15
+ * @desc : 鐗╂枡瀹㈡埛鍏宠仈琛�
+ */
+namespace Admin.NET.Core
+{
+ /// <summary>
+ /// 鐗╂枡瀹㈡埛鍏宠仈琛�
+ /// </summary>
+ [Table("wms_material_customer")]
+ [Comment("鐗╂枡瀹㈡埛鍏宠仈琛�")]
+ public class WmsMaterialCustomer : DEntityBase
+ {
+
+
+ /// <summary>
+ /// 鐗╂枡ID
+ /// </summary>
+ [Comment("鐗╂枡ID")]
+ [Required]
+
+ public long MaterialId { get; set; }
+
+
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ [Comment("鐗╂枡缂栧彿")]
+ [Required]
+ [MaxLength(50)]
+ public string MaterialNo { get; set; }
+
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [Comment("鐗╂枡鍚嶇О")]
+ [Required]
+ [MaxLength(50)]
+ public string MaterialName { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛ID
+ /// </summary>
+ [Comment("瀹㈡埛ID")]
+ [Required]
+
+ public long CustId { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛缂栧彿
+ /// </summary>
+ [Comment("瀹㈡埛缂栧彿")]
+ [Required]
+ [MaxLength(50)]
+ public string CustCode { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛鍚嶇О
+ /// </summary>
+ [Comment("瀹㈡埛鍚嶇О")]
+ [Required]
+ [MaxLength(50)]
+ public string CustName { get; set; }
+
+
+
+
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialType.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialType.cs
new file mode 100755
index 0000000..987d216
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialType.cs
@@ -0,0 +1,64 @@
+锘縰sing Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+/*
+ * @author : 鍒樻枃濂�
+ * @date : 2024/4/23涓嬪崍1:54:19
+ * @desc : 鐗╂枡绫诲瀷琛�
+ */
+namespace Admin.NET.Core
+{
+ /// <summary>
+ /// 鐗╂枡绫诲瀷琛�
+ /// </summary>
+ [Table("wms_material_type")]
+ [Comment("鐗╂枡绫诲瀷琛�")]
+ public class WmsMaterialType : DEntityBase
+ {
+
+
+ /// <summary>
+ /// 绫诲瀷缂栧彿
+ /// </summary>
+ [Comment("绫诲瀷缂栧彿")]
+ [Required]
+ [MaxLength(50)]
+ public string MaterialTypeCode { get; set; }
+
+
+ /// <summary>
+ /// 绫诲瀷鎻忚堪
+ /// </summary>
+ [Comment("绫诲瀷鎻忚堪")]
+ [MaxLength(255)]
+ public string MaterialTypeDescr { get; set; }
+
+
+ /// <summary>
+ /// 绫诲瀷鍚嶇О
+ /// </summary>
+ [Comment("绫诲瀷鍚嶇О")]
+ [Required]
+ [MaxLength(50)]
+ public string MaterialTypeName { get; set; }
+
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ [Comment("鏄惁绂佺敤")]
+ [Required]
+
+ public bool IsDisabled { get; set; }
+
+
+
+
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialUnit.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialUnit.cs
new file mode 100755
index 0000000..0d2cc34
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialUnit.cs
@@ -0,0 +1,64 @@
+锘縰sing Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+/*
+ * @author : 鍒樻枃濂�
+ * @date : 2024/4/23涓嬪崍1:40:37
+ * @desc : 鍗曚綅鍩虹淇℃伅
+ */
+namespace Admin.NET.Core
+{
+ /// <summary>
+ /// 鍗曚綅鍩虹淇℃伅
+ /// </summary>
+ [Table("wms_unit")]
+ [Comment("鍗曚綅鍩虹淇℃伅")]
+ public class WmsUnit : DEntityBase
+ {
+
+
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ [Comment("缂栧彿")]
+ [Required]
+ [MaxLength(50)]
+ public string UnitCode { get; set; }
+
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ [Comment("鍚嶇О")]
+ [Required]
+ [MaxLength(50)]
+ public string UnitName { get; set; }
+
+
+ /// <summary>
+ /// 鎻忚堪
+ /// </summary>
+ [Comment("鎻忚堪")]
+ [MaxLength(50)]
+ public string UnitDesc { get; set; }
+
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ [Comment("鏄惁绂佺敤")]
+ [Required]
+
+ public bool IsDisabled { get; set; }
+
+
+
+
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.EntityFramework.Core/Admin.NET.EntityFramework.Core.csproj b/iWare_RawMaterialWarehouse_Wms/Admin.NET.EntityFramework.Core/Admin.NET.EntityFramework.Core.csproj
index 143d7bc..0e492e1 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.EntityFramework.Core/Admin.NET.EntityFramework.Core.csproj
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.EntityFramework.Core/Admin.NET.EntityFramework.Core.csproj
@@ -9,6 +9,7 @@
<ItemGroup>
<None Remove="dbsettings.Development-166.json" />
<None Remove="dbsettings.Development-鏈満.json" />
+ <None Remove="dbsettings.Development.json" />
</ItemGroup>
--
Gitblit v1.9.3