From 174f05a6e0f2312f3bdcafcf837f2534ecdaea15 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周二, 23 4月 2024 17:22:02 +0800
Subject: [PATCH] 增加库区
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsArea.cs | 116 +
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsPlace/WmsPlaceService.cs | 532 ++++----
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsArea/WmsAreaService.cs | 580 ++++----
使用文档/PDManer文件/原材料库标准化.pdma.json | 131 +
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsCount/WmsLocationView/LocationViewService.cs | 526 ++++----
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WcsToWms/WareWcsToWmsService.cs | 1992 +++++++++++++++---------------
6 files changed, 1,963 insertions(+), 1,914 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsArea/WmsAreaService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsArea/WmsAreaService.cs
index 9f665e5..682c6a0 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsArea/WmsAreaService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsArea/WmsAreaService.cs
@@ -1,313 +1,313 @@
-锘縰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 Furion.DatabaseAccessor;
+//using Furion.DependencyInjection;
+//using Furion.DynamicApiController;
+//using Furion.FriendlyException;
+//using Mapster;
+//using Microsoft.AspNetCore.Http;
+//using Microsoft.AspNetCore.Mvc;
+//using Microsoft.EntityFrameworkCore;
+//using System.Linq.Dynamic.Core;
+//using System.Text;
+//using System.Web;
+//using Admin.NET.Core;
-namespace Admin.NET.Application
-{
- /// <summary>
- /// 搴撳尯淇℃伅鏈嶅姟
- /// </summary>
- [ApiDescriptionSettings("鑷繁鐨勪笟鍔�", Name = "WmsArea", Order = 100)]
- [Route("api/[Controller]")]
- public class WmsAreaService : IDynamicApiController, ITransient
- {
- private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
- private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
- private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
- private readonly ISysExcelTemplateService _sysExcelTemplateService;
- private readonly static object _lock = new();
+//namespace Admin.NET.Application
+//{
+// /// <summary>
+// /// 搴撳尯淇℃伅鏈嶅姟
+// /// </summary>
+// [ApiDescriptionSettings("鑷繁鐨勪笟鍔�", Name = "WmsArea", Order = 100)]
+// [Route("api/[Controller]")]
+// public class WmsAreaService : IDynamicApiController, ITransient
+// {
+// private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
+// private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
+// private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
+// private readonly ISysExcelTemplateService _sysExcelTemplateService;
+// private readonly static object _lock = new();
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- /// <param name="wmsAreaRep"></param>
- /// <param name="sysDictTypeRep"></param>
- /// <param name="sysDictDataRep"></param>
- /// <param name="sysExcelTemplateService"></param>
- public WmsAreaService(
- IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
- IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep,
- IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep,
- ISysExcelTemplateService sysExcelTemplateService
- )
- {
- _wmsAreaRep = wmsAreaRep;
- _sysDictTypeRep = sysDictTypeRep;
- _sysDictDataRep = sysDictDataRep;
- _sysExcelTemplateService = sysExcelTemplateService;
- }
+// /// <summary>
+// /// 鏋勯�犲嚱鏁�
+// /// </summary>
+// /// <param name="wmsAreaRep"></param>
+// /// <param name="sysDictTypeRep"></param>
+// /// <param name="sysDictDataRep"></param>
+// /// <param name="sysExcelTemplateService"></param>
+// public WmsAreaService(
+// IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
+// IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep,
+// IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep,
+// ISysExcelTemplateService sysExcelTemplateService
+// )
+// {
+// _wmsAreaRep = wmsAreaRep;
+// _sysDictTypeRep = sysDictTypeRep;
+// _sysDictDataRep = sysDictDataRep;
+// _sysExcelTemplateService = sysExcelTemplateService;
+// }
- /// <summary>
- /// 鍒嗛〉鏌ヨ搴撳尯淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("page")]
- public async Task<PageResult<WmsAreaOutput>> Page([FromQuery] WmsAreaSearch input)
- {
- var wmsAreas = await _wmsAreaRep.DetachedEntities
- .Where(!string.IsNullOrEmpty(input.AreaName), u => EF.Functions.Like(u.AreaName, $"%{input.AreaName.Trim()}%"))
- .Where(input.AreaStatus != null, u => u.AreaStatus == input.AreaStatus)
- .Where(input.AreaType != null, u => u.AreaType == input.AreaType)
- .Where(input.IsSteel != null, u => u.IsSteel == input.IsSteel)
- .Where(input.WorkShopType != null, u => u.WorkShopType == input.WorkShopType)
+// /// <summary>
+// /// 鍒嗛〉鏌ヨ搴撳尯淇℃伅
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("page")]
+// public async Task<PageResult<WmsAreaOutput>> Page([FromQuery] WmsAreaSearch input)
+// {
+// var wmsAreas = await _wmsAreaRep.DetachedEntities
+// .Where(!string.IsNullOrEmpty(input.AreaName), u => EF.Functions.Like(u.AreaName, $"%{input.AreaName.Trim()}%"))
+// .Where(input.AreaStatus != null, u => u.AreaStatus == input.AreaStatus)
+// .Where(input.AreaType != null, u => u.AreaType == input.AreaType)
+// .Where(input.IsSteel != null, u => u.IsSteel == input.IsSteel)
+// .Where(input.WorkShopType != null, u => u.WorkShopType == input.WorkShopType)
- .OrderBy(PageInputOrder.OrderBuilder<WmsAreaSearch>(input))
- .ProjectToType<WmsAreaOutput>()
- .ToADPagedListAsync(input.PageNo, input.PageSize);
- return wmsAreas;
- }
+// .OrderBy(PageInputOrder.OrderBuilder<WmsAreaSearch>(input))
+// .ProjectToType<WmsAreaOutput>()
+// .ToADPagedListAsync(input.PageNo, input.PageSize);
+// return wmsAreas;
+// }
- /// <summary>
- /// 涓嶅垎椤垫煡璇㈠簱鍖轰俊鎭垪琛�
- /// </summary>
- /// <param name="input">搴撳尯淇℃伅鏌ヨ鍙傛暟</param>
- /// <returns>(搴撳尯淇℃伅)瀹炰緥鍒楄〃</returns>
- [HttpGet("listNonPage")]
- public async Task<List<WmsAreaOutput>> ListNonPageAsync([FromQuery] WmsAreaSearchNonPage input)
- {
- var pAreaName = input.AreaName?.Trim() ?? "";
- var pAreaStatus = input.AreaStatus;
- var pAreaType = input.AreaType;
- var pIsSteel = input.IsSteel;
- var pWorkShopType = input.WorkShopType;
- var pIssueState = input.IssueState;
- var wmsAreas = await _wmsAreaRep.DetachedEntities
- .Where(!string.IsNullOrEmpty(pAreaName), u => EF.Functions.Like(u.AreaName, $"%{pAreaName}%"))
- .Where(pAreaStatus != null, u => u.AreaStatus == pAreaStatus)
- .Where(pAreaType != null, u => u.AreaType == pAreaType)
- .Where(pIsSteel != null, u => u.IsSteel == pIsSteel)
- .Where(pWorkShopType != null, u => u.WorkShopType == pWorkShopType)
+// /// <summary>
+// /// 涓嶅垎椤垫煡璇㈠簱鍖轰俊鎭垪琛�
+// /// </summary>
+// /// <param name="input">搴撳尯淇℃伅鏌ヨ鍙傛暟</param>
+// /// <returns>(搴撳尯淇℃伅)瀹炰緥鍒楄〃</returns>
+// [HttpGet("listNonPage")]
+// public async Task<List<WmsAreaOutput>> ListNonPageAsync([FromQuery] WmsAreaSearchNonPage input)
+// {
+// var pAreaName = input.AreaName?.Trim() ?? "";
+// var pAreaStatus = input.AreaStatus;
+// var pAreaType = input.AreaType;
+// var pIsSteel = input.IsSteel;
+// var pWorkShopType = input.WorkShopType;
+// var pIssueState = input.IssueState;
+// var wmsAreas = await _wmsAreaRep.DetachedEntities
+// .Where(!string.IsNullOrEmpty(pAreaName), u => EF.Functions.Like(u.AreaName, $"%{pAreaName}%"))
+// .Where(pAreaStatus != null, u => u.AreaStatus == pAreaStatus)
+// .Where(pAreaType != null, u => u.AreaType == pAreaType)
+// .Where(pIsSteel != null, u => u.IsSteel == pIsSteel)
+// .Where(pWorkShopType != null, u => u.WorkShopType == pWorkShopType)
- .OrderBy(PageInputOrder.OrderNonPageBuilder(input))
- .ProjectToType<WmsAreaOutput>()
- .ToListAsync();
- return wmsAreas;
- }
+// .OrderBy(PageInputOrder.OrderNonPageBuilder(input))
+// .ProjectToType<WmsAreaOutput>()
+// .ToListAsync();
+// return wmsAreas;
+// }
- /// <summary>
- /// 澧炲姞搴撳尯淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("add")]
- public async Task Add(AddWmsAreaInput input)
- {
- var wmsArea = input.Adapt<WmsArea>();
- await _wmsAreaRep.InsertAsync(wmsArea);
- }
+// /// <summary>
+// /// 澧炲姞搴撳尯淇℃伅
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("add")]
+// public async Task Add(AddWmsAreaInput input)
+// {
+// var wmsArea = input.Adapt<WmsArea>();
+// await _wmsAreaRep.InsertAsync(wmsArea);
+// }
- /// <summary>
- /// 鍒犻櫎搴撳尯淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("delete")]
- public async Task Delete(DeleteWmsAreaInput input)
- {
- var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.Id == input.Id);
- await _wmsAreaRep.DeleteAsync(wmsArea);
- }
+// /// <summary>
+// /// 鍒犻櫎搴撳尯淇℃伅
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("delete")]
+// public async Task Delete(DeleteWmsAreaInput input)
+// {
+// var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.Id == input.Id);
+// await _wmsAreaRep.DeleteAsync(wmsArea);
+// }
- /// <summary>
- /// 鏇存柊搴撳尯淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("edit")]
- public async Task Update(UpdateWmsAreaInput input)
- {
- var isExist = await _wmsAreaRep.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(UpdateWmsAreaInput input)
+// {
+// var isExist = await _wmsAreaRep.AnyAsync(u => u.Id == input.Id, false);
+// if (!isExist) throw Oops.Oh(ErrorCode.D3000);
- var wmsArea = input.Adapt<WmsArea>();
- await _wmsAreaRep.UpdateAsync(wmsArea, ignoreNullValues: true);
- }
+// var wmsArea = input.Adapt<WmsArea>();
+// await _wmsAreaRep.UpdateAsync(wmsArea, ignoreNullValues: true);
+// }
- /// <summary>
- /// 鑾峰彇搴撳尯淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("detail")]
- public async Task<WmsAreaOutput> Get([FromQuery] QueryeWmsAreaInput input)
- {
- return (await _wmsAreaRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<WmsAreaOutput>();
- }
+// /// <summary>
+// /// 鑾峰彇搴撳尯淇℃伅
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("detail")]
+// public async Task<WmsAreaOutput> Get([FromQuery] QueryeWmsAreaInput input)
+// {
+// return (await _wmsAreaRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<WmsAreaOutput>();
+// }
- /// <summary>
- /// 鑾峰彇搴撳尯淇℃伅鍒楄〃
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("list")]
- public async Task<List<WmsAreaOutput>> List([FromQuery] WmsAreaInput input)
- {
- return await _wmsAreaRep.DetachedEntities.ProjectToType<WmsAreaOutput>().ToListAsync();
- }
+// /// <summary>
+// /// 鑾峰彇搴撳尯淇℃伅鍒楄〃
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("list")]
+// public async Task<List<WmsAreaOutput>> List([FromQuery] WmsAreaInput input)
+// {
+// return await _wmsAreaRep.DetachedEntities.ProjectToType<WmsAreaOutput>().ToListAsync();
+// }
- /// <summary>
- /// 缁勮杞﹂棿鑾峰彇搴撳尯
- /// </summary>
- /// <returns></returns>
- [HttpGet("TaskWmsArea")]
- public async Task<dynamic> TaskWmsArea()
- {
- var list = await _wmsAreaRep.DetachedEntities.Where(x => x.WorkShopType == LesWorkShopType.JIAOHEBANCHEJIAN).ToListAsync();
- return list.Select(e => new { Code = e.Id, AreaName = e.AreaName });
- }
+// /// <summary>
+// /// 缁勮杞﹂棿鑾峰彇搴撳尯
+// /// </summary>
+// /// <returns></returns>
+// [HttpGet("TaskWmsArea")]
+// public async Task<dynamic> TaskWmsArea()
+// {
+// var list = await _wmsAreaRep.DetachedEntities.Where(x => x.WorkShopType == LesWorkShopType.JIAOHEBANCHEJIAN).ToListAsync();
+// return list.Select(e => new { Code = e.Id, AreaName = e.AreaName });
+// }
- /// <summary>
- /// 鑾峰彇浠撳簱涓嬫媺妗�
- /// </summary>
- /// <returns></returns>
- [HttpGet("GetAreaEntranceList")]
- public async Task<List<AreaEntranceListOutput>> GetAreaEntranceList()
- {
- var data = await _wmsAreaRep.DetachedEntities.ProjectToType<WmsAreaOutput>().ToListAsync();
- List<AreaEntranceListOutput> areaEntranceListOutputLists = new List<AreaEntranceListOutput>();
- foreach (var item in data)
- {
- AreaEntranceListOutput areaEntranceListOutputList = new AreaEntranceListOutput();
- areaEntranceListOutputList.AreaId = item.Id;
- areaEntranceListOutputList.AreaName = item.AreaName;
- areaEntranceListOutputLists.Add(areaEntranceListOutputList);
- }
- return areaEntranceListOutputLists;
- }
+// /// <summary>
+// /// 鑾峰彇浠撳簱涓嬫媺妗�
+// /// </summary>
+// /// <returns></returns>
+// [HttpGet("GetAreaEntranceList")]
+// public async Task<List<AreaEntranceListOutput>> GetAreaEntranceList()
+// {
+// var data = await _wmsAreaRep.DetachedEntities.ProjectToType<WmsAreaOutput>().ToListAsync();
+// List<AreaEntranceListOutput> areaEntranceListOutputLists = new List<AreaEntranceListOutput>();
+// foreach (var item in data)
+// {
+// AreaEntranceListOutput areaEntranceListOutputList = new AreaEntranceListOutput();
+// areaEntranceListOutputList.AreaId = item.Id;
+// areaEntranceListOutputList.AreaName = item.AreaName;
+// areaEntranceListOutputLists.Add(areaEntranceListOutputList);
+// }
+// return areaEntranceListOutputLists;
+// }
- ///// <summary>
- ///// 鍑哄簱鍙ｄ笅鎷夋
- ///// </summary>
- ///// <param name="input"></param>
- ///// <returns></returns>
- //[HttpGet("GetEntranceOutList")]
- //public async Task<List<EntranceListOutput>> GetEntranceOutList([FromQuery] EntranceOutInput input)
- //{
- // var data = await _lesEntranceRep.DetachedEntities.Where(u => u.AreaId == input.Id && u.EntranceType == Core.LesEntranceType.CHUKU).ProjectToType<LesStationOutput>().ToListAsync();
- // List<EntranceListOutput> entranceLists = new List<EntranceListOutput>();
- // foreach (var item in data)
- // {
- // EntranceListOutput entranceList = new EntranceListOutput();
- // entranceList.EntranceId = item.Id;
- // entranceList.EntranceName = item.Name;
- // entranceLists.Add(entranceList);
- // }
- // return entranceLists;
- //}
+// ///// <summary>
+// ///// 鍑哄簱鍙ｄ笅鎷夋
+// ///// </summary>
+// ///// <param name="input"></param>
+// ///// <returns></returns>
+// //[HttpGet("GetEntranceOutList")]
+// //public async Task<List<EntranceListOutput>> GetEntranceOutList([FromQuery] EntranceOutInput input)
+// //{
+// // var data = await _lesEntranceRep.DetachedEntities.Where(u => u.AreaId == input.Id && u.EntranceType == Core.LesEntranceType.CHUKU).ProjectToType<LesStationOutput>().ToListAsync();
+// // List<EntranceListOutput> entranceLists = new List<EntranceListOutput>();
+// // foreach (var item in data)
+// // {
+// // EntranceListOutput entranceList = new EntranceListOutput();
+// // entranceList.EntranceId = item.Id;
+// // entranceList.EntranceName = item.Name;
+// // entranceLists.Add(entranceList);
+// // }
+// // return entranceLists;
+// //}
- /// <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("WmsArea", "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<WmsAreaOutput> wmsAreaList = DataConvertUtil.ToObjectList(headers, data, sheetName, keys, excelTemplate?.DataStartLine ?? 2, out Dictionary<string, WmsAreaOutput> dict);
- List<Dictionary<string, object>> uniqueKeyValueDictList = wmsAreaList.ParseUniqueKeyValueDictList(keys.ToList(), excelTemplate?.DataStartLine ?? 2, sheetName);
- var filters = DataConvertUtil.GetExpressionListByUniqueDict<WmsArea>(keys.ToList(), uniqueKeyValueDictList, size);
- var selectKeys = keys.ToList();
- if (!selectKeys.Contains("Id")) selectKeys.Add("Id");
- var selector = DataConvertUtil.GetSelectExpressionListByUniqueDict<WmsArea, WmsAreaOutput>(selectKeys);
- List<WmsArea> updates = new();
- List<WmsArea> 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("WmsArea", "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<WmsAreaOutput> wmsAreaList = DataConvertUtil.ToObjectList(headers, data, sheetName, keys, excelTemplate?.DataStartLine ?? 2, out Dictionary<string, WmsAreaOutput> dict);
+// List<Dictionary<string, object>> uniqueKeyValueDictList = wmsAreaList.ParseUniqueKeyValueDictList(keys.ToList(), excelTemplate?.DataStartLine ?? 2, sheetName);
+// var filters = DataConvertUtil.GetExpressionListByUniqueDict<WmsArea>(keys.ToList(), uniqueKeyValueDictList, size);
+// var selectKeys = keys.ToList();
+// if (!selectKeys.Contains("Id")) selectKeys.Add("Id");
+// var selector = DataConvertUtil.GetSelectExpressionListByUniqueDict<WmsArea, WmsAreaOutput>(selectKeys);
+// List<WmsArea> updates = new();
+// List<WmsArea> adds = new();
- lock (_lock)
- {
- foreach (var filter in filters)
- {
- var wmsAreaExistSubList = _wmsAreaRep.Where(filter).Select(selector).ToList();
- wmsAreaExistSubList.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 wmsAreaExistSubList = _wmsAreaRep.Where(filter).Select(selector).ToList();
+// wmsAreaExistSubList.ForEach(x =>
+// {
+// var k = DataConvertUtil.GetKey(x, keys);
+// if (dict.ContainsKey(k)) dict[k].Id = x.Id;
+// });
+// }
- foreach (var wmsArea in wmsAreaList)
- {
- if (wmsArea.Id > 0)
- {
- if (importExcelType == ImportExcelType.ADD_AND_UPDATE) updates.Add(wmsArea.Adapt<WmsArea>());
- }
- else
- {
- adds.Add(wmsArea.Adapt<WmsArea>());
- }
- }
+// foreach (var wmsArea in wmsAreaList)
+// {
+// if (wmsArea.Id > 0)
+// {
+// if (importExcelType == ImportExcelType.ADD_AND_UPDATE) updates.Add(wmsArea.Adapt<WmsArea>());
+// }
+// else
+// {
+// adds.Add(wmsArea.Adapt<WmsArea>());
+// }
+// }
- if (importExcelType == ImportExcelType.ADD_AND_UPDATE) updates.ForEach(x => _wmsAreaRep.Update(x));
+// if (importExcelType == ImportExcelType.ADD_AND_UPDATE) updates.ForEach(x => _wmsAreaRep.Update(x));
- var maxId = _wmsAreaRep.DetachedEntities.OrderByDescending(x => x.Id).Select(x => x.Id).FirstOrDefault();
- adds.ForEach(x => x.Id = ++maxId);
- Db.GetDbContext().Set<WmsArea>().AddRange(adds);
- Db.GetDbContext().SaveChanges();
- }
+// var maxId = _wmsAreaRep.DetachedEntities.OrderByDescending(x => x.Id).Select(x => x.Id).FirstOrDefault();
+// adds.ForEach(x => x.Id = ++maxId);
+// Db.GetDbContext().Set<WmsArea>().AddRange(adds);
+// Db.GetDbContext().SaveChanges();
+// }
- await Task.CompletedTask;
- return adds.Count;
- }
+// await Task.CompletedTask;
+// return adds.Count;
+// }
- /// <summary>
- /// 鏍规嵁鐗堟湰涓嬭浇搴撳尯淇℃伅鐨凟xcel瀵煎叆妯℃澘
- /// </summary>
- /// <param name="version">妯℃澘鐗堟湰</param>
- /// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
- [HttpGet("downloadExcelTemplate")]
- public async Task<IActionResult> DownloadExcelTemplate([FromQuery] string version)
- {
- var excelTemplate = await _sysExcelTemplateService.GetByAppNameAndClassNameAndVersionAsync("WmsArea", 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="version">妯℃澘鐗堟湰</param>
+// /// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
+// [HttpGet("downloadExcelTemplate")]
+// public async Task<IActionResult> DownloadExcelTemplate([FromQuery] string version)
+// {
+// var excelTemplate = await _sysExcelTemplateService.GetByAppNameAndClassNameAndVersionAsync("WmsArea", 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="input">搴撳尯淇℃伅鏌ヨ鍙傛暟</param>
- /// <returns>瀵煎嚭鐨凟xcel鏂囦欢</returns>
- [HttpGet("toExcel")]
- public async Task<IActionResult> ToExcelAsync([FromQuery] WmsAreaSearchNonPage input)
- {
- var wmsAreaList = await ListNonPageAsync(input);
- MemoryStream ms = new();
- DataConvertUtil.ToExcelData(wmsAreaList, _sysDictTypeRep, _sysDictDataRep, out List<string> headers,
- out List<List<object>> data, out string sheetName);
- var excelTemplate = await _sysExcelTemplateService.GetByAppNameAndClassNameAndVersionAsync("WmsArea", "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="input">搴撳尯淇℃伅鏌ヨ鍙傛暟</param>
+// /// <returns>瀵煎嚭鐨凟xcel鏂囦欢</returns>
+// [HttpGet("toExcel")]
+// public async Task<IActionResult> ToExcelAsync([FromQuery] WmsAreaSearchNonPage input)
+// {
+// var wmsAreaList = await ListNonPageAsync(input);
+// MemoryStream ms = new();
+// DataConvertUtil.ToExcelData(wmsAreaList, _sysDictTypeRep, _sysDictDataRep, out List<string> headers,
+// out List<List<object>> data, out string sheetName);
+// var excelTemplate = await _sysExcelTemplateService.GetByAppNameAndClassNameAndVersionAsync("WmsArea", "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/Common/WmsPlace/WmsPlaceService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsPlace/WmsPlaceService.cs
index 872fe09..0580390 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsPlace/WmsPlaceService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/WmsPlace/WmsPlaceService.cs
@@ -1,282 +1,282 @@
-锘縰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 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;
-namespace Admin.NET.Application
-{
- /// <summary>
- /// 搴撲綅淇℃伅鏈嶅姟
- /// </summary>
- [ApiDescriptionSettings("鑷繁鐨勪笟鍔�", Name = "WmsPlace", Order = 100)]
- [Route("api/[Controller]")]
- public class WmsPlaceService : IDynamicApiController, ITransient
- {
- private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
- private readonly IRepository<WmsArea> _wmsAreaRep;
+//namespace Admin.NET.Application
+//{
+// /// <summary>
+// /// 搴撲綅淇℃伅鏈嶅姟
+// /// </summary>
+// [ApiDescriptionSettings("鑷繁鐨勪笟鍔�", Name = "WmsPlace", Order = 100)]
+// [Route("api/[Controller]")]
+// public class WmsPlaceService : IDynamicApiController, ITransient
+// {
+// private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
+// private readonly IRepository<WmsArea> _wmsAreaRep;
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- public WmsPlaceService(
- IRepository<WmsArea> wmsAreaRep,
- IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep
- )
- {
- _wmsAreaRep = wmsAreaRep;
- _wmsPlaceRep = wmsPlaceRep;
- }
+// /// <summary>
+// /// 鏋勯�犲嚱鏁�
+// /// </summary>
+// public WmsPlaceService(
+// IRepository<WmsArea> wmsAreaRep,
+// IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep
+// )
+// {
+// _wmsAreaRep = wmsAreaRep;
+// _wmsPlaceRep = wmsPlaceRep;
+// }
- /// <summary>
- /// 鍒嗛〉鏌ヨ搴撲綅淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("page")]
- public async Task<PageResult<WmsPlaceOutput>> Page([FromQuery] WmsPlaceSearch input)
- {
- var wmsPlaces = await _wmsPlaceRep.DetachedEntities
- .Where(!string.IsNullOrEmpty(input.Placecode), u => EF.Functions.Like(u.PlaceCode, $"%{input.Placecode.Trim()}%"))
- .Where(input.Placestatus != null, u => u.PlaceStatus == input.Placestatus)
- .Where(input.Areaid > 0, u => u.AreaId == input.Areaid)
- .Where(input.Rowno != null, u => u.RowNo == input.Rowno)
- .Where(input.Columnno != null, u => u.ColumnNo == input.Columnno)
- .Where(input.Layerno != null, u => u.LayerNo == input.Layerno)
- .Where(input.Aisle != null, u => u.Aisle == input.Aisle)
- .Where(input.Islock != null, u => u.Islock == input.Islock)
- .OrderBy(PageInputOrder.OrderBuilder<WmsPlaceSearch>(input))
- .ProjectToType<WmsPlaceOutput>()
- .ToADPagedListAsync(input.PageNo, input.PageSize);
- return wmsPlaces;
- }
+// /// <summary>
+// /// 鍒嗛〉鏌ヨ搴撲綅淇℃伅
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("page")]
+// public async Task<PageResult<WmsPlaceOutput>> Page([FromQuery] WmsPlaceSearch input)
+// {
+// var wmsPlaces = await _wmsPlaceRep.DetachedEntities
+// .Where(!string.IsNullOrEmpty(input.Placecode), u => EF.Functions.Like(u.PlaceCode, $"%{input.Placecode.Trim()}%"))
+// .Where(input.Placestatus != null, u => u.PlaceStatus == input.Placestatus)
+// .Where(input.Areaid > 0, u => u.AreaId == input.Areaid)
+// .Where(input.Rowno != null, u => u.RowNo == input.Rowno)
+// .Where(input.Columnno != null, u => u.ColumnNo == input.Columnno)
+// .Where(input.Layerno != null, u => u.LayerNo == input.Layerno)
+// .Where(input.Aisle != null, u => u.Aisle == input.Aisle)
+// .Where(input.Islock != null, u => u.Islock == input.Islock)
+// .OrderBy(PageInputOrder.OrderBuilder<WmsPlaceSearch>(input))
+// .ProjectToType<WmsPlaceOutput>()
+// .ToADPagedListAsync(input.PageNo, input.PageSize);
+// return wmsPlaces;
+// }
- /// <summary>
- /// 澧炲姞搴撲綅淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- //[HttpPost("add")]
- //public async Task Add(AddWmsPlaceInput input)
- //{
- // //鑾峰彇搴撳尯淇℃伅
- // var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.Id == input.Areaid);
- // if (wmsArea.AreaType == AreaType.LITIKU)
- // {
- // var wmsPlace = input.Adapt<WmsPlace>();
- // for (int a = 1; a == 1; a++)
- // {
- // for (int t = 1; t <= wmsPlace.RowNo; t++) //寰幆鎺�
- // {
- // for (int i = 1; i <= wmsPlace.ColumnNo; i++) //寰幆鍒�
- // {
- // for (int j = 1; j <= wmsPlace.LayerNo; j++) //寰幆灞�
- // {
- // var model = new WmsPlace();
- // model.PlaceStatus = PlaceStatus.KONGXIAN;
- // model.AreaId = wmsPlace.AreaId;
- // model.RowNo = t;
- // model.ColumnNo = i;
- // model.LayerNo = j;
- // model.DeepcellNo = 1;
- // model.Aisle = a;
- // model.Islock = YesOrNot.N;
- // model.Length = new decimal(1.2);
- // model.Width = new decimal(1.5);
- // model.Height = new decimal(1.8);
- // model.MaxWeight = new decimal(2.8);
- // model.HeightLevel = Heightlevel.DI;
- // model.Priority = 0;
- // model.AgvCode = "";
- // model.PlaceCode = String.Format("{0}{1}{2}{3}{4}", wmsArea.AreaDesc, a.ToString("00"), t.ToString("00"), i.ToString("00"), j.ToString("00"));
- // var isExit = await _wmsPlaceRep.AnyAsync(n => n.PlaceCode == model.PlaceCode);
- // if (!isExit) await _wmsPlaceRep.InsertAsync(model);
- // }
- // }
- // }
- // }
- // }
- // else
- // {
- // var wmsPlace = input.Adapt<WmsPlace>();
- // for (int t = 1; t <= wmsPlace.RowNo; t++) //寰幆鎺�
- // {
- // for (int i = 1; i <= wmsPlace.ColumnNo; i++) //寰幆鍒�
- // {
- // for (int j = 1; j <= wmsPlace.LayerNo; j++) //寰幆灞�
- // {
- // var model = new WmsPlace();
- // model.PlaceStatus = PlaceStatus.KONGXIAN;
- // model.AreaId = wmsPlace.AreaId;
- // model.RowNo = t;
- // model.ColumnNo = i;
- // model.LayerNo = j;
- // model.DeepcellNo = 1;
- // model.Aisle = wmsPlace.Aisle;
- // model.Islock = YesOrNot.N;
- // model.Length = new decimal(1.2);
- // model.Width = new decimal(1.5);
- // model.Height = new decimal(1.8);
- // model.MaxWeight = new decimal(2.8);
- // model.HeightLevel = Heightlevel.DI;
- // model.Priority = 0;
- // model.AgvCode = "";
- // model.PlaceCode = String.Format("{0}{1}{2}{3}", wmsArea.AreaDesc, t.ToString("00"), i.ToString("00"), j.ToString("00"));
- // var isExit = await _wmsPlaceRep.AnyAsync(n => n.PlaceCode == model.PlaceCode);
- // if (!isExit) await _wmsPlaceRep.InsertAsync(model);
- // }
- // }
- // }
- // }
+// /// <summary>
+// /// 澧炲姞搴撲綅淇℃伅
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// //[HttpPost("add")]
+// //public async Task Add(AddWmsPlaceInput input)
+// //{
+// // //鑾峰彇搴撳尯淇℃伅
+// // var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.Id == input.Areaid);
+// // if (wmsArea.AreaType == AreaType.LITIKU)
+// // {
+// // var wmsPlace = input.Adapt<WmsPlace>();
+// // for (int a = 1; a == 1; a++)
+// // {
+// // for (int t = 1; t <= wmsPlace.RowNo; t++) //寰幆鎺�
+// // {
+// // for (int i = 1; i <= wmsPlace.ColumnNo; i++) //寰幆鍒�
+// // {
+// // for (int j = 1; j <= wmsPlace.LayerNo; j++) //寰幆灞�
+// // {
+// // var model = new WmsPlace();
+// // model.PlaceStatus = PlaceStatus.KONGXIAN;
+// // model.AreaId = wmsPlace.AreaId;
+// // model.RowNo = t;
+// // model.ColumnNo = i;
+// // model.LayerNo = j;
+// // model.DeepcellNo = 1;
+// // model.Aisle = a;
+// // model.Islock = YesOrNot.N;
+// // model.Length = new decimal(1.2);
+// // model.Width = new decimal(1.5);
+// // model.Height = new decimal(1.8);
+// // model.MaxWeight = new decimal(2.8);
+// // model.HeightLevel = Heightlevel.DI;
+// // model.Priority = 0;
+// // model.AgvCode = "";
+// // model.PlaceCode = String.Format("{0}{1}{2}{3}{4}", wmsArea.AreaDesc, a.ToString("00"), t.ToString("00"), i.ToString("00"), j.ToString("00"));
+// // var isExit = await _wmsPlaceRep.AnyAsync(n => n.PlaceCode == model.PlaceCode);
+// // if (!isExit) await _wmsPlaceRep.InsertAsync(model);
+// // }
+// // }
+// // }
+// // }
+// // }
+// // else
+// // {
+// // var wmsPlace = input.Adapt<WmsPlace>();
+// // for (int t = 1; t <= wmsPlace.RowNo; t++) //寰幆鎺�
+// // {
+// // for (int i = 1; i <= wmsPlace.ColumnNo; i++) //寰幆鍒�
+// // {
+// // for (int j = 1; j <= wmsPlace.LayerNo; j++) //寰幆灞�
+// // {
+// // var model = new WmsPlace();
+// // model.PlaceStatus = PlaceStatus.KONGXIAN;
+// // model.AreaId = wmsPlace.AreaId;
+// // model.RowNo = t;
+// // model.ColumnNo = i;
+// // model.LayerNo = j;
+// // model.DeepcellNo = 1;
+// // model.Aisle = wmsPlace.Aisle;
+// // model.Islock = YesOrNot.N;
+// // model.Length = new decimal(1.2);
+// // model.Width = new decimal(1.5);
+// // model.Height = new decimal(1.8);
+// // model.MaxWeight = new decimal(2.8);
+// // model.HeightLevel = Heightlevel.DI;
+// // model.Priority = 0;
+// // model.AgvCode = "";
+// // model.PlaceCode = String.Format("{0}{1}{2}{3}", wmsArea.AreaDesc, t.ToString("00"), i.ToString("00"), j.ToString("00"));
+// // var isExit = await _wmsPlaceRep.AnyAsync(n => n.PlaceCode == model.PlaceCode);
+// // if (!isExit) await _wmsPlaceRep.InsertAsync(model);
+// // }
+// // }
+// // }
+// // }
- //}
+// //}
- /// <summary>
- /// 澧炲姞搴撲綅淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("add")]
- public async Task AddNew(AddWmsPlaceInput input)
- {
- var isExit = await _wmsPlaceRep.AnyAsync(n => n.PlaceCode == input.Placecode);
- if (isExit) throw Oops.Oh("瀛樺湪鐨勭浉鍚岀殑搴撲綅缂栫爜锛�");
- var wmsPlace = input.Adapt<WmsPlace>();
- wmsPlace.AgvCode = "Y/N";
- wmsPlace.PlaceStatus = PlaceStatus.KONGXIAN;
- wmsPlace.Islock = YesOrNot.N;
- wmsPlace.EmptyContainer = YesOrNot.N;
- if (input.Heightlevel==0) {
- wmsPlace.HeightLevel = Heightlevel.DI;
- }
- await _wmsPlaceRep.InsertAsync(wmsPlace);
- }
+// /// <summary>
+// /// 澧炲姞搴撲綅淇℃伅
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("add")]
+// public async Task AddNew(AddWmsPlaceInput input)
+// {
+// var isExit = await _wmsPlaceRep.AnyAsync(n => n.PlaceCode == input.Placecode);
+// if (isExit) throw Oops.Oh("瀛樺湪鐨勭浉鍚岀殑搴撲綅缂栫爜锛�");
+// var wmsPlace = input.Adapt<WmsPlace>();
+// wmsPlace.AgvCode = "Y/N";
+// wmsPlace.PlaceStatus = PlaceStatus.KONGXIAN;
+// wmsPlace.Islock = YesOrNot.N;
+// wmsPlace.EmptyContainer = YesOrNot.N;
+// if (input.Heightlevel==0) {
+// wmsPlace.HeightLevel = Heightlevel.DI;
+// }
+// await _wmsPlaceRep.InsertAsync(wmsPlace);
+// }
- /// <summary>
- /// 鍒犻櫎搴撲綅淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("delete")]
- public async Task Delete(DeleteWmsPlaceInput input)
- {
- var wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.Id == input.Id);
- await _wmsPlaceRep.DeleteAsync(wmsPlace);
- }
+// /// <summary>
+// /// 鍒犻櫎搴撲綅淇℃伅
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("delete")]
+// public async Task Delete(DeleteWmsPlaceInput input)
+// {
+// var wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.Id == input.Id);
+// await _wmsPlaceRep.DeleteAsync(wmsPlace);
+// }
- /// <summary>
- /// 鎵归噺閿佸畾
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("MoreLock")]
- public async Task MoreLock(MoreLockInput input)
- {
- if (input.Id.Count <= 0) throw Oops.Oh("id涓嶈兘涓虹┖锛�");
- foreach (var item in input.Id)
- {
- var wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.Id == item);
- if (wmsPlace == null) throw Oops.Oh("搴撲綅淇℃伅涓嶅瓨鍦�!");
- wmsPlace.Islock = YesOrNot.Y;
- await _wmsPlaceRep.UpdateAsync(wmsPlace, ignoreNullValues: true);
- }
- }
+// /// <summary>
+// /// 鎵归噺閿佸畾
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("MoreLock")]
+// public async Task MoreLock(MoreLockInput input)
+// {
+// if (input.Id.Count <= 0) throw Oops.Oh("id涓嶈兘涓虹┖锛�");
+// foreach (var item in input.Id)
+// {
+// var wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.Id == item);
+// if (wmsPlace == null) throw Oops.Oh("搴撲綅淇℃伅涓嶅瓨鍦�!");
+// wmsPlace.Islock = YesOrNot.Y;
+// await _wmsPlaceRep.UpdateAsync(wmsPlace, ignoreNullValues: true);
+// }
+// }
- /// <summary>
- /// 鎵归噺瑙ｉ攣
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("MoreUnlock")]
- public async Task MoreUnlock(MoreLockInput input)
- {
- if (input.Id.Count <= 0) throw Oops.Oh("id涓嶈兘涓虹┖锛�");
- foreach (var item in input.Id)
- {
- var wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.Id == item);
- if (wmsPlace == null) throw Oops.Oh("搴撲綅淇℃伅涓嶅瓨鍦�!");
- wmsPlace.Islock = YesOrNot.N;
- await _wmsPlaceRep.UpdateAsync(wmsPlace, ignoreNullValues: true);
- }
- }
+// /// <summary>
+// /// 鎵归噺瑙ｉ攣
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("MoreUnlock")]
+// public async Task MoreUnlock(MoreLockInput input)
+// {
+// if (input.Id.Count <= 0) throw Oops.Oh("id涓嶈兘涓虹┖锛�");
+// foreach (var item in input.Id)
+// {
+// var wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.Id == item);
+// if (wmsPlace == null) throw Oops.Oh("搴撲綅淇℃伅涓嶅瓨鍦�!");
+// wmsPlace.Islock = YesOrNot.N;
+// await _wmsPlaceRep.UpdateAsync(wmsPlace, ignoreNullValues: true);
+// }
+// }
- /// <summary>
- /// 鏇存柊搴撲綅淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("edit")]
- public async Task Update(UpdateWmsPlaceInput input)
- {
- var isExist = await _wmsPlaceRep.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(UpdateWmsPlaceInput input)
+// {
+// var isExist = await _wmsPlaceRep.AnyAsync(u => u.Id == input.Id, false);
+// if (!isExist) throw Oops.Oh(ErrorCode.D3000);
- var wmsPlace = input.Adapt<WmsPlace>();
- await _wmsPlaceRep.UpdateAsync(wmsPlace, ignoreNullValues: true);
- }
+// var wmsPlace = input.Adapt<WmsPlace>();
+// await _wmsPlaceRep.UpdateAsync(wmsPlace, ignoreNullValues: true);
+// }
- /// <summary>
- /// 鑾峰彇搴撲綅淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("detail")]
- public async Task<WmsPlaceOutput> Get([FromQuery] QueryeWmsPlaceInput input)
- {
- return (await _wmsPlaceRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<WmsPlaceOutput>();
- }
+// /// <summary>
+// /// 鑾峰彇搴撲綅淇℃伅
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("detail")]
+// public async Task<WmsPlaceOutput> Get([FromQuery] QueryeWmsPlaceInput input)
+// {
+// return (await _wmsPlaceRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<WmsPlaceOutput>();
+// }
- /// <summary>
- /// 鑾峰彇搴撲綅淇℃伅鍒楄〃
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("list")]
- public async Task<List<WmsPlaceOutput>> List([FromQuery] WmsPlaceInput input)
- {
- return await _wmsPlaceRep.DetachedEntities.ProjectToType<WmsPlaceOutput>().ToListAsync();
- }
+// /// <summary>
+// /// 鑾峰彇搴撲綅淇℃伅鍒楄〃
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("list")]
+// public async Task<List<WmsPlaceOutput>> List([FromQuery] WmsPlaceInput input)
+// {
+// return await _wmsPlaceRep.DetachedEntities.ProjectToType<WmsPlaceOutput>().ToListAsync();
+// }
- /// <summary>
- /// 鑾峰彇WmsArea鍒楄〃
- /// </summary>
- /// <returns></returns>
- [HttpGet("fkWmsArea")]
- public async Task<dynamic> FkWmsAreaList()
- {
- var list = await _wmsAreaRep.DetachedEntities.ToListAsync();
- return list.Select(e => new { Code = e.Id, Name = e.AreaName });
- }
+// /// <summary>
+// /// 鑾峰彇WmsArea鍒楄〃
+// /// </summary>
+// /// <returns></returns>
+// [HttpGet("fkWmsArea")]
+// public async Task<dynamic> FkWmsAreaList()
+// {
+// var list = await _wmsAreaRep.DetachedEntities.ToListAsync();
+// return list.Select(e => new { Code = e.Id, Name = e.AreaName });
+// }
- /// <summary>
- /// 鑾峰彇鐔熷寲搴撳贩閬�
- /// </summary>
- /// <returns></returns>
- [HttpGet("GetFAisle")]
- public async Task<object> GetFAisle()
- {
- var area = await _wmsAreaRep.FirstOrDefaultAsync(n => n.AreaStatus == CommonStatus.ENABLE && n.WorkShopType == LesWorkShopType.FAPAOCHEJIAN && n.AreaType == AreaType.LITIKU);
- var objList = await _wmsPlaceRep.Where(n => n.AreaId == area.Id).OrderBy(n => n.Aisle).Select(n => n.Aisle).Distinct().ToArrayAsync();
- for (int i = 0; i < objList.Length - 1; i++)
- {
- for (int j = 0; j < objList.Length - 1; j++)
- {
- int k = j + 1;
- if (objList[j] > objList[k])
- {
- var temp = objList[k];
- objList[k] = objList[j];
- objList[j] = temp;
- }
- }
- }
- return objList;
- }
- }
+// /// <summary>
+// /// 鑾峰彇鐔熷寲搴撳贩閬�
+// /// </summary>
+// /// <returns></returns>
+// [HttpGet("GetFAisle")]
+// public async Task<object> GetFAisle()
+// {
+// var area = await _wmsAreaRep.FirstOrDefaultAsync(n => n.AreaStatus == CommonStatus.ENABLE && n.WorkShopType == LesWorkShopType.FAPAOCHEJIAN && n.AreaType == AreaType.LITIKU);
+// var objList = await _wmsPlaceRep.Where(n => n.AreaId == area.Id).OrderBy(n => n.Aisle).Select(n => n.Aisle).Distinct().ToArrayAsync();
+// for (int i = 0; i < objList.Length - 1; i++)
+// {
+// for (int j = 0; j < objList.Length - 1; j++)
+// {
+// int k = j + 1;
+// if (objList[j] > objList[k])
+// {
+// var temp = objList[k];
+// objList[k] = objList[j];
+// objList[j] = temp;
+// }
+// }
+// }
+// return objList;
+// }
+// }
-}
+//}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WcsToWms/WareWcsToWmsService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WcsToWms/WareWcsToWmsService.cs
index 350bde1..1acc2a9 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WcsToWms/WareWcsToWmsService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WcsToWms/WareWcsToWmsService.cs
@@ -1,1059 +1,1059 @@
-锘縰sing Furion;
-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 Admin.NET.Core;
-using Yitter.IdGenerator;
-using StackExchange.Redis;
+锘�//using Furion;
+//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 Admin.NET.Core;
+//using Yitter.IdGenerator;
+//using StackExchange.Redis;
-namespace Admin.NET.Application
-{
- /// <summary>
- /// WCS璋冪敤鏈嶅姟
- /// </summary>
- [ApiDescriptionSettings("WCS璋冪敤鏈嶅姟", Name = "WareWcsToWmsService", Order = 100)]
- [Route("api/[Controller]")]
- public class WareWcsToWmsService : IDynamicApiController, ITransient
- {
- private readonly IRepository<WmsOrder, MasterDbContextLocator> _wmsOrderRep;
- private readonly IRepository<WmsOrderDetails, MasterDbContextLocator> _wmsOrderDetailsRep;
- private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
- private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
- private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
- private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
- private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
- private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
- private readonly IRepository<LesPackWarehouse, MasterDbContextLocator> _lesPackWarehouseRep;
- private readonly IRepository<LesDeviceWaring, MasterDbContextLocator> _lesDeviceWaringRep;
+//namespace Admin.NET.Application
+//{
+// /// <summary>
+// /// WCS璋冪敤鏈嶅姟
+// /// </summary>
+// [ApiDescriptionSettings("WCS璋冪敤鏈嶅姟", Name = "WareWcsToWmsService", Order = 100)]
+// [Route("api/[Controller]")]
+// public class WareWcsToWmsService : IDynamicApiController, ITransient
+// {
+// private readonly IRepository<WmsOrder, MasterDbContextLocator> _wmsOrderRep;
+// private readonly IRepository<WmsOrderDetails, MasterDbContextLocator> _wmsOrderDetailsRep;
+// private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
+// private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
+// private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
+// private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
+// private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
+// private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
+// private readonly IRepository<LesPackWarehouse, MasterDbContextLocator> _lesPackWarehouseRep;
+// private readonly IRepository<LesDeviceWaring, MasterDbContextLocator> _lesDeviceWaringRep;
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- public WareWcsToWmsService(
- IRepository<WmsOrder, MasterDbContextLocator> wmsOrderRep,
- IRepository<WmsOrderDetails, MasterDbContextLocator> wmsOrderDetailsRep,
- IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
- IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep,
- IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
- IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
- IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
- IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
- IRepository<LesPackWarehouse, MasterDbContextLocator> lesPackWarehouseRep,
- IRepository<LesDeviceWaring, MasterDbContextLocator> lesDeviceWaringRep
- )
- {
- _wmsOrderRep = wmsOrderRep;
- _wmsOrderDetailsRep = wmsOrderDetailsRep;
- _wmsTaskRep = wmsTaskRep;
- _wmsMaterialContainerRep = wmsMaterialContainerRep;
- _wmsPlaceRep = wmsPlaceRep;
- _wmsContainerPlaceRep = wmsContainerPlaceRep;
- _wmsMaterialStockRep = wmsMaterialStockRep;
- _wmsContainerRep = wmsContainerRep;
- _lesPackWarehouseRep = lesPackWarehouseRep;
- _lesDeviceWaringRep = lesDeviceWaringRep;
- }
+// /// <summary>
+// /// 鏋勯�犲嚱鏁�
+// /// </summary>
+// public WareWcsToWmsService(
+// IRepository<WmsOrder, MasterDbContextLocator> wmsOrderRep,
+// IRepository<WmsOrderDetails, MasterDbContextLocator> wmsOrderDetailsRep,
+// IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
+// IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep,
+// IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
+// IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
+// IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
+// IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
+// IRepository<LesPackWarehouse, MasterDbContextLocator> lesPackWarehouseRep,
+// IRepository<LesDeviceWaring, MasterDbContextLocator> lesDeviceWaringRep
+// )
+// {
+// _wmsOrderRep = wmsOrderRep;
+// _wmsOrderDetailsRep = wmsOrderDetailsRep;
+// _wmsTaskRep = wmsTaskRep;
+// _wmsMaterialContainerRep = wmsMaterialContainerRep;
+// _wmsPlaceRep = wmsPlaceRep;
+// _wmsContainerPlaceRep = wmsContainerPlaceRep;
+// _wmsMaterialStockRep = wmsMaterialStockRep;
+// _wmsContainerRep = wmsContainerRep;
+// _lesPackWarehouseRep = lesPackWarehouseRep;
+// _lesDeviceWaringRep = lesDeviceWaringRep;
+// }
- /// <summary>
- /// 瀹氭椂鏌ヨWCS鍙互涓嬪彂鐨勫嚭鍏ュ簱浠诲姟(10鏉�)
- /// </summary>
- /// <returns></returns>
- [HttpGet("GetSendTask")]
- [AllowAnonymous]
- public async Task<List<SendTaskDetailOutput>> GetSendTask()
- {
- var outputList = new List<SendTaskDetailOutput>();
- var alllist = await _wmsTaskRep.DetachedEntities
- .Where(z => z.IsRead == true)
- .Take(10)
- .OrderByDescending(n => n.TaskLevel)
- .OrderBy(p => p.CreatedTime).ToListAsync();
- foreach (var item in alllist)
- {
- var sendTaskDetail = new SendTaskDetailOutput(); //浠诲姟璇︽儏
- sendTaskDetail.TaskNo = item.TaskNo;
- if (item.TaskType == TaskType.RUKU) sendTaskDetail.SourcePlace = item.ToPlace;
- else sendTaskDetail.SourcePlace = item.SourcePlace;
- sendTaskDetail.Aisle = item.Aisle;
- sendTaskDetail.TaskType = item.TaskType;
- sendTaskDetail.TaskLevel = item.TaskLevel;
- sendTaskDetail.ContainerCode = item.ContainerCode;
- sendTaskDetail.TaskStatus = item.TaskStatus;
- outputList.Add(sendTaskDetail);
+// /// <summary>
+// /// 瀹氭椂鏌ヨWCS鍙互涓嬪彂鐨勫嚭鍏ュ簱浠诲姟(10鏉�)
+// /// </summary>
+// /// <returns></returns>
+// [HttpGet("GetSendTask")]
+// [AllowAnonymous]
+// public async Task<List<SendTaskDetailOutput>> GetSendTask()
+// {
+// var outputList = new List<SendTaskDetailOutput>();
+// var alllist = await _wmsTaskRep.DetachedEntities
+// .Where(z => z.IsRead == true)
+// .Take(10)
+// .OrderByDescending(n => n.TaskLevel)
+// .OrderBy(p => p.CreatedTime).ToListAsync();
+// foreach (var item in alllist)
+// {
+// var sendTaskDetail = new SendTaskDetailOutput(); //浠诲姟璇︽儏
+// sendTaskDetail.TaskNo = item.TaskNo;
+// if (item.TaskType == TaskType.RUKU) sendTaskDetail.SourcePlace = item.ToPlace;
+// else sendTaskDetail.SourcePlace = item.SourcePlace;
+// sendTaskDetail.Aisle = item.Aisle;
+// sendTaskDetail.TaskType = item.TaskType;
+// sendTaskDetail.TaskLevel = item.TaskLevel;
+// sendTaskDetail.ContainerCode = item.ContainerCode;
+// sendTaskDetail.TaskStatus = item.TaskStatus;
+// outputList.Add(sendTaskDetail);
- //item.IsRead=false;
- //item.TaskStatus = TaskStatusEnum.DAIZHIXING;
- //await _wmsTaskRep.UpdateAsync(item);
- }
- return outputList;
- }
+// //item.IsRead=false;
+// //item.TaskStatus = TaskStatusEnum.DAIZHIXING;
+// //await _wmsTaskRep.UpdateAsync(item);
+// }
+// return outputList;
+// }
- /// <summary>
- /// 鏇存柊浠诲姟淇℃伅
- /// </summary>
- /// <returns></returns>
- [HttpPost("UpdateTask")]
- [UnitOfWork]
- [AllowAnonymous]
- public async Task UpdateTask([FromBody] UpdateTaskInput input)
- {
- //鏍规嵁浠诲姟鍙锋煡璇换鍔′俊鎭�
- var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(z => z.TaskNo == input.TaskNo);
- if (wmsTask == null) throw Oops.Oh(errorMessage: "浠诲姟涓嶅瓨鍦紒");
- wmsTask.TaskDodeviceStatus = input.TaskDodeviceStatus;
- wmsTask.TaskStatus = TaskStatusEnum.ZHIXINGZHONG;
- wmsTask.IsRead = false;
+// /// <summary>
+// /// 鏇存柊浠诲姟淇℃伅
+// /// </summary>
+// /// <returns></returns>
+// [HttpPost("UpdateTask")]
+// [UnitOfWork]
+// [AllowAnonymous]
+// public async Task UpdateTask([FromBody] UpdateTaskInput input)
+// {
+// //鏍规嵁浠诲姟鍙锋煡璇换鍔′俊鎭�
+// var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(z => z.TaskNo == input.TaskNo);
+// if (wmsTask == null) throw Oops.Oh(errorMessage: "浠诲姟涓嶅瓨鍦紒");
+// wmsTask.TaskDodeviceStatus = input.TaskDodeviceStatus;
+// wmsTask.TaskStatus = TaskStatusEnum.ZHIXINGZHONG;
+// wmsTask.IsRead = false;
- WmsPlace wmsPlace = new WmsPlace();
- //鍒ゆ柇鍏ュ簱杩樻槸鍑哄簱
- if (wmsTask.TaskType == TaskType.RUKU)
- {
- //搴撲綅淇℃伅
- wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(z => z.PlaceCode == wmsTask.ToPlace);
- }
- else if (wmsTask.TaskType == TaskType.CHUKU)
- {
- //搴撲綅淇℃伅
- wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(z => z.PlaceCode == wmsTask.SourcePlace);
- }
- if (wmsPlace == null) throw Oops.Oh(errorMessage: "搴撲綅涓嶅瓨鍦紒");
+// WmsPlace wmsPlace = new WmsPlace();
+// //鍒ゆ柇鍏ュ簱杩樻槸鍑哄簱
+// if (wmsTask.TaskType == TaskType.RUKU)
+// {
+// //搴撲綅淇℃伅
+// wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(z => z.PlaceCode == wmsTask.ToPlace);
+// }
+// else if (wmsTask.TaskType == TaskType.CHUKU)
+// {
+// //搴撲綅淇℃伅
+// wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(z => z.PlaceCode == wmsTask.SourcePlace);
+// }
+// if (wmsPlace == null) throw Oops.Oh(errorMessage: "搴撲綅涓嶅瓨鍦紒");
- // 鏌ヨ鎵樼洏淇℃伅
- var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode);
- if (wmsContainer == null) throw Oops.Oh("鎵樼洏涓嶅瓨鍦紒");
+// // 鏌ヨ鎵樼洏淇℃伅
+// var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode);
+// if (wmsContainer == null) throw Oops.Oh("鎵樼洏涓嶅瓨鍦紒");
- //鍏ュ簱绉伴噸
- //if (wmsTask.TaskType == TaskType.RUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.ZX_RKCZ)
- //{
- //}
- //鍏ュ簱杈撻�佺嚎寮�濮�
- //if (wmsTask.TaskType == TaskType.RUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.ZX_RSSX)
- //{
- //}
- //鍏ュ簱杈撻�佺嚎缁撴潫
- //if (wmsTask.TaskType == TaskType.RUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.WC_RSSX)
- //{
- //}
- //鍏ュ簱RGV寮�濮�
- //if (wmsTask.TaskType == TaskType.RUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.ZX_RGV)
- //{
- //}
- //鍏ュ簱RGV缁撴潫
- //if (wmsTask.TaskType == TaskType.RUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.WC_RGV)
- //{
- //}
- //鍏ュ簱寮�濮�
- if (wmsTask.TaskType == TaskType.RUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.ZX_DDJ)
- {
- // 鏇存柊搴撲綅鐘舵��
- wmsPlace.PlaceStatus = PlaceStatus.DAIRU;
- await _wmsPlaceRep.UpdateAsync(wmsPlace);
- }
- //鍏ュ簱瀹屾垚
- if (wmsTask.TaskType == TaskType.RUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.WC_DDJ)
- {
- //棣栧厛鏇存柊浠诲姟鐘舵�佸畬鎴�
- wmsTask.TaskStatus = TaskStatusEnum.WANCHENG;
- //鏇存柊璁惧鐘舵��
- wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.W;
+// //鍏ュ簱绉伴噸
+// //if (wmsTask.TaskType == TaskType.RUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.ZX_RKCZ)
+// //{
+// //}
+// //鍏ュ簱杈撻�佺嚎寮�濮�
+// //if (wmsTask.TaskType == TaskType.RUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.ZX_RSSX)
+// //{
+// //}
+// //鍏ュ簱杈撻�佺嚎缁撴潫
+// //if (wmsTask.TaskType == TaskType.RUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.WC_RSSX)
+// //{
+// //}
+// //鍏ュ簱RGV寮�濮�
+// //if (wmsTask.TaskType == TaskType.RUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.ZX_RGV)
+// //{
+// //}
+// //鍏ュ簱RGV缁撴潫
+// //if (wmsTask.TaskType == TaskType.RUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.WC_RGV)
+// //{
+// //}
+// //鍏ュ簱寮�濮�
+// if (wmsTask.TaskType == TaskType.RUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.ZX_DDJ)
+// {
+// // 鏇存柊搴撲綅鐘舵��
+// wmsPlace.PlaceStatus = PlaceStatus.DAIRU;
+// await _wmsPlaceRep.UpdateAsync(wmsPlace);
+// }
+// //鍏ュ簱瀹屾垚
+// if (wmsTask.TaskType == TaskType.RUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.WC_DDJ)
+// {
+// //棣栧厛鏇存柊浠诲姟鐘舵�佸畬鎴�
+// wmsTask.TaskStatus = TaskStatusEnum.WANCHENG;
+// //鏇存柊璁惧鐘舵��
+// wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.W;
- // 鏇存柊鎵樼洏鐘舵�佷负鈥滃簱浣嶁��
- wmsContainer.ContainerStatus = ContainerStatus.KUWEI;
- await _wmsContainerRep.UpdateAsync(wmsContainer);
+// // 鏇存柊鎵樼洏鐘舵�佷负鈥滃簱浣嶁��
+// wmsContainer.ContainerStatus = ContainerStatus.KUWEI;
+// await _wmsContainerRep.UpdateAsync(wmsContainer);
- //搴撲綅淇℃伅
- if (wmsPlace == null) throw Oops.Oh("搴撲綅涓嶅瓨鍦�!");
- if (wmsPlace.Islock == YesOrNot.Y) throw Oops.Oh("搴撲綅琚攣瀹�!");
+// //搴撲綅淇℃伅
+// if (wmsPlace == null) throw Oops.Oh("搴撲綅涓嶅瓨鍦�!");
+// if (wmsPlace.Islock == YesOrNot.Y) throw Oops.Oh("搴撲綅琚攣瀹�!");
- // 鏇存柊搴撲綅鐘舵�佷负鈥滃瓨璐р��
- wmsPlace.PlaceStatus = PlaceStatus.CUNHUO;
- if (wmsTask.Description == "绌烘墭") wmsPlace.EmptyContainer = YesOrNot.Y;
- else wmsPlace.EmptyContainer = YesOrNot.N;
- await _wmsPlaceRep.UpdateAsync(wmsPlace);
+// // 鏇存柊搴撲綅鐘舵�佷负鈥滃瓨璐р��
+// wmsPlace.PlaceStatus = PlaceStatus.CUNHUO;
+// if (wmsTask.Description == "绌烘墭") wmsPlace.EmptyContainer = YesOrNot.Y;
+// else wmsPlace.EmptyContainer = YesOrNot.N;
+// await _wmsPlaceRep.UpdateAsync(wmsPlace);
- // 鍒涘缓鎵樼洏鍙峰簱浣嶅叧绯昏〃
- 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.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 = item.BindQuantity,
- PlaceCode = wmsPlace.PlaceCode,
- ContainerId = wmsContainer.Id,
- ContainerCode = wmsContainer.ContainerCode,
- AreaId = wmsPlace.AreaId,
- Source = RuKuSourceEnum.WULIAO
- };
- await _wmsMaterialStockRep.InsertAsync(wmsMaterialStock);
- }
- }
- // 绌烘枡绠卞叆搴�
- if (wmsTask.Description == "绌烘墭")
- {
- 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);
- }
- }
- //鍑哄簱鍫嗗灈鏈哄畬鎴�,鎵ц搴撳瓨锛屽簱浣嶏紝鎵樼洏瀵瑰簲鍏崇郴杩涜鏇存柊
- else if (wmsTask.TaskType == TaskType.CHUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.WC_DDJ)
- {
+// 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 = item.BindQuantity,
+// PlaceCode = wmsPlace.PlaceCode,
+// ContainerId = wmsContainer.Id,
+// ContainerCode = wmsContainer.ContainerCode,
+// AreaId = wmsPlace.AreaId,
+// Source = RuKuSourceEnum.WULIAO
+// };
+// await _wmsMaterialStockRep.InsertAsync(wmsMaterialStock);
+// }
+// }
+// // 绌烘枡绠卞叆搴�
+// if (wmsTask.Description == "绌烘墭")
+// {
+// 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);
+// }
+// }
+// //鍑哄簱鍫嗗灈鏈哄畬鎴�,鎵ц搴撳瓨锛屽簱浣嶏紝鎵樼洏瀵瑰簲鍏崇郴杩涜鏇存柊
+// else if (wmsTask.TaskType == TaskType.CHUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.WC_DDJ)
+// {
- if (wmsPlace == null) throw Oops.Oh("搴撲綅涓嶅瓨鍦�!");
- if (wmsPlace.PlaceStatus != PlaceStatus.DAICHU) throw Oops.Oh("搴撲綅寮傚父璐�!");
+// if (wmsPlace == null) throw Oops.Oh("搴撲綅涓嶅瓨鍦�!");
+// if (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("搴撲綅瀹瑰櫒鍏崇郴涓嶅瓨鍦�!");
- // 鏌ヨ搴撳瓨淇℃伅
- var wmsMaterialStockList = await _wmsMaterialStockRep.DetachedEntities.Where(u => u.ContainerCode == wmsTask.ContainerCode).ToListAsync();
- if (wmsMaterialStockList.Count <= 0) throw Oops.Oh("搴撳瓨鏁版嵁寮傚父!");
+// // 鏌ヨ搴撳瓨淇℃伅
+// var wmsMaterialStockList = await _wmsMaterialStockRep.DetachedEntities.Where(u => u.ContainerCode == wmsTask.ContainerCode).ToListAsync();
+// if (wmsMaterialStockList.Count <= 0) throw Oops.Oh("搴撳瓨鏁版嵁寮傚父!");
- ////鏌ヨ鐗╂枡涓庢墭鐩樼粍鐩樺叧绯伙紙鐘舵�侊細姝ｅ父锛�
- var wmsMaterialContainerList = await _wmsMaterialContainerRep.Where(p => p.ContainerCode == wmsTask.ContainerCode
- && p.BindStatus == CommonStatus.ENABLE && p.OrderNo == wmsTask.OrderNo).ToListAsync();
- //鍒ゆ柇鐗╂枡鏄惁鏄┖鎵橈紝濡傛灉鏄┖鎵樼洿鎺ュ垹闄わ紝涓嶆槸绌烘墭鏌ヨ鐗╂枡
- if (wmsMaterialContainerList.Count == 0)
- {
- //鍒犻櫎搴撳瓨
- foreach (var item in wmsMaterialStockList)
- {
- await _wmsMaterialStockRep.DeleteAsync(item);
- }
- // 鏇存柊鎵樼洏鐘舵�佷负鈥滅┖闂测��
- wmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
+// ////鏌ヨ鐗╂枡涓庢墭鐩樼粍鐩樺叧绯伙紙鐘舵�侊細姝ｅ父锛�
+// var wmsMaterialContainerList = await _wmsMaterialContainerRep.Where(p => p.ContainerCode == wmsTask.ContainerCode
+// && p.BindStatus == CommonStatus.ENABLE && p.OrderNo == wmsTask.OrderNo).ToListAsync();
+// //鍒ゆ柇鐗╂枡鏄惁鏄┖鎵橈紝濡傛灉鏄┖鎵樼洿鎺ュ垹闄わ紝涓嶆槸绌烘墭鏌ヨ鐗╂枡
+// if (wmsMaterialContainerList.Count == 0)
+// {
+// //鍒犻櫎搴撳瓨
+// foreach (var item in wmsMaterialStockList)
+// {
+// await _wmsMaterialStockRep.DeleteAsync(item);
+// }
+// // 鏇存柊鎵樼洏鐘舵�佷负鈥滅┖闂测��
+// wmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
- }
- else
- {
- //鏋勫缓鍑哄簱鐗╂枡鍜屽懆杞鍙峰叧绯�
- var orderNo = "N/A";
- if (wmsMaterialContainerList.Count > 0) orderNo = YitIdHelper.NextId().ToString();
- foreach (var item in wmsMaterialContainerList)
- {
- //鏇存柊鐘舵�佷负鈥濆垹闄も��
- item.BindStatus = CommonStatus.DELETED;
- await _wmsMaterialContainerRep.UpdateNowAsync(item);
+// }
+// else
+// {
+// //鏋勫缓鍑哄簱鐗╂枡鍜屽懆杞鍙峰叧绯�
+// var orderNo = "N/A";
+// if (wmsMaterialContainerList.Count > 0) orderNo = YitIdHelper.NextId().ToString();
+// foreach (var item in wmsMaterialContainerList)
+// {
+// //鏇存柊鐘舵�佷负鈥濆垹闄も��
+// item.BindStatus = CommonStatus.DELETED;
+// await _wmsMaterialContainerRep.UpdateNowAsync(item);
- //鏂板缁勭洏缁戝畾璁板綍 姝ｅ父
- var wmsMaterialContainer = item;
- wmsMaterialContainer.Id = YitIdHelper.NextId();
- wmsMaterialContainer.OrderNo = orderNo;
- wmsMaterialContainer.BindStatus = CommonStatus.ENABLE;
- await _wmsMaterialContainerRep.InsertNowAsync(wmsMaterialContainer);
- //鏇存敼搴撳瓨鐨勫簱浣嶅彿涓篘/A
- foreach (var stock in wmsMaterialStockList)
- {
- stock.PlaceCode = "N/A";
- await _wmsMaterialStockRep.UpdateAsync(stock);
- }
- }
- wmsContainer.ContainerStatus = ContainerStatus.FENJIAN;
- }
- await _wmsContainerRep.UpdateAsync(wmsContainer);
+// //鏂板缁勭洏缁戝畾璁板綍 姝ｅ父
+// var wmsMaterialContainer = item;
+// wmsMaterialContainer.Id = YitIdHelper.NextId();
+// wmsMaterialContainer.OrderNo = orderNo;
+// wmsMaterialContainer.BindStatus = CommonStatus.ENABLE;
+// await _wmsMaterialContainerRep.InsertNowAsync(wmsMaterialContainer);
+// //鏇存敼搴撳瓨鐨勫簱浣嶅彿涓篘/A
+// foreach (var stock in wmsMaterialStockList)
+// {
+// stock.PlaceCode = "N/A";
+// await _wmsMaterialStockRep.UpdateAsync(stock);
+// }
+// }
+// wmsContainer.ContainerStatus = ContainerStatus.FENJIAN;
+// }
+// await _wmsContainerRep.UpdateAsync(wmsContainer);
- //鏇存柊搴撲綅鐘舵�佷负鈥滅┖闂测��
- 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);
- //鏇存柊鍛ㄨ浆绠卞彿涓庡簱浣嶅叧绯讳负鈥滃垹闄も��
- wmsContainerPlace.ContainerPlaceStatus = CommonStatus.DELETED;
- await _wmsContainerPlaceRep.UpdateAsync(wmsContainerPlace);
- }
- if (wmsTask.TaskType == TaskType.CHUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.WC_CSSX)
- {
- wmsTask.TaskStatus = TaskStatusEnum.WANCHENG;
- wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.W;
- }
- else //绉诲簱
- {
- if (wmsTask.TaskType == TaskType.YIKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.WC_DDJ)
- {
- wmsTask.TaskStatus = TaskStatusEnum.WANCHENG;
- wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.W;
- // 璧风偣搴撲綅淇℃伅
- var SourcePlace = await _wmsPlaceRep.Where(z => z.PlaceCode == wmsTask.SourcePlace).FirstOrDefaultAsync();
- SourcePlace.PlaceStatus = PlaceStatus.KONGXIAN;
- await _wmsPlaceRep.UpdateAsync(SourcePlace);
- //鐩爣搴撲綅淇℃伅
- var ToPlace = await _wmsPlaceRep.Where(z => z.PlaceCode == wmsTask.ToPlace).FirstOrDefaultAsync();
- ToPlace.PlaceStatus = PlaceStatus.CUNHUO;
- await _wmsPlaceRep.UpdateAsync(ToPlace);
- //鎵樼洏搴撲綅鍏崇郴琛�
- var wmsContainerPlace = await _wmsContainerPlaceRep.FirstOrDefaultAsync(z => z.PlaceId == SourcePlace.Id && z.PlaceCode == SourcePlace.PlaceCode
- && z.ContainerCode == wmsTask.ContainerCode && z.ContainerPlaceStatus == CommonStatus.ENABLE);
- wmsContainerPlace.ContainerPlaceStatus = CommonStatus.DELETED;
- await _wmsContainerPlaceRep.UpdateAsync(wmsContainerPlace);
- await _wmsContainerPlaceRep.InsertAsync(new WmsContainerPlace()
- {
- PlaceId = ToPlace.Id,
- PlaceCode = ToPlace.PlaceCode,
- ContainerId = wmsContainer.Id,
- ContainerCode = wmsContainer.ContainerCode,
- ContainerPlaceStatus = CommonStatus.ENABLE
- });
- //搴撳瓨搴撲綅鏇存柊
- var stockModel = await _wmsMaterialStockRep.Where(p => p.ContainerCode == wmsTask.ContainerCode && p.PlaceCode == SourcePlace.PlaceCode).FirstOrDefaultAsync();
- if (stockModel != null)
- {
- stockModel.PlaceCode = ToPlace.PlaceCode;
- }
- }
- }
- await _wmsTaskRep.UpdateAsync(wmsTask);
- }
+// //鏇存柊鍛ㄨ浆绠卞彿涓庡簱浣嶅叧绯讳负鈥滃垹闄も��
+// wmsContainerPlace.ContainerPlaceStatus = CommonStatus.DELETED;
+// await _wmsContainerPlaceRep.UpdateAsync(wmsContainerPlace);
+// }
+// if (wmsTask.TaskType == TaskType.CHUKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.WC_CSSX)
+// {
+// wmsTask.TaskStatus = TaskStatusEnum.WANCHENG;
+// wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.W;
+// }
+// else //绉诲簱
+// {
+// if (wmsTask.TaskType == TaskType.YIKU && input.TaskDodeviceStatus == TaskDodeviceStatusEnum.WC_DDJ)
+// {
+// wmsTask.TaskStatus = TaskStatusEnum.WANCHENG;
+// wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.W;
+// // 璧风偣搴撲綅淇℃伅
+// var SourcePlace = await _wmsPlaceRep.Where(z => z.PlaceCode == wmsTask.SourcePlace).FirstOrDefaultAsync();
+// SourcePlace.PlaceStatus = PlaceStatus.KONGXIAN;
+// await _wmsPlaceRep.UpdateAsync(SourcePlace);
+// //鐩爣搴撲綅淇℃伅
+// var ToPlace = await _wmsPlaceRep.Where(z => z.PlaceCode == wmsTask.ToPlace).FirstOrDefaultAsync();
+// ToPlace.PlaceStatus = PlaceStatus.CUNHUO;
+// await _wmsPlaceRep.UpdateAsync(ToPlace);
+// //鎵樼洏搴撲綅鍏崇郴琛�
+// var wmsContainerPlace = await _wmsContainerPlaceRep.FirstOrDefaultAsync(z => z.PlaceId == SourcePlace.Id && z.PlaceCode == SourcePlace.PlaceCode
+// && z.ContainerCode == wmsTask.ContainerCode && z.ContainerPlaceStatus == CommonStatus.ENABLE);
+// wmsContainerPlace.ContainerPlaceStatus = CommonStatus.DELETED;
+// await _wmsContainerPlaceRep.UpdateAsync(wmsContainerPlace);
+// await _wmsContainerPlaceRep.InsertAsync(new WmsContainerPlace()
+// {
+// PlaceId = ToPlace.Id,
+// PlaceCode = ToPlace.PlaceCode,
+// ContainerId = wmsContainer.Id,
+// ContainerCode = wmsContainer.ContainerCode,
+// ContainerPlaceStatus = CommonStatus.ENABLE
+// });
+// //搴撳瓨搴撲綅鏇存柊
+// var stockModel = await _wmsMaterialStockRep.Where(p => p.ContainerCode == wmsTask.ContainerCode && p.PlaceCode == SourcePlace.PlaceCode).FirstOrDefaultAsync();
+// if (stockModel != null)
+// {
+// stockModel.PlaceCode = ToPlace.PlaceCode;
+// }
+// }
+// }
+// await _wmsTaskRep.UpdateAsync(wmsTask);
+// }
- /// <summary>
- /// 鑾峰彇搴撲綅淇℃伅
- /// </summary>
- /// <returns></returns>
- [HttpPost("GetPlace")]
- [AllowAnonymous]
- public async Task<GetPlaceOutput> GetPlace([FromBody] GetPlaceInput input)
- {
- //1.鍒� 浼樺厛1鎺掑拰4鎺� 灞備紭鍏堜粠涓嬪埌涓�
- //2.淇濈暀10涓唴渚хЩ搴撳簱浣�
- var taskModel = await _wmsTaskRep.Where(p => p.TaskNo == input.TaskNo).FirstOrDefaultAsync();
- if (taskModel == null) return new GetPlaceOutput() { TaskIsExist = false };
- if (taskModel.TaskStatus == TaskStatusEnum.CHEHUI || taskModel.TaskStatus == TaskStatusEnum.QUXIAO || taskModel.TaskStatus == TaskStatusEnum.WANCHENG || taskModel.TaskStatus == TaskStatusEnum.ZANTING)
- {
- throw Oops.Oh("浠诲姟鐘舵�佹湭婊¤冻鑾峰彇鐨勫簱浣嶆潯浠�");
- }
- taskModel.TaskStatus = TaskStatusEnum.ZHIXINGZHONG;
- //瀹氫箟鍏ュ簱瀵硅薄,绉诲簱瀵硅薄
- var ToPlace = new WmsPlace();
- var SourcePlace = new WmsPlace();
- var rowNumber = 0;
+// /// <summary>
+// /// 鑾峰彇搴撲綅淇℃伅
+// /// </summary>
+// /// <returns></returns>
+// [HttpPost("GetPlace")]
+// [AllowAnonymous]
+// public async Task<GetPlaceOutput> GetPlace([FromBody] GetPlaceInput input)
+// {
+// //1.鍒� 浼樺厛1鎺掑拰4鎺� 灞備紭鍏堜粠涓嬪埌涓�
+// //2.淇濈暀10涓唴渚хЩ搴撳簱浣�
+// var taskModel = await _wmsTaskRep.Where(p => p.TaskNo == input.TaskNo).FirstOrDefaultAsync();
+// if (taskModel == null) return new GetPlaceOutput() { TaskIsExist = false };
+// if (taskModel.TaskStatus == TaskStatusEnum.CHEHUI || taskModel.TaskStatus == TaskStatusEnum.QUXIAO || taskModel.TaskStatus == TaskStatusEnum.WANCHENG || taskModel.TaskStatus == TaskStatusEnum.ZANTING)
+// {
+// throw Oops.Oh("浠诲姟鐘舵�佹湭婊¤冻鑾峰彇鐨勫簱浣嶆潯浠�");
+// }
+// taskModel.TaskStatus = TaskStatusEnum.ZHIXINGZHONG;
+// //瀹氫箟鍏ュ簱瀵硅薄,绉诲簱瀵硅薄
+// var ToPlace = new WmsPlace();
+// var SourcePlace = new WmsPlace();
+// var rowNumber = 0;
- //鍏ュ簱娴佺▼
- if (taskModel.TaskType == TaskType.RUKU)
- {
- //闃查噸鎿嶄綔
- if (taskModel != null && !string.IsNullOrEmpty(taskModel.ToPlace))
- {
- ToPlace = await _wmsPlaceRep.Where(p => p.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN && p.PlaceCode == taskModel.ToPlace).FirstOrDefaultAsync();
- if (ToPlace.RowNo == GetOneRowByAisle(taskModel.Aisle) || ToPlace.RowNo == GetFourRowByAisle(taskModel.Aisle))
- {
- if (ToPlace.RowNo == GetOneRowByAisle(taskModel.Aisle))
- rowNumber = GetTwoRowByAisle(taskModel.Aisle);
- else
- rowNumber = GetThreeRowByAisle(taskModel.Aisle);
- SourcePlace = await _wmsPlaceRep.Where(p => p.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN && p.Aisle == taskModel.Aisle && p.RowNo == rowNumber && p.ColumnNo == ToPlace.ColumnNo && p.LayerNo == ToPlace.LayerNo).FirstOrDefaultAsync();
- if (SourcePlace != null && SourcePlace.PlaceStatus == PlaceStatus.CUNHUO)
- return new GetPlaceOutput() { ToPlace = ToPlace.PlaceCode, SourcePlace = SourcePlace.PlaceCode };
- }
- return new GetPlaceOutput() { ToPlace = ToPlace.PlaceCode };
- }
- //鑾峰彇绔嬩綋搴撳彲鐢ㄥ簱浣�
- var placeList = await _wmsPlaceRep.DetachedEntities.Where(z => z.PlaceStatus == PlaceStatus.KONGXIAN
- && z.Islock == YesOrNot.N && z.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN
- && z.WmsArea.AreaType == AreaType.LITIKU && z.Aisle == taskModel.Aisle).ProjectToType<WmsPlace>().ToListAsync();
+// //鍏ュ簱娴佺▼
+// if (taskModel.TaskType == TaskType.RUKU)
+// {
+// //闃查噸鎿嶄綔
+// if (taskModel != null && !string.IsNullOrEmpty(taskModel.ToPlace))
+// {
+// ToPlace = await _wmsPlaceRep.Where(p => p.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN && p.PlaceCode == taskModel.ToPlace).FirstOrDefaultAsync();
+// if (ToPlace.RowNo == GetOneRowByAisle(taskModel.Aisle) || ToPlace.RowNo == GetFourRowByAisle(taskModel.Aisle))
+// {
+// if (ToPlace.RowNo == GetOneRowByAisle(taskModel.Aisle))
+// rowNumber = GetTwoRowByAisle(taskModel.Aisle);
+// else
+// rowNumber = GetThreeRowByAisle(taskModel.Aisle);
+// SourcePlace = await _wmsPlaceRep.Where(p => p.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN && p.Aisle == taskModel.Aisle && p.RowNo == rowNumber && p.ColumnNo == ToPlace.ColumnNo && p.LayerNo == ToPlace.LayerNo).FirstOrDefaultAsync();
+// if (SourcePlace != null && SourcePlace.PlaceStatus == PlaceStatus.CUNHUO)
+// return new GetPlaceOutput() { ToPlace = ToPlace.PlaceCode, SourcePlace = SourcePlace.PlaceCode };
+// }
+// return new GetPlaceOutput() { ToPlace = ToPlace.PlaceCode };
+// }
+// //鑾峰彇绔嬩綋搴撳彲鐢ㄥ簱浣�
+// var placeList = await _wmsPlaceRep.DetachedEntities.Where(z => z.PlaceStatus == PlaceStatus.KONGXIAN
+// && z.Islock == YesOrNot.N && z.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN
+// && z.WmsArea.AreaType == AreaType.LITIKU && z.Aisle == taskModel.Aisle).ProjectToType<WmsPlace>().ToListAsync();
- //鑾峰彇褰撳墠绔嬩綋搴撻渶瑕佸嚭搴撳簱浣嶉泦鍚�
- var placeCodeList = await _wmsTaskRep.DetachedEntities.Where(p => p.IsRead == true
- && p.TaskType == TaskType.CHUKU && p.Aisle == taskModel.Aisle).Select(n => n.SourcePlace).ToListAsync();
+// //鑾峰彇褰撳墠绔嬩綋搴撻渶瑕佸嚭搴撳簱浣嶉泦鍚�
+// var placeCodeList = await _wmsTaskRep.DetachedEntities.Where(p => p.IsRead == true
+// && p.TaskType == TaskType.CHUKU && p.Aisle == taskModel.Aisle).Select(n => n.SourcePlace).ToListAsync();
- var ckPlaceModelList = await _wmsPlaceRep.DetachedEntities.Where(z => placeCodeList.Contains(z.PlaceCode)
- && z.Islock == YesOrNot.N && z.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN
- && z.WmsArea.AreaType == AreaType.LITIKU && z.Aisle == taskModel.Aisle).ToListAsync();
+// var ckPlaceModelList = await _wmsPlaceRep.DetachedEntities.Where(z => placeCodeList.Contains(z.PlaceCode)
+// && z.Islock == YesOrNot.N && z.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN
+// && z.WmsArea.AreaType == AreaType.LITIKU && z.Aisle == taskModel.Aisle).ToListAsync();
- //閰嶇疆鏂囦欢涓缃槸鍚﹀紑鍚寚瀹氬簱浣嶅叆搴撳拰绉诲簱鎿嶄綔
- //if (Convert.ToBoolean(App.Configuration["YiKuTestPalce:IsStart"]))
- //{
- // var rukuPoint = App.Configuration["YiKuTestPalce:rukuPoint"].Split('.'); //鍏ュ簱璧风偣
- // var yikuPoint = App.Configuration["YiKuTestPalce:yikuPoint"].Split('.'); //绉诲簱璧风偣
- // ToPlace = placeList.Where(p => p.RowNo == Convert.ToInt32(rukuPoint[0])
- // && p.ColumnNo == Convert.ToInt32(rukuPoint[1]) && p.LayerNo == Convert.ToInt32(rukuPoint[2])).FirstOrDefault();
- // if (ToPlace != null)
- // {
- // ToPlace.PlaceStatus = PlaceStatus.DAIRU;
- // await _wmsPlaceRep.UpdateAsync(ToPlace);
- // taskModel.ToPlace = ToPlace.PlaceCode;
- // taskModel.AreaName = ToPlace.WmsArea.AreaName;
- // await _wmsTaskRep.UpdateAsync(taskModel);
- // if (yikuPoint.Length > 1)
- // {
- // SourcePlace = await _wmsPlaceRep.FirstOrDefaultAsync(p => p.RowNo == Convert.ToInt32(yikuPoint[0])
- // && p.ColumnNo == Convert.ToInt32(yikuPoint[1]) && p.LayerNo == Convert.ToInt32(yikuPoint[2])
- // && p.Aisle == taskModel.Aisle && p.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN
- // && p.WmsArea.AreaType == AreaType.LITIKU
- // );
- // }
- // return new GetPlaceOutput() { ToPlace = ToPlace.PlaceCode, SourcePlace = SourcePlace.PlaceCode };
- // }
- //}
- var maxColumn = placeList.Max(selector: n => n.ColumnNo);
- var maxLayerNo = 0;
+// //閰嶇疆鏂囦欢涓缃槸鍚﹀紑鍚寚瀹氬簱浣嶅叆搴撳拰绉诲簱鎿嶄綔
+// //if (Convert.ToBoolean(App.Configuration["YiKuTestPalce:IsStart"]))
+// //{
+// // var rukuPoint = App.Configuration["YiKuTestPalce:rukuPoint"].Split('.'); //鍏ュ簱璧风偣
+// // var yikuPoint = App.Configuration["YiKuTestPalce:yikuPoint"].Split('.'); //绉诲簱璧风偣
+// // ToPlace = placeList.Where(p => p.RowNo == Convert.ToInt32(rukuPoint[0])
+// // && p.ColumnNo == Convert.ToInt32(rukuPoint[1]) && p.LayerNo == Convert.ToInt32(rukuPoint[2])).FirstOrDefault();
+// // if (ToPlace != null)
+// // {
+// // ToPlace.PlaceStatus = PlaceStatus.DAIRU;
+// // await _wmsPlaceRep.UpdateAsync(ToPlace);
+// // taskModel.ToPlace = ToPlace.PlaceCode;
+// // taskModel.AreaName = ToPlace.WmsArea.AreaName;
+// // await _wmsTaskRep.UpdateAsync(taskModel);
+// // if (yikuPoint.Length > 1)
+// // {
+// // SourcePlace = await _wmsPlaceRep.FirstOrDefaultAsync(p => p.RowNo == Convert.ToInt32(yikuPoint[0])
+// // && p.ColumnNo == Convert.ToInt32(yikuPoint[1]) && p.LayerNo == Convert.ToInt32(yikuPoint[2])
+// // && p.Aisle == taskModel.Aisle && p.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN
+// // && p.WmsArea.AreaType == AreaType.LITIKU
+// // );
+// // }
+// // return new GetPlaceOutput() { ToPlace = ToPlace.PlaceCode, SourcePlace = SourcePlace.PlaceCode };
+// // }
+// //}
+// var maxColumn = placeList.Max(selector: n => n.ColumnNo);
+// var maxLayerNo = 0;
- //鍏堜互鍒椾负杩涜寰幆鍒ゆ柇
- for (int j = 1; j <= maxColumn; j++)
- {
- //鑾峰彇璇ュ垪鐨勬渶澶у眰
- if (placeList.Where(p => p.ColumnNo == j).Count() <= 1) continue;
- maxLayerNo = placeList.Where(p => p.ColumnNo == j).Max(selector: n => n.LayerNo);
- //寰幆姣忓垪姣忓眰鐨勪腑鍒�
- //鍒嗛厤搴撲綅闇�瑕佽�冭檻澶栦晶鏄惁鏈夊嚭搴撲换鍔★紝鏈夌殑璇濆氨娌℃湁鎵ц
- for (int f = 1; f <= maxLayerNo; f++)
- {
+// //鍏堜互鍒椾负杩涜寰幆鍒ゆ柇
+// for (int j = 1; j <= maxColumn; j++)
+// {
+// //鑾峰彇璇ュ垪鐨勬渶澶у眰
+// if (placeList.Where(p => p.ColumnNo == j).Count() <= 1) continue;
+// maxLayerNo = placeList.Where(p => p.ColumnNo == j).Max(selector: n => n.LayerNo);
+// //寰幆姣忓垪姣忓眰鐨勪腑鍒�
+// //鍒嗛厤搴撲綅闇�瑕佽�冭檻澶栦晶鏄惁鏈夊嚭搴撲换鍔★紝鏈夌殑璇濆氨娌℃湁鎵ц
+// for (int f = 1; f <= maxLayerNo; f++)
+// {
- var model = placeList.FirstOrDefault(p => p.RowNo == GetOneRowByAisle(taskModel.Aisle) && p.ColumnNo == j && p.LayerNo == f);
- var ckmodel = ckPlaceModelList.FirstOrDefault(p => p.RowNo == GetTwoRowByAisle(taskModel.Aisle) && p.ColumnNo == j && p.LayerNo == f);
- if (model != null && ckmodel == null)
- {
- ToPlace = model;
- break;
- }
- }
- if (!string.IsNullOrEmpty(ToPlace.PlaceCode)) break;
- }
- if (string.IsNullOrEmpty(ToPlace.PlaceCode)) throw Oops.Oh("鏆傛棤鍙互搴撲綅!");
+// var model = placeList.FirstOrDefault(p => p.RowNo == GetOneRowByAisle(taskModel.Aisle) && p.ColumnNo == j && p.LayerNo == f);
+// var ckmodel = ckPlaceModelList.FirstOrDefault(p => p.RowNo == GetTwoRowByAisle(taskModel.Aisle) && p.ColumnNo == j && p.LayerNo == f);
+// if (model != null && ckmodel == null)
+// {
+// ToPlace = model;
+// break;
+// }
+// }
+// if (!string.IsNullOrEmpty(ToPlace.PlaceCode)) break;
+// }
+// if (string.IsNullOrEmpty(ToPlace.PlaceCode)) throw Oops.Oh("鏆傛棤鍙互搴撲綅!");
- //杩涜搴撲綅鍜屼换鍔＄殑鏇存柊
- ToPlace.PlaceStatus = PlaceStatus.DAIRU;
- await _wmsPlaceRep.UpdateAsync(ToPlace);
- taskModel.ToPlace = ToPlace.PlaceCode;
- taskModel.AreaName = ToPlace.WmsArea.AreaName;
- await _wmsTaskRep.UpdateAsync(taskModel);
- if (SourcePlace == null || string.IsNullOrEmpty(SourcePlace.PlaceCode)) return new GetPlaceOutput() { ToPlace = ToPlace.PlaceCode };
- else return new GetPlaceOutput() { ToPlace = ToPlace.PlaceCode, SourcePlace = SourcePlace.PlaceCode };
- }
- //鍑哄簱娴佺▼
- if (taskModel.TaskType == TaskType.CHUKU)
- {
- //闇�瑕佸垽鏂笅搴撲綅鏄惁宸茬粡杩涜绉诲簱鎿嶄綔锛岄渶瑕侀�氳繃鎵樼洏缂栧彿杩涜閲嶆柊鏌ユ壘
- var containerPlace = await _wmsContainerPlaceRep.FirstOrDefaultAsync(p => p.ContainerCode == taskModel.ContainerCode
- && p.ContainerPlaceStatus == CommonStatus.ENABLE);
- if (containerPlace != null && containerPlace.PlaceCode != taskModel.SourcePlace)
- {
- ToPlace = await _wmsPlaceRep.FirstOrDefaultAsync(p => p.PlaceCode == containerPlace.PlaceCode);
- taskModel.SourcePlace = containerPlace.PlaceCode;
- }
- else
- {
- ToPlace = await _wmsPlaceRep.FirstOrDefaultAsync(p => p.PlaceCode == taskModel.SourcePlace);
- }
- //杩涜搴撲綅鍜屼换鍔＄殑鏇存柊
- ToPlace.PlaceStatus = PlaceStatus.DAICHU;
- await _wmsPlaceRep.UpdateAsync(ToPlace);
- taskModel.ToPlace = taskModel.Aisle.ToString();
- await _wmsTaskRep.UpdateAsync(taskModel);
- if (SourcePlace == null || string.IsNullOrEmpty(SourcePlace.PlaceCode)) return new GetPlaceOutput() { ToPlace = ToPlace.PlaceCode };
- else return new GetPlaceOutput() { ToPlace = ToPlace.PlaceCode, SourcePlace = SourcePlace.PlaceCode };
- }
- else
- {
- throw Oops.Oh("浠诲姟寮傚父" + taskModel.TaskNo);
- }
- }
+// //杩涜搴撲綅鍜屼换鍔＄殑鏇存柊
+// ToPlace.PlaceStatus = PlaceStatus.DAIRU;
+// await _wmsPlaceRep.UpdateAsync(ToPlace);
+// taskModel.ToPlace = ToPlace.PlaceCode;
+// taskModel.AreaName = ToPlace.WmsArea.AreaName;
+// await _wmsTaskRep.UpdateAsync(taskModel);
+// if (SourcePlace == null || string.IsNullOrEmpty(SourcePlace.PlaceCode)) return new GetPlaceOutput() { ToPlace = ToPlace.PlaceCode };
+// else return new GetPlaceOutput() { ToPlace = ToPlace.PlaceCode, SourcePlace = SourcePlace.PlaceCode };
+// }
+// //鍑哄簱娴佺▼
+// if (taskModel.TaskType == TaskType.CHUKU)
+// {
+// //闇�瑕佸垽鏂笅搴撲綅鏄惁宸茬粡杩涜绉诲簱鎿嶄綔锛岄渶瑕侀�氳繃鎵樼洏缂栧彿杩涜閲嶆柊鏌ユ壘
+// var containerPlace = await _wmsContainerPlaceRep.FirstOrDefaultAsync(p => p.ContainerCode == taskModel.ContainerCode
+// && p.ContainerPlaceStatus == CommonStatus.ENABLE);
+// if (containerPlace != null && containerPlace.PlaceCode != taskModel.SourcePlace)
+// {
+// ToPlace = await _wmsPlaceRep.FirstOrDefaultAsync(p => p.PlaceCode == containerPlace.PlaceCode);
+// taskModel.SourcePlace = containerPlace.PlaceCode;
+// }
+// else
+// {
+// ToPlace = await _wmsPlaceRep.FirstOrDefaultAsync(p => p.PlaceCode == taskModel.SourcePlace);
+// }
+// //杩涜搴撲綅鍜屼换鍔＄殑鏇存柊
+// ToPlace.PlaceStatus = PlaceStatus.DAICHU;
+// await _wmsPlaceRep.UpdateAsync(ToPlace);
+// taskModel.ToPlace = taskModel.Aisle.ToString();
+// await _wmsTaskRep.UpdateAsync(taskModel);
+// if (SourcePlace == null || string.IsNullOrEmpty(SourcePlace.PlaceCode)) return new GetPlaceOutput() { ToPlace = ToPlace.PlaceCode };
+// else return new GetPlaceOutput() { ToPlace = ToPlace.PlaceCode, SourcePlace = SourcePlace.PlaceCode };
+// }
+// else
+// {
+// throw Oops.Oh("浠诲姟寮傚父" + taskModel.TaskNo);
+// }
+// }
- /// <summary>
- /// 鍒涘缓绉诲簱浠诲姟
- /// </summary>
- /// <returns></returns>
- [HttpPost("CreateYKTask")]
- [UnitOfWork]
- [AllowAnonymous]
- public async Task<GetYiKuPlaceOutput> CreateRelocation(CreateRelocationInput input)
- {
- var placeModel = await _wmsPlaceRep.Where(p => p.PlaceCode == input.SourcePlace).ProjectToType<WmsPlace>().FirstOrDefaultAsync();
- if (placeModel == null) throw Oops.Oh("搴撲綅鏁版嵁寮傚父!");
- placeModel.PlaceStatus = PlaceStatus.DAICHU;
- await _wmsPlaceRep.UpdateAsync(placeModel);
- //鏌ヨ缁勭洏鍗曟嵁
- var containerPlaceModel = await _wmsContainerPlaceRep.Where(p => p.PlaceCode == input.SourcePlace && p.ContainerPlaceStatus == CommonStatus.ENABLE).FirstOrDefaultAsync();
- if (containerPlaceModel == null) throw Oops.Oh("绉诲簱搴撲綅鎵樼洏鏁版嵁寮傚父!");
- var materialContainer = await _wmsMaterialContainerRep.Where(p => p.ContainerCode == containerPlaceModel.ContainerCode && p.BindStatus == CommonStatus.ENABLE).FirstOrDefaultAsync();
- if (materialContainer == null) throw Oops.Oh("缁勭洏鏁版嵁寮傚父!");
+// /// <summary>
+// /// 鍒涘缓绉诲簱浠诲姟
+// /// </summary>
+// /// <returns></returns>
+// [HttpPost("CreateYKTask")]
+// [UnitOfWork]
+// [AllowAnonymous]
+// public async Task<GetYiKuPlaceOutput> CreateRelocation(CreateRelocationInput input)
+// {
+// var placeModel = await _wmsPlaceRep.Where(p => p.PlaceCode == input.SourcePlace).ProjectToType<WmsPlace>().FirstOrDefaultAsync();
+// if (placeModel == null) throw Oops.Oh("搴撲綅鏁版嵁寮傚父!");
+// placeModel.PlaceStatus = PlaceStatus.DAICHU;
+// await _wmsPlaceRep.UpdateAsync(placeModel);
+// //鏌ヨ缁勭洏鍗曟嵁
+// var containerPlaceModel = await _wmsContainerPlaceRep.Where(p => p.PlaceCode == input.SourcePlace && p.ContainerPlaceStatus == CommonStatus.ENABLE).FirstOrDefaultAsync();
+// if (containerPlaceModel == null) throw Oops.Oh("绉诲簱搴撲綅鎵樼洏鏁版嵁寮傚父!");
+// var materialContainer = await _wmsMaterialContainerRep.Where(p => p.ContainerCode == containerPlaceModel.ContainerCode && p.BindStatus == CommonStatus.ENABLE).FirstOrDefaultAsync();
+// if (materialContainer == null) throw Oops.Oh("缁勭洏鏁版嵁寮傚父!");
- //鑾峰彇绌洪棽搴撲綅闆嗗悎
- var placeList = await _wmsPlaceRep.DetachedEntities.Where(z => z.PlaceStatus == PlaceStatus.KONGXIAN
- && z.Islock == YesOrNot.N && z.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN
- && z.WmsArea.AreaType == AreaType.LITIKU && z.Aisle == input.Aisle).ToListAsync();
- if (placeList.Count == 0) throw Oops.Oh("鏃犲彲绉诲簱搴撲綅!");
+// //鑾峰彇绌洪棽搴撲綅闆嗗悎
+// var placeList = await _wmsPlaceRep.DetachedEntities.Where(z => z.PlaceStatus == PlaceStatus.KONGXIAN
+// && z.Islock == YesOrNot.N && z.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN
+// && z.WmsArea.AreaType == AreaType.LITIKU && z.Aisle == input.Aisle).ToListAsync();
+// if (placeList.Count == 0) throw Oops.Oh("鏃犲彲绉诲簱搴撲綅!");
- //瀹氫箟鐩爣鐐�
- var ToPlaceModel = new WmsPlace();
- var rowNumber = 0;
- //1.鎺ㄨ崘澶栦晶搴撲綅
- var wcPlaceList = placeList.Where(p => (p.RowNo == GetOneRowByAisle(placeModel.Aisle) || p.RowNo == GetFourRowByAisle(placeModel.Aisle))).ToList();
- if (placeModel.Aisle == 11)
- {
- wcPlaceList = placeList.Where(p => (p.RowNo == GetOneRowByAisle(placeModel.Aisle) || p.RowNo == GetThreeRowByAisle(placeModel.Aisle))).ToList();
- }
- //瀹氫箟鏈�浼樺簱浣嶉泦鍚�
- var zyPlaceList = new List<WmsPlace>();
- //寰幆鍒ゆ柇瀵瑰簲鐨�2,3鏄湁璐�
- foreach (var item in wcPlaceList)
- {
- if (placeModel.Aisle == 11)
- {
- if (item.RowNo == GetOneRowByAisle(placeModel.Aisle))
- {
- zyPlaceList.Add(item);
- }
- if (item.RowNo == GetThreeRowByAisle(placeModel.Aisle))
- {
- rowNumber = GetTwoRowByAisle(placeModel.Aisle);
- var dypalceModel = placeList.Where(p => p.RowNo == rowNumber && p.ColumnNo == item.ColumnNo && p.LayerNo == item.LayerNo).FirstOrDefault();
- if (dypalceModel != null)
- zyPlaceList.Add(item);
- }
- }
- else
- {
- if (item.RowNo == GetOneRowByAisle(placeModel.Aisle) || item.RowNo == GetFourRowByAisle(placeModel.Aisle))
- {
- if (item.RowNo == GetOneRowByAisle(placeModel.Aisle))
- rowNumber = GetTwoRowByAisle(placeModel.Aisle);
- else
- rowNumber = GetThreeRowByAisle(placeModel.Aisle);
- var dypalceModel = placeList.Where(p => p.RowNo == rowNumber && p.ColumnNo == item.ColumnNo && p.LayerNo == item.LayerNo).FirstOrDefault();
- if (dypalceModel != null)
- zyPlaceList.Add(item);
- }
- }
- }
- if (zyPlaceList.Count != 0)
- {
- //鑾峰彇璺緞鏈�鐭殑搴撲綅 浣跨敤浜屽垎娉�
- var mindModel = zyPlaceList.Where(p => p.ColumnNo == placeModel.ColumnNo).FirstOrDefault();
- var leftModel = zyPlaceList.Where(p => p.ColumnNo < placeModel.ColumnNo).OrderByDescending(p => p.ColumnNo).FirstOrDefault();
- var rightModel = zyPlaceList.Where(p => p.ColumnNo > placeModel.ColumnNo).OrderBy(p => p.ColumnNo).FirstOrDefault();
+// //瀹氫箟鐩爣鐐�
+// var ToPlaceModel = new WmsPlace();
+// var rowNumber = 0;
+// //1.鎺ㄨ崘澶栦晶搴撲綅
+// var wcPlaceList = placeList.Where(p => (p.RowNo == GetOneRowByAisle(placeModel.Aisle) || p.RowNo == GetFourRowByAisle(placeModel.Aisle))).ToList();
+// if (placeModel.Aisle == 11)
+// {
+// wcPlaceList = placeList.Where(p => (p.RowNo == GetOneRowByAisle(placeModel.Aisle) || p.RowNo == GetThreeRowByAisle(placeModel.Aisle))).ToList();
+// }
+// //瀹氫箟鏈�浼樺簱浣嶉泦鍚�
+// var zyPlaceList = new List<WmsPlace>();
+// //寰幆鍒ゆ柇瀵瑰簲鐨�2,3鏄湁璐�
+// foreach (var item in wcPlaceList)
+// {
+// if (placeModel.Aisle == 11)
+// {
+// if (item.RowNo == GetOneRowByAisle(placeModel.Aisle))
+// {
+// zyPlaceList.Add(item);
+// }
+// if (item.RowNo == GetThreeRowByAisle(placeModel.Aisle))
+// {
+// rowNumber = GetTwoRowByAisle(placeModel.Aisle);
+// var dypalceModel = placeList.Where(p => p.RowNo == rowNumber && p.ColumnNo == item.ColumnNo && p.LayerNo == item.LayerNo).FirstOrDefault();
+// if (dypalceModel != null)
+// zyPlaceList.Add(item);
+// }
+// }
+// else
+// {
+// if (item.RowNo == GetOneRowByAisle(placeModel.Aisle) || item.RowNo == GetFourRowByAisle(placeModel.Aisle))
+// {
+// if (item.RowNo == GetOneRowByAisle(placeModel.Aisle))
+// rowNumber = GetTwoRowByAisle(placeModel.Aisle);
+// else
+// rowNumber = GetThreeRowByAisle(placeModel.Aisle);
+// var dypalceModel = placeList.Where(p => p.RowNo == rowNumber && p.ColumnNo == item.ColumnNo && p.LayerNo == item.LayerNo).FirstOrDefault();
+// if (dypalceModel != null)
+// zyPlaceList.Add(item);
+// }
+// }
+// }
+// if (zyPlaceList.Count != 0)
+// {
+// //鑾峰彇璺緞鏈�鐭殑搴撲綅 浣跨敤浜屽垎娉�
+// var mindModel = zyPlaceList.Where(p => p.ColumnNo == placeModel.ColumnNo).FirstOrDefault();
+// var leftModel = zyPlaceList.Where(p => p.ColumnNo < placeModel.ColumnNo).OrderByDescending(p => p.ColumnNo).FirstOrDefault();
+// var rightModel = zyPlaceList.Where(p => p.ColumnNo > placeModel.ColumnNo).OrderBy(p => p.ColumnNo).FirstOrDefault();
- if (mindModel != null) ToPlaceModel = mindModel;
- else if (leftModel == null) ToPlaceModel = rightModel;
- else if (rightModel == null) ToPlaceModel = leftModel;
- else if ((placeModel.ColumnNo - leftModel.ColumnNo) > (rightModel.ColumnNo - placeModel.ColumnNo)) ToPlaceModel = rightModel;
- else ToPlaceModel = leftModel;
- }
- if (string.IsNullOrEmpty(ToPlaceModel.PlaceCode))
- {
- //2.娆′紭搴撲綅闆嗗悎
- //娆′紭2,3鎺掑簱浣�
- var cyPlace = placeList.Where(p => (p.RowNo == GetTwoRowByAisle(placeModel.Aisle) || p.RowNo == GetThreeRowByAisle(placeModel.Aisle))).OrderByDescending(p => p.ColumnNo).OrderBy(p => p.LayerNo).ToList();
- if (placeModel.Aisle == 11)
- {
- cyPlace = placeList.Where(p => p.RowNo == GetTwoRowByAisle(placeModel.Aisle)).OrderByDescending(p => p.ColumnNo).OrderBy(p => p.LayerNo).ToList();
- }
- if (cyPlace.Count > 0)
- {
- //鑾峰彇璺緞鏈�鐭殑搴撲綅 浣跨敤浜屽垎娉�
- var mindModel = cyPlace.Where(p => p.ColumnNo == placeModel.ColumnNo).OrderByDescending(p => p.ColumnNo).FirstOrDefault();
- var leftModel = cyPlace.Where(p => p.ColumnNo < placeModel.ColumnNo).OrderByDescending(p => p.ColumnNo).FirstOrDefault();
- var rightModel = cyPlace.Where(p => p.ColumnNo > placeModel.ColumnNo).OrderBy(p => p.ColumnNo).FirstOrDefault();
+// if (mindModel != null) ToPlaceModel = mindModel;
+// else if (leftModel == null) ToPlaceModel = rightModel;
+// else if (rightModel == null) ToPlaceModel = leftModel;
+// else if ((placeModel.ColumnNo - leftModel.ColumnNo) > (rightModel.ColumnNo - placeModel.ColumnNo)) ToPlaceModel = rightModel;
+// else ToPlaceModel = leftModel;
+// }
+// if (string.IsNullOrEmpty(ToPlaceModel.PlaceCode))
+// {
+// //2.娆′紭搴撲綅闆嗗悎
+// //娆′紭2,3鎺掑簱浣�
+// var cyPlace = placeList.Where(p => (p.RowNo == GetTwoRowByAisle(placeModel.Aisle) || p.RowNo == GetThreeRowByAisle(placeModel.Aisle))).OrderByDescending(p => p.ColumnNo).OrderBy(p => p.LayerNo).ToList();
+// if (placeModel.Aisle == 11)
+// {
+// cyPlace = placeList.Where(p => p.RowNo == GetTwoRowByAisle(placeModel.Aisle)).OrderByDescending(p => p.ColumnNo).OrderBy(p => p.LayerNo).ToList();
+// }
+// if (cyPlace.Count > 0)
+// {
+// //鑾峰彇璺緞鏈�鐭殑搴撲綅 浣跨敤浜屽垎娉�
+// var mindModel = cyPlace.Where(p => p.ColumnNo == placeModel.ColumnNo).OrderByDescending(p => p.ColumnNo).FirstOrDefault();
+// var leftModel = cyPlace.Where(p => p.ColumnNo < placeModel.ColumnNo).OrderByDescending(p => p.ColumnNo).FirstOrDefault();
+// var rightModel = cyPlace.Where(p => p.ColumnNo > placeModel.ColumnNo).OrderBy(p => p.ColumnNo).FirstOrDefault();
- if (mindModel != null) ToPlaceModel = mindModel;
- else if (leftModel == null) ToPlaceModel = rightModel;
- else if (rightModel == null) ToPlaceModel = leftModel;
- else if ((placeModel.ColumnNo - leftModel.ColumnNo) > (rightModel.ColumnNo - placeModel.ColumnNo)) ToPlaceModel = rightModel;
- else ToPlaceModel = leftModel;
- }
- }
- ToPlaceModel.PlaceStatus = PlaceStatus.DAIRU;
- await _wmsPlaceRep.UpdateAsync(ToPlaceModel);
+// if (mindModel != null) ToPlaceModel = mindModel;
+// else if (leftModel == null) ToPlaceModel = rightModel;
+// else if (rightModel == null) ToPlaceModel = leftModel;
+// else if ((placeModel.ColumnNo - leftModel.ColumnNo) > (rightModel.ColumnNo - placeModel.ColumnNo)) ToPlaceModel = rightModel;
+// else ToPlaceModel = leftModel;
+// }
+// }
+// ToPlaceModel.PlaceStatus = PlaceStatus.DAIRU;
+// await _wmsPlaceRep.UpdateAsync(ToPlaceModel);
- //鍒涘缓绉诲簱浠诲姟
- var newWmsTask = new WmsTask()
- {
- //TaskNo = _commonOrderServiceRep.GetFYKOrderNo(),
- TaskNo = Yitter.IdGenerator.YitIdHelper.NextId().ToString(),
- TaskModel = TaskModel.QUANZIDONG,
- TaskType = TaskType.YIKU,
- TaskLevel = 5,
- TaskStatus = TaskStatusEnum.WEIZHIXING,
- OrderNo = materialContainer.OrderNo,
- OrderDetailsId = materialContainer.OrderDetailsId,
- ContainerCode = materialContainer.ContainerCode,
- SourcePlace = placeModel.PlaceCode,
- ToPlace = ToPlaceModel.PlaceCode,
- AreaName = placeModel.WmsArea.AreaName,
- IsRead = true, //WCS鏄惁鍙互璇诲彇
- SendTimes = 1, //鍙戦�佹鏁�
- Aisle = placeModel.Aisle,
- Dodevicetype = DodeviceType.AGV,
- TaskDodeviceStatus = TaskDodeviceStatusEnum.WZX,
- };
- await _wmsTaskRep.InsertAsync(newWmsTask);
+// //鍒涘缓绉诲簱浠诲姟
+// var newWmsTask = new WmsTask()
+// {
+// //TaskNo = _commonOrderServiceRep.GetFYKOrderNo(),
+// TaskNo = Yitter.IdGenerator.YitIdHelper.NextId().ToString(),
+// TaskModel = TaskModel.QUANZIDONG,
+// TaskType = TaskType.YIKU,
+// TaskLevel = 5,
+// TaskStatus = TaskStatusEnum.WEIZHIXING,
+// OrderNo = materialContainer.OrderNo,
+// OrderDetailsId = materialContainer.OrderDetailsId,
+// ContainerCode = materialContainer.ContainerCode,
+// SourcePlace = placeModel.PlaceCode,
+// ToPlace = ToPlaceModel.PlaceCode,
+// AreaName = placeModel.WmsArea.AreaName,
+// IsRead = true, //WCS鏄惁鍙互璇诲彇
+// SendTimes = 1, //鍙戦�佹鏁�
+// Aisle = placeModel.Aisle,
+// Dodevicetype = DodeviceType.AGV,
+// TaskDodeviceStatus = TaskDodeviceStatusEnum.WZX,
+// };
+// await _wmsTaskRep.InsertAsync(newWmsTask);
- return new GetYiKuPlaceOutput()
- {
- ToPlace = ToPlaceModel.PlaceCode,
- TaskNo = newWmsTask.TaskNo,
- };
- }
+// return new GetYiKuPlaceOutput()
+// {
+// ToPlace = ToPlaceModel.PlaceCode,
+// TaskNo = newWmsTask.TaskNo,
+// };
+// }
- ///// <summary>
- ///// 寮哄埗瀹屾垚
- ///// </summary>
- ///// <returns></returns>
- //[HttpPost("Finish")]
- //[UnitOfWork]
- //[AllowAnonymous]
- //public async Task Finish([FromBody] FinishTaskInput input)
- //{
- // var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.TaskNo == input.TaskNo);
- // if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
- // if (wmsTask.TaskStatus == TaskStatusEnum.WANCHENG) throw Oops.Oh("浠诲姟宸插畬鎴愶紝寮哄埗瀹屾垚澶辫触锛�");
- // var statusList = new List<TaskStatusEnum> { TaskStatusEnum.WEIZHIXING, TaskStatusEnum.ZHIXINGZHONG };
- // if (!statusList.Contains(wmsTask.TaskStatus)) throw Oops.Oh("鍙湁鏈墽琛屽拰鎵ц涓殑浠诲姟鎵嶈兘寮哄埗瀹屾垚锛�");
+// ///// <summary>
+// ///// 寮哄埗瀹屾垚
+// ///// </summary>
+// ///// <returns></returns>
+// //[HttpPost("Finish")]
+// //[UnitOfWork]
+// //[AllowAnonymous]
+// //public async Task Finish([FromBody] FinishTaskInput input)
+// //{
+// // var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.TaskNo == input.TaskNo);
+// // if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
+// // if (wmsTask.TaskStatus == TaskStatusEnum.WANCHENG) throw Oops.Oh("浠诲姟宸插畬鎴愶紝寮哄埗瀹屾垚澶辫触锛�");
+// // var statusList = new List<TaskStatusEnum> { TaskStatusEnum.WEIZHIXING, TaskStatusEnum.ZHIXINGZHONG };
+// // if (!statusList.Contains(wmsTask.TaskStatus)) throw Oops.Oh("鍙湁鏈墽琛屽拰鎵ц涓殑浠诲姟鎵嶈兘寮哄埗瀹屾垚锛�");
- // if (wmsTask.TaskType == TaskType.RUKU) // 鍏ュ簱浠诲姟
- // {
- // var taskStatusList = new List<TaskDodeviceStatusEnum> { TaskDodeviceStatusEnum.ZX_DDJ, TaskDodeviceStatusEnum.WC_DDJ };
- // if (!taskStatusList.Contains(wmsTask.TaskDodeviceStatus)) throw Oops.Oh("鍙湁鍫嗗灈鏈烘墽琛�,鍫嗗灈鏈哄畬鎴愭墠鑳藉己鍒跺畬鎴愶紒");
- // //鏌ヨ搴撲綅
- // var wmsPlace = await _wmsPlaceRep.DetachedEntities.Where(u => u.PlaceCode == wmsTask.ToPlace
- // && u.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN).ProjectToType<WmsPlace>().FirstOrDefaultAsync();
- // // 鏌ヨ鎵樼洏
- // var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode);
- // if (wmsContainer == null) throw Oops.Oh("鎵樼洏淇℃伅涓嶅瓨鍦�!");
- // // 鏇存柊浠诲姟鐘舵��
- // wmsTask.TaskStatus = TaskStatusEnum.WANCHENG;
- // wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.W;
- // wmsTask.IsRead = false;
- // await _wmsTaskRep.UpdateAsync(wmsTask);
+// // if (wmsTask.TaskType == TaskType.RUKU) // 鍏ュ簱浠诲姟
+// // {
+// // var taskStatusList = new List<TaskDodeviceStatusEnum> { TaskDodeviceStatusEnum.ZX_DDJ, TaskDodeviceStatusEnum.WC_DDJ };
+// // if (!taskStatusList.Contains(wmsTask.TaskDodeviceStatus)) throw Oops.Oh("鍙湁鍫嗗灈鏈烘墽琛�,鍫嗗灈鏈哄畬鎴愭墠鑳藉己鍒跺畬鎴愶紒");
+// // //鏌ヨ搴撲綅
+// // var wmsPlace = await _wmsPlaceRep.DetachedEntities.Where(u => u.PlaceCode == wmsTask.ToPlace
+// // && u.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN).ProjectToType<WmsPlace>().FirstOrDefaultAsync();
+// // // 鏌ヨ鎵樼洏
+// // var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode);
+// // if (wmsContainer == null) throw Oops.Oh("鎵樼洏淇℃伅涓嶅瓨鍦�!");
+// // // 鏇存柊浠诲姟鐘舵��
+// // wmsTask.TaskStatus = TaskStatusEnum.WANCHENG;
+// // wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.W;
+// // wmsTask.IsRead = false;
+// // await _wmsTaskRep.UpdateAsync(wmsTask);
- // // 鏇存柊鍗曟嵁鏄庣粏鐘舵�佷负瀹屾垚銆佹洿鏂版墭鐩樼紪鍙枫�佹洿鏂板簱浣嶇紪鍙�
- // var wmsOrderDetails = await _wmsOrderDetailsRep.Where(z => z.Id == wmsTask.OrderDetailsId).ProjectToType<WmsOrderDetails>().FirstOrDefaultAsync();
- // if (wmsOrderDetails != null)
- // {
- // wmsOrderDetails.ContainerCode = wmsTask.ContainerCode;
- // wmsOrderDetails.PlaceCode = wmsPlace.PlaceCode;
- // wmsOrderDetails.OrderStatus = OrderDetailsStatusEnum.WANCHENG;
- // await _wmsOrderDetailsRep.UpdateNowAsync(wmsOrderDetails);
- // }
- // // 鍗曟嵁鏄庣粏瀹屾垚鎬绘暟
- // var orderDetailsCount = (await _wmsOrderDetailsRep.DetachedEntities
- // .Where(z => z.OrderId == wmsOrderDetails.WareOrder.Id && z.OrderStatus == OrderDetailsStatusEnum.WANCHENG).ToListAsync()).Count;
+// // // 鏇存柊鍗曟嵁鏄庣粏鐘舵�佷负瀹屾垚銆佹洿鏂版墭鐩樼紪鍙枫�佹洿鏂板簱浣嶇紪鍙�
+// // var wmsOrderDetails = await _wmsOrderDetailsRep.Where(z => z.Id == wmsTask.OrderDetailsId).ProjectToType<WmsOrderDetails>().FirstOrDefaultAsync();
+// // if (wmsOrderDetails != null)
+// // {
+// // wmsOrderDetails.ContainerCode = wmsTask.ContainerCode;
+// // wmsOrderDetails.PlaceCode = wmsPlace.PlaceCode;
+// // wmsOrderDetails.OrderStatus = OrderDetailsStatusEnum.WANCHENG;
+// // await _wmsOrderDetailsRep.UpdateNowAsync(wmsOrderDetails);
+// // }
+// // // 鍗曟嵁鏄庣粏瀹屾垚鎬绘暟
+// // var orderDetailsCount = (await _wmsOrderDetailsRep.DetachedEntities
+// // .Where(z => z.OrderId == wmsOrderDetails.WareOrder.Id && z.OrderStatus == OrderDetailsStatusEnum.WANCHENG).ToListAsync()).Count;
- // if (orderDetailsCount == wmsOrderDetails.WareOrder.OrderQuantityTotal)
- // {
- // wmsOrderDetails.WareOrder.OrderStatus = OrderStatusEnum.WANCHENG;
- // await _wmsOrderRep.UpdateAsync(wmsOrderDetails.WareOrder);
- // }
+// // if (orderDetailsCount == wmsOrderDetails.WareOrder.OrderQuantityTotal)
+// // {
+// // wmsOrderDetails.WareOrder.OrderStatus = OrderStatusEnum.WANCHENG;
+// // await _wmsOrderRep.UpdateAsync(wmsOrderDetails.WareOrder);
+// // }
- // // 鏇存柊搴撲綅鐘舵�佷负瀛樿揣
- // wmsPlace.PlaceStatus = PlaceStatus.CUNHUO;
- // await _wmsPlaceRep.UpdateAsync(wmsPlace);
+// // // 鏇存柊搴撲綅鐘舵�佷负瀛樿揣
+// // wmsPlace.PlaceStatus = PlaceStatus.CUNHUO;
+// // await _wmsPlaceRep.UpdateAsync(wmsPlace);
- // // 鏇存柊鎵樼洏鐘舵�佷负鈥滃簱浣嶁��
- // wmsContainer.ContainerStatus = ContainerStatus.KUWEI;
- // await _wmsContainerRep.UpdateAsync(wmsContainer);
+// // // 鏇存柊鎵樼洏鐘舵�佷负鈥滃簱浣嶁��
+// // wmsContainer.ContainerStatus = ContainerStatus.KUWEI;
+// // await _wmsContainerRep.UpdateAsync(wmsContainer);
- // // 鐗╂枡涓庢墭鐩樺叧绯�
- // var wmsMaterialContainer = await _wmsMaterialContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode
- // && z.MaterialNo == wmsOrderDetails.MaterialNo && z.BindStatus == CommonStatus.ENABLE);
+// // // 鐗╂枡涓庢墭鐩樺叧绯�
+// // var wmsMaterialContainer = await _wmsMaterialContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode
+// // && z.MaterialNo == wmsOrderDetails.MaterialNo && z.BindStatus == CommonStatus.ENABLE);
- // // 鎵樼洏涓庡簱浣嶅叧绯�
- // var wmsContainerPlace = new WmsContainerPlace()
- // {
- // PlaceId = wmsPlace.Id,
- // PlaceCode = wmsPlace.PlaceCode,
- // ContainerId = wmsContainer.Id,
- // ContainerCode = wmsContainer.ContainerCode,
- // ContainerPlaceStatus = CommonStatus.ENABLE
- // };
- // await _wmsContainerPlaceRep.InsertAsync(wmsContainerPlace);
+// // // 鎵樼洏涓庡簱浣嶅叧绯�
+// // var wmsContainerPlace = new WmsContainerPlace()
+// // {
+// // PlaceId = wmsPlace.Id,
+// // PlaceCode = wmsPlace.PlaceCode,
+// // ContainerId = wmsContainer.Id,
+// // ContainerCode = wmsContainer.ContainerCode,
+// // ContainerPlaceStatus = CommonStatus.ENABLE
+// // };
+// // await _wmsContainerPlaceRep.InsertAsync(wmsContainerPlace);
- // // 娣诲姞搴撳瓨
- // var StockModel = await _wmsMaterialStockRep.Where(p => p.ContainerCode == wmsTask.ContainerCode
- // && p.MaterialNo == wmsOrderDetails.MaterialNo && p.MaterialBatch == wmsOrderDetails.Batch).FirstOrDefaultAsync();
- // if (StockModel != null)
- // {
- // StockModel.MaterialDensity = wmsOrderDetails.MaterialDensity;
- // StockModel.PlaceCode = wmsTask.ToPlace;
- // StockModel.AreaId = wmsPlace.AreaId;
- // StockModel.StockNumber = wmsOrderDetails.OrderQuantity;
- // await _wmsMaterialStockRep.UpdateAsync(StockModel);
- // }
- // else
- // {
- // StockModel = new WmsMaterialStock()
- // {
- // MaterialNo = wmsOrderDetails.MaterialNo,
- // MaterialType = wmsOrderDetails.MaterialType,
- // MaterialName = "N/A",
- // Long = wmsOrderDetails.Long,
- // Wide = wmsOrderDetails.Wide,
- // High = wmsOrderDetails.High,
- // MaterialSpec = wmsOrderDetails.Long + "*" + wmsOrderDetails.Wide + "*" + wmsOrderDetails.High,
- // MaterialBatch = wmsOrderDetails.Batch,
- // MaterialDensity = wmsOrderDetails.MaterialDensity,
- // //InspectionMethod = item.WmsMaterial.InspectionMethod,
- // //UnitType = item.WmsMaterial.UnitType,
- // //UnitNo = item.WmsMaterial.UnitNo,
- // StockNumber = wmsOrderDetails.OrderQuantity,
- // PlaceCode = wmsTask.ToPlace,
- // ContainerId = wmsContainer.Id,
- // ContainerCode = wmsContainer.ContainerCode,
- // AreaId = wmsPlace.AreaId,
- // };
- // await _wmsMaterialStockRep.InsertAsync(StockModel);
- // }
- // }
- // else if (wmsTask.TaskType == TaskType.CHUKU) //鍑哄簱浠诲姟
- // {
- // var taskStatusList = new List<TaskDodeviceStatusEnum> { TaskDodeviceStatusEnum.ZX_DDJ, TaskDodeviceStatusEnum.WC_DDJ };
- // if (!taskStatusList.Contains(wmsTask.TaskDodeviceStatus)) throw Oops.Oh("鍙湁鍫嗗灈鏈烘墽琛�,鍫嗗灈鏈哄畬鎴愭墠鑳藉己鍒跺畬鎴愶紒");
- // // 鏌ヨ鎵樼洏淇℃伅
- // var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode);
- // if (wmsContainer == null) throw Oops.Oh("鎵樼洏淇℃伅涓嶅瓨鍦�!");
+// // // 娣诲姞搴撳瓨
+// // var StockModel = await _wmsMaterialStockRep.Where(p => p.ContainerCode == wmsTask.ContainerCode
+// // && p.MaterialNo == wmsOrderDetails.MaterialNo && p.MaterialBatch == wmsOrderDetails.Batch).FirstOrDefaultAsync();
+// // if (StockModel != null)
+// // {
+// // StockModel.MaterialDensity = wmsOrderDetails.MaterialDensity;
+// // StockModel.PlaceCode = wmsTask.ToPlace;
+// // StockModel.AreaId = wmsPlace.AreaId;
+// // StockModel.StockNumber = wmsOrderDetails.OrderQuantity;
+// // await _wmsMaterialStockRep.UpdateAsync(StockModel);
+// // }
+// // else
+// // {
+// // StockModel = new WmsMaterialStock()
+// // {
+// // MaterialNo = wmsOrderDetails.MaterialNo,
+// // MaterialType = wmsOrderDetails.MaterialType,
+// // MaterialName = "N/A",
+// // Long = wmsOrderDetails.Long,
+// // Wide = wmsOrderDetails.Wide,
+// // High = wmsOrderDetails.High,
+// // MaterialSpec = wmsOrderDetails.Long + "*" + wmsOrderDetails.Wide + "*" + wmsOrderDetails.High,
+// // MaterialBatch = wmsOrderDetails.Batch,
+// // MaterialDensity = wmsOrderDetails.MaterialDensity,
+// // //InspectionMethod = item.WmsMaterial.InspectionMethod,
+// // //UnitType = item.WmsMaterial.UnitType,
+// // //UnitNo = item.WmsMaterial.UnitNo,
+// // StockNumber = wmsOrderDetails.OrderQuantity,
+// // PlaceCode = wmsTask.ToPlace,
+// // ContainerId = wmsContainer.Id,
+// // ContainerCode = wmsContainer.ContainerCode,
+// // AreaId = wmsPlace.AreaId,
+// // };
+// // await _wmsMaterialStockRep.InsertAsync(StockModel);
+// // }
+// // }
+// // else if (wmsTask.TaskType == TaskType.CHUKU) //鍑哄簱浠诲姟
+// // {
+// // var taskStatusList = new List<TaskDodeviceStatusEnum> { TaskDodeviceStatusEnum.ZX_DDJ, TaskDodeviceStatusEnum.WC_DDJ };
+// // if (!taskStatusList.Contains(wmsTask.TaskDodeviceStatus)) throw Oops.Oh("鍙湁鍫嗗灈鏈烘墽琛�,鍫嗗灈鏈哄畬鎴愭墠鑳藉己鍒跺畬鎴愶紒");
+// // // 鏌ヨ鎵樼洏淇℃伅
+// // var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode);
+// // if (wmsContainer == null) throw Oops.Oh("鎵樼洏淇℃伅涓嶅瓨鍦�!");
- // // 鏌ヨ搴撲綅淇℃伅
- // var wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.PlaceCode == wmsTask.SourcePlace);
- // if (wmsPlace == 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)
- // {
- // // 绂佺敤鎵樼洏搴撲綅鍏崇郴
- // wmsContainerPlace.ContainerPlaceStatus = CommonStatus.DELETED;
- // await _wmsContainerPlaceRep.UpdateAsync(wmsContainerPlace);
- // }
- // // 鏍规嵁浠诲姟琛ㄤ腑鐨勫崟鎹槑缁咺d鏌ヨ鍗曟嵁鏄庣粏淇℃伅
- // var wmsOrderDetails = await _wmsOrderDetailsRep.FirstOrDefaultAsync(z => z.Id == wmsTask.OrderDetailsId);
+// // // 鏌ヨ搴撲綅淇℃伅
+// // var wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.PlaceCode == wmsTask.SourcePlace);
+// // if (wmsPlace == 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)
+// // {
+// // // 绂佺敤鎵樼洏搴撲綅鍏崇郴
+// // wmsContainerPlace.ContainerPlaceStatus = CommonStatus.DELETED;
+// // await _wmsContainerPlaceRep.UpdateAsync(wmsContainerPlace);
+// // }
+// // // 鏍规嵁浠诲姟琛ㄤ腑鐨勫崟鎹槑缁咺d鏌ヨ鍗曟嵁鏄庣粏淇℃伅
+// // var wmsOrderDetails = await _wmsOrderDetailsRep.FirstOrDefaultAsync(z => z.Id == wmsTask.OrderDetailsId);
- // wmsTask.TaskStatus = TaskStatusEnum.ZHIXINGZHONG;
- // wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.ZX_RGV;
- // wmsTask.IsRead = false;
- // await _wmsTaskRep.UpdateAsync(wmsTask);
+// // wmsTask.TaskStatus = TaskStatusEnum.ZHIXINGZHONG;
+// // wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.ZX_RGV;
+// // wmsTask.IsRead = false;
+// // await _wmsTaskRep.UpdateAsync(wmsTask);
- // // 鏌ヨ鏄惁宸插瓨鍦ㄧ墿鏂欎笌鎵樼洏鍏崇郴
- // var wmsMaterialContainer = await _wmsMaterialContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode
- // && z.MaterialNo == wmsOrderDetails.MaterialNo && z.BindStatus == CommonStatus.ENABLE);
- // //鍏ュ簱鏃剁粍鐩樹俊鎭�昏緫鍒犻櫎
- // if (wmsMaterialContainer != null)
- // {
- // wmsMaterialContainer.BindStatus = CommonStatus.DELETED;
- // await _wmsMaterialContainerRep.UpdateAsync(wmsMaterialContainer);
- // //鏂板鍑哄簱缁戝畾璁板綍 姝ｅ父
- // var enable = new WmsMaterialContainer()
- // {
- // ContainerId = wmsContainer.Id,
- // ContainerCode = wmsContainer.ContainerCode,
- // MaterialId = YitIdHelper.NextId(), //绯荤粺鐢熸垚鐨処d
- // MaterialName = "N/A",
- // MaterialNo = wmsMaterialContainer.MaterialNo,
- // MaterialBatch = wmsMaterialContainer.MaterialBatch,
- // MaterialDensity = wmsMaterialContainer.MaterialDensity,
- // MaterialSpec = wmsOrderDetails.Long + "*" + wmsOrderDetails.Wide + "*" + wmsOrderDetails.High,
- // BindQuantity = 1, //涓�涓簱浣嶅彧鏈変竴涓墿鏂�
- // OrderNo = wmsMaterialContainer.OrderNo,
- // OrderDetailsId = wmsMaterialContainer.OrderDetailsId,
- // BindStatus = CommonStatus.ENABLE
- // };
- // await _wmsMaterialContainerRep.InsertAsync(enable);
- // }
- // //鏇存柊搴撳瓨
- // var stockModel = await _wmsMaterialStockRep.Where(p => p.ContainerCode == wmsTask.ContainerCode && p.PlaceCode == wmsTask.SourcePlace
- // && p.MaterialNo == wmsOrderDetails.MaterialNo && p.MaterialBatch == wmsOrderDetails.Batch).FirstOrDefaultAsync();
- // if (stockModel != null)
- // {
- // await _wmsMaterialStockRep.DeleteAsync(stockModel);
- // }
- // // 鏇存柊搴撲綅鐘舵�佷负鈥滅┖闂测��
- // wmsPlace.PlaceStatus = PlaceStatus.KONGXIAN;
- // await _wmsPlaceRep.UpdateAsync(wmsPlace);
+// // // 鏌ヨ鏄惁宸插瓨鍦ㄧ墿鏂欎笌鎵樼洏鍏崇郴
+// // var wmsMaterialContainer = await _wmsMaterialContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode
+// // && z.MaterialNo == wmsOrderDetails.MaterialNo && z.BindStatus == CommonStatus.ENABLE);
+// // //鍏ュ簱鏃剁粍鐩樹俊鎭�昏緫鍒犻櫎
+// // if (wmsMaterialContainer != null)
+// // {
+// // wmsMaterialContainer.BindStatus = CommonStatus.DELETED;
+// // await _wmsMaterialContainerRep.UpdateAsync(wmsMaterialContainer);
+// // //鏂板鍑哄簱缁戝畾璁板綍 姝ｅ父
+// // var enable = new WmsMaterialContainer()
+// // {
+// // ContainerId = wmsContainer.Id,
+// // ContainerCode = wmsContainer.ContainerCode,
+// // MaterialId = YitIdHelper.NextId(), //绯荤粺鐢熸垚鐨処d
+// // MaterialName = "N/A",
+// // MaterialNo = wmsMaterialContainer.MaterialNo,
+// // MaterialBatch = wmsMaterialContainer.MaterialBatch,
+// // MaterialDensity = wmsMaterialContainer.MaterialDensity,
+// // MaterialSpec = wmsOrderDetails.Long + "*" + wmsOrderDetails.Wide + "*" + wmsOrderDetails.High,
+// // BindQuantity = 1, //涓�涓簱浣嶅彧鏈変竴涓墿鏂�
+// // OrderNo = wmsMaterialContainer.OrderNo,
+// // OrderDetailsId = wmsMaterialContainer.OrderDetailsId,
+// // BindStatus = CommonStatus.ENABLE
+// // };
+// // await _wmsMaterialContainerRep.InsertAsync(enable);
+// // }
+// // //鏇存柊搴撳瓨
+// // var stockModel = await _wmsMaterialStockRep.Where(p => p.ContainerCode == wmsTask.ContainerCode && p.PlaceCode == wmsTask.SourcePlace
+// // && p.MaterialNo == wmsOrderDetails.MaterialNo && p.MaterialBatch == wmsOrderDetails.Batch).FirstOrDefaultAsync();
+// // if (stockModel != null)
+// // {
+// // await _wmsMaterialStockRep.DeleteAsync(stockModel);
+// // }
+// // // 鏇存柊搴撲綅鐘舵�佷负鈥滅┖闂测��
+// // wmsPlace.PlaceStatus = PlaceStatus.KONGXIAN;
+// // await _wmsPlaceRep.UpdateAsync(wmsPlace);
- // //鏇存柊鎵樼洏鐘舵�佷负鈥滅┖闂测��
- // wmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
- // await _wmsContainerRep.UpdateAsync(wmsContainer);
- // }
- // else //绉诲簱浠诲姟
- // {
- // var taskStatusList = new List<TaskDodeviceStatusEnum> { TaskDodeviceStatusEnum.ZX_DDJ, TaskDodeviceStatusEnum.WC_DDJ };
- // if (!taskStatusList.Contains(wmsTask.TaskDodeviceStatus)) throw Oops.Oh("鍙湁鍫嗗灈鏈烘墽琛�,鍫嗗灈鏈哄畬鎴愭墠鑳藉己鍒跺畬鎴愶紒");
- // // 鏌ヨ鎵樼洏
- // var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode);
- // if (wmsContainer == null) throw Oops.Oh("鎵樼洏淇℃伅涓嶅瓨鍦�!");
+// // //鏇存柊鎵樼洏鐘舵�佷负鈥滅┖闂测��
+// // wmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
+// // await _wmsContainerRep.UpdateAsync(wmsContainer);
+// // }
+// // else //绉诲簱浠诲姟
+// // {
+// // var taskStatusList = new List<TaskDodeviceStatusEnum> { TaskDodeviceStatusEnum.ZX_DDJ, TaskDodeviceStatusEnum.WC_DDJ };
+// // if (!taskStatusList.Contains(wmsTask.TaskDodeviceStatus)) throw Oops.Oh("鍙湁鍫嗗灈鏈烘墽琛�,鍫嗗灈鏈哄畬鎴愭墠鑳藉己鍒跺畬鎴愶紒");
+// // // 鏌ヨ鎵樼洏
+// // var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode);
+// // if (wmsContainer == null) throw Oops.Oh("鎵樼洏淇℃伅涓嶅瓨鍦�!");
- // wmsTask.TaskStatus = TaskStatusEnum.WANCHENG;
- // wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.W;
- // wmsTask.IsRead = false;
- // // 璧风偣搴撲綅淇℃伅
- // var SourcePlace = await _wmsPlaceRep.Where(z => z.PlaceCode == wmsTask.SourcePlace).FirstOrDefaultAsync();
- // SourcePlace.PlaceStatus = PlaceStatus.KONGXIAN;
- // await _wmsPlaceRep.UpdateAsync(SourcePlace);
- // //鐩爣搴撲綅淇℃伅
- // var ToPlace = await _wmsPlaceRep.Where(z => z.PlaceCode == wmsTask.ToPlace).FirstOrDefaultAsync();
- // ToPlace.PlaceStatus = PlaceStatus.CUNHUO;
- // await _wmsPlaceRep.UpdateAsync(ToPlace);
- // //鎵樼洏搴撲綅鍏崇郴琛�
- // var wmsContainerPlace = await _wmsContainerPlaceRep.FirstOrDefaultAsync(z => z.PlaceId == SourcePlace.Id && z.PlaceCode == SourcePlace.PlaceCode
- // && z.ContainerCode == wmsTask.ContainerCode && z.ContainerPlaceStatus == CommonStatus.ENABLE);
- // wmsContainerPlace.ContainerPlaceStatus = CommonStatus.DELETED;
- // await _wmsContainerPlaceRep.UpdateAsync(wmsContainerPlace);
- // await _wmsContainerPlaceRep.InsertAsync(new WmsContainerPlace()
- // {
- // PlaceId = ToPlace.Id,
- // PlaceCode = ToPlace.PlaceCode,
- // ContainerId = wmsContainer.Id,
- // ContainerCode = wmsContainer.ContainerCode,
- // ContainerPlaceStatus = CommonStatus.ENABLE
- // });
- // //搴撳瓨搴撲綅鏇存柊
- // var stockModel = await _wmsMaterialStockRep.Where(p => p.ContainerCode == wmsTask.ContainerCode && p.PlaceCode == SourcePlace.PlaceCode).FirstOrDefaultAsync();
- // if (stockModel != null)
- // {
- // stockModel.PlaceCode = ToPlace.PlaceCode;
- // }
- // }
- //}
+// // wmsTask.TaskStatus = TaskStatusEnum.WANCHENG;
+// // wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.W;
+// // wmsTask.IsRead = false;
+// // // 璧风偣搴撲綅淇℃伅
+// // var SourcePlace = await _wmsPlaceRep.Where(z => z.PlaceCode == wmsTask.SourcePlace).FirstOrDefaultAsync();
+// // SourcePlace.PlaceStatus = PlaceStatus.KONGXIAN;
+// // await _wmsPlaceRep.UpdateAsync(SourcePlace);
+// // //鐩爣搴撲綅淇℃伅
+// // var ToPlace = await _wmsPlaceRep.Where(z => z.PlaceCode == wmsTask.ToPlace).FirstOrDefaultAsync();
+// // ToPlace.PlaceStatus = PlaceStatus.CUNHUO;
+// // await _wmsPlaceRep.UpdateAsync(ToPlace);
+// // //鎵樼洏搴撲綅鍏崇郴琛�
+// // var wmsContainerPlace = await _wmsContainerPlaceRep.FirstOrDefaultAsync(z => z.PlaceId == SourcePlace.Id && z.PlaceCode == SourcePlace.PlaceCode
+// // && z.ContainerCode == wmsTask.ContainerCode && z.ContainerPlaceStatus == CommonStatus.ENABLE);
+// // wmsContainerPlace.ContainerPlaceStatus = CommonStatus.DELETED;
+// // await _wmsContainerPlaceRep.UpdateAsync(wmsContainerPlace);
+// // await _wmsContainerPlaceRep.InsertAsync(new WmsContainerPlace()
+// // {
+// // PlaceId = ToPlace.Id,
+// // PlaceCode = ToPlace.PlaceCode,
+// // ContainerId = wmsContainer.Id,
+// // ContainerCode = wmsContainer.ContainerCode,
+// // ContainerPlaceStatus = CommonStatus.ENABLE
+// // });
+// // //搴撳瓨搴撲綅鏇存柊
+// // var stockModel = await _wmsMaterialStockRep.Where(p => p.ContainerCode == wmsTask.ContainerCode && p.PlaceCode == SourcePlace.PlaceCode).FirstOrDefaultAsync();
+// // if (stockModel != null)
+// // {
+// // stockModel.PlaceCode = ToPlace.PlaceCode;
+// // }
+// // }
+// //}
- /// <summary>
- /// 鍙栨秷浠诲姟
- /// </summary>
- /// <returns></returns>
- [HttpPost("CancelTask")]
- [UnitOfWork]
- [AllowAnonymous]
- public async Task CancelTask([FromBody] FinishTaskInput input)
- {
- var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.TaskNo == input.TaskNo);
- if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
- if (wmsTask.TaskStatus == TaskStatusEnum.WANCHENG) throw Oops.Oh("浠诲姟宸插畬鎴愶紝鍙栨秷澶辫触锛�");
- if (wmsTask.TaskType == TaskType.RUKU) // 鍏ュ簱浠诲姟
- {
- //var statusList = new List<TaskDodeviceStatusEnum> {TaskDodeviceStatusEnum.ZX_RSSX, TaskDodeviceStatusEnum.WC_RSSX,TaskDodeviceStatusEnum.WZX };
- //if (!statusList.Contains(wmsTask.TaskDodeviceStatus)) throw Oops.Oh("鍙湁鍏ュ簱杈撻�佺嚎鎵ц,鍏ュ簱杈撻�佺嚎瀹屾垚鎴栬�呰澶囨湭鎵ц鎵嶈兘寮哄埗鍙栨秷锛�");
- //鏇存柊鍗曟嵁鏄庣粏鐘舵�佷负鏈墽琛屻�佹洿鏂版墭鐩樼紪鍙枫�佹洿鏂板簱浣嶇紪鍙�
- var wmsOrderDetails = await _wmsOrderDetailsRep.Where(z => z.Id == wmsTask.OrderDetailsId).ProjectToType<WmsOrderDetails>().FirstOrDefaultAsync();
- if (wmsOrderDetails != null)
- {
- wmsOrderDetails.OrderStatus = OrderDetailsStatusEnum.WEIZHIXING;
- await _wmsOrderDetailsRep.UpdateNowAsync(wmsOrderDetails);
- }
- //鏌ヨ搴撲綅
- var wmsPlace = await _wmsPlaceRep.DetachedEntities.Where(u => u.PlaceCode == wmsTask.ToPlace && u.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN).ProjectToType<WmsPlace>().FirstOrDefaultAsync();
- if (wmsPlace != null)
- {
- // 鏇存柊搴撲綅鐘舵�佷负绌洪棽
- wmsPlace.PlaceStatus = PlaceStatus.KONGXIAN;
- await _wmsPlaceRep.UpdateAsync(wmsPlace);
- }
- var materialContainer = await _wmsMaterialContainerRep.Where(p => p.ContainerCode == wmsTask.ContainerCode && p.BindStatus == CommonStatus.ENABLE).FirstOrDefaultAsync();
- if (materialContainer != null)
- {
- await _wmsMaterialContainerRep.DeleteNowAsync(materialContainer);
- }
- // 鏌ヨ鎵樼洏
- var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode);
- if (wmsContainer != null)
- {
- wmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
- await _wmsContainerRep.UpdateAsync(wmsContainer);
- }
- // 鏇存柊浠诲姟鐘舵��
- wmsTask.TaskStatus = TaskStatusEnum.WEIZHIXING;
- wmsTask.IsRead = false;
- wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.WZX;
- wmsTask.ToPlace = "";
- await _wmsTaskRep.UpdateAsync(wmsTask);
- }
- else if (wmsTask.TaskType == TaskType.CHUKU) //鍑哄簱浠诲姟
- {
- var statusList = new List<TaskDodeviceStatusEnum> { TaskDodeviceStatusEnum.WZX, TaskDodeviceStatusEnum.ZX_DDJ };
- if (!statusList.Contains(wmsTask.TaskDodeviceStatus)) throw Oops.Oh("鍙湁鍫嗗灈鏈烘墽琛屼腑鎴栬澶囨湭鎵ц鎵嶈兘寮哄埗鍙栨秷锛�");
- // 鏌ヨ搴撲綅淇℃伅
- var wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.PlaceCode == wmsTask.SourcePlace);
- if (wmsPlace == 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("搴撲綅瀹瑰櫒鍏崇郴涓嶅瓨鍦�!");
- // 鏍规嵁浠诲姟琛ㄤ腑鐨勫崟鎹槑缁咺d鏌ヨ鍗曟嵁鏄庣粏淇℃伅
- var wmsOrderDetails = await _wmsOrderDetailsRep.FirstOrDefaultAsync(z => z.Id == wmsTask.OrderDetailsId);
- //淇敼鍗曟嵁鏄庣粏,浠诲姟鐘舵��,璁惧浠诲姟鐘舵�佷负鏈墽琛�
- wmsOrderDetails.OrderStatus = OrderDetailsStatusEnum.WEIZHIXING;
- await _wmsOrderDetailsRep.UpdateNowAsync(wmsOrderDetails);
- wmsTask.TaskStatus = TaskStatusEnum.WEIZHIXING;
- wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.WZX;
- await _wmsTaskRep.UpdateAsync(wmsTask);
- // 鏇存柊搴撲綅鐘舵�佷负瀛樿揣
- wmsPlace.PlaceStatus = PlaceStatus.CUNHUO;
- await _wmsPlaceRep.UpdateAsync(wmsPlace);
- }
- else //绉诲簱浠诲姟
- {
- var statusList = new List<TaskDodeviceStatusEnum> { TaskDodeviceStatusEnum.WZX, TaskDodeviceStatusEnum.ZX_DDJ };
- if (!statusList.Contains(wmsTask.TaskDodeviceStatus)) throw Oops.Oh("鍙湁鍫嗗灈鏈烘墽琛屼腑锛岃澶囨湭鎵ц鎵嶈兘寮哄埗鍙栨秷锛�");
- // 鏌ヨ鎵樼洏
- var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode);
- if (wmsContainer == null) throw Oops.Oh("鎵樼洏淇℃伅涓嶅瓨鍦�!");
- //鍒犻櫎浠诲姟
- await _wmsTaskRep.DeleteAsync(wmsTask);
- // 璧风偣搴撲綅淇℃伅
- var SourcePlace = await _wmsPlaceRep.Where(z => z.PlaceCode == wmsTask.SourcePlace).FirstOrDefaultAsync();
- SourcePlace.PlaceStatus = PlaceStatus.CUNHUO;
- await _wmsPlaceRep.UpdateAsync(SourcePlace);
- //鐩爣搴撲綅淇℃伅
- var ToPlace = await _wmsPlaceRep.Where(z => z.PlaceCode == wmsTask.ToPlace).FirstOrDefaultAsync();
- ToPlace.PlaceStatus = PlaceStatus.KONGXIAN;
- await _wmsPlaceRep.UpdateAsync(ToPlace);
- }
- }
+// /// <summary>
+// /// 鍙栨秷浠诲姟
+// /// </summary>
+// /// <returns></returns>
+// [HttpPost("CancelTask")]
+// [UnitOfWork]
+// [AllowAnonymous]
+// public async Task CancelTask([FromBody] FinishTaskInput input)
+// {
+// var wmsTask = await _wmsTaskRep.FirstOrDefaultAsync(u => u.TaskNo == input.TaskNo);
+// if (wmsTask == null) throw Oops.Oh("浠诲姟涓嶅瓨鍦紒");
+// if (wmsTask.TaskStatus == TaskStatusEnum.WANCHENG) throw Oops.Oh("浠诲姟宸插畬鎴愶紝鍙栨秷澶辫触锛�");
+// if (wmsTask.TaskType == TaskType.RUKU) // 鍏ュ簱浠诲姟
+// {
+// //var statusList = new List<TaskDodeviceStatusEnum> {TaskDodeviceStatusEnum.ZX_RSSX, TaskDodeviceStatusEnum.WC_RSSX,TaskDodeviceStatusEnum.WZX };
+// //if (!statusList.Contains(wmsTask.TaskDodeviceStatus)) throw Oops.Oh("鍙湁鍏ュ簱杈撻�佺嚎鎵ц,鍏ュ簱杈撻�佺嚎瀹屾垚鎴栬�呰澶囨湭鎵ц鎵嶈兘寮哄埗鍙栨秷锛�");
+// //鏇存柊鍗曟嵁鏄庣粏鐘舵�佷负鏈墽琛屻�佹洿鏂版墭鐩樼紪鍙枫�佹洿鏂板簱浣嶇紪鍙�
+// var wmsOrderDetails = await _wmsOrderDetailsRep.Where(z => z.Id == wmsTask.OrderDetailsId).ProjectToType<WmsOrderDetails>().FirstOrDefaultAsync();
+// if (wmsOrderDetails != null)
+// {
+// wmsOrderDetails.OrderStatus = OrderDetailsStatusEnum.WEIZHIXING;
+// await _wmsOrderDetailsRep.UpdateNowAsync(wmsOrderDetails);
+// }
+// //鏌ヨ搴撲綅
+// var wmsPlace = await _wmsPlaceRep.DetachedEntities.Where(u => u.PlaceCode == wmsTask.ToPlace && u.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN).ProjectToType<WmsPlace>().FirstOrDefaultAsync();
+// if (wmsPlace != null)
+// {
+// // 鏇存柊搴撲綅鐘舵�佷负绌洪棽
+// wmsPlace.PlaceStatus = PlaceStatus.KONGXIAN;
+// await _wmsPlaceRep.UpdateAsync(wmsPlace);
+// }
+// var materialContainer = await _wmsMaterialContainerRep.Where(p => p.ContainerCode == wmsTask.ContainerCode && p.BindStatus == CommonStatus.ENABLE).FirstOrDefaultAsync();
+// if (materialContainer != null)
+// {
+// await _wmsMaterialContainerRep.DeleteNowAsync(materialContainer);
+// }
+// // 鏌ヨ鎵樼洏
+// var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode);
+// if (wmsContainer != null)
+// {
+// wmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
+// await _wmsContainerRep.UpdateAsync(wmsContainer);
+// }
+// // 鏇存柊浠诲姟鐘舵��
+// wmsTask.TaskStatus = TaskStatusEnum.WEIZHIXING;
+// wmsTask.IsRead = false;
+// wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.WZX;
+// wmsTask.ToPlace = "";
+// await _wmsTaskRep.UpdateAsync(wmsTask);
+// }
+// else if (wmsTask.TaskType == TaskType.CHUKU) //鍑哄簱浠诲姟
+// {
+// var statusList = new List<TaskDodeviceStatusEnum> { TaskDodeviceStatusEnum.WZX, TaskDodeviceStatusEnum.ZX_DDJ };
+// if (!statusList.Contains(wmsTask.TaskDodeviceStatus)) throw Oops.Oh("鍙湁鍫嗗灈鏈烘墽琛屼腑鎴栬澶囨湭鎵ц鎵嶈兘寮哄埗鍙栨秷锛�");
+// // 鏌ヨ搴撲綅淇℃伅
+// var wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.PlaceCode == wmsTask.SourcePlace);
+// if (wmsPlace == 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("搴撲綅瀹瑰櫒鍏崇郴涓嶅瓨鍦�!");
+// // 鏍规嵁浠诲姟琛ㄤ腑鐨勫崟鎹槑缁咺d鏌ヨ鍗曟嵁鏄庣粏淇℃伅
+// var wmsOrderDetails = await _wmsOrderDetailsRep.FirstOrDefaultAsync(z => z.Id == wmsTask.OrderDetailsId);
+// //淇敼鍗曟嵁鏄庣粏,浠诲姟鐘舵��,璁惧浠诲姟鐘舵�佷负鏈墽琛�
+// wmsOrderDetails.OrderStatus = OrderDetailsStatusEnum.WEIZHIXING;
+// await _wmsOrderDetailsRep.UpdateNowAsync(wmsOrderDetails);
+// wmsTask.TaskStatus = TaskStatusEnum.WEIZHIXING;
+// wmsTask.TaskDodeviceStatus = TaskDodeviceStatusEnum.WZX;
+// await _wmsTaskRep.UpdateAsync(wmsTask);
+// // 鏇存柊搴撲綅鐘舵�佷负瀛樿揣
+// wmsPlace.PlaceStatus = PlaceStatus.CUNHUO;
+// await _wmsPlaceRep.UpdateAsync(wmsPlace);
+// }
+// else //绉诲簱浠诲姟
+// {
+// var statusList = new List<TaskDodeviceStatusEnum> { TaskDodeviceStatusEnum.WZX, TaskDodeviceStatusEnum.ZX_DDJ };
+// if (!statusList.Contains(wmsTask.TaskDodeviceStatus)) throw Oops.Oh("鍙湁鍫嗗灈鏈烘墽琛屼腑锛岃澶囨湭鎵ц鎵嶈兘寮哄埗鍙栨秷锛�");
+// // 鏌ヨ鎵樼洏
+// var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(z => z.ContainerCode == wmsTask.ContainerCode);
+// if (wmsContainer == null) throw Oops.Oh("鎵樼洏淇℃伅涓嶅瓨鍦�!");
+// //鍒犻櫎浠诲姟
+// await _wmsTaskRep.DeleteAsync(wmsTask);
+// // 璧风偣搴撲綅淇℃伅
+// var SourcePlace = await _wmsPlaceRep.Where(z => z.PlaceCode == wmsTask.SourcePlace).FirstOrDefaultAsync();
+// SourcePlace.PlaceStatus = PlaceStatus.CUNHUO;
+// await _wmsPlaceRep.UpdateAsync(SourcePlace);
+// //鐩爣搴撲綅淇℃伅
+// var ToPlace = await _wmsPlaceRep.Where(z => z.PlaceCode == wmsTask.ToPlace).FirstOrDefaultAsync();
+// ToPlace.PlaceStatus = PlaceStatus.KONGXIAN;
+// await _wmsPlaceRep.UpdateAsync(ToPlace);
+// }
+// }
- /// <summary>
- /// wcs璇诲彇鎺ュ彛鍒ゆ柇鐗╂枡鏄惁缁勭洏鍑哄簱 true浠ｈ〃宸茬粡缁勭洏鍑哄簱
- /// </summary>
- /// <returns></returns>
- [HttpGet("CheckPack")]
- [AllowAnonymous]
- [NonAction]
- public async Task<bool> CheckPack()
- {
- var packList = await _lesPackWarehouseRep.Where(p => p.LesPackState == LesPackState.WEICHUKU).Select(n => n.OrderNo).Distinct().ToListAsync();
- if (packList.Count >= 2) return false;
- else return true;
- }
+// /// <summary>
+// /// wcs璇诲彇鎺ュ彛鍒ゆ柇鐗╂枡鏄惁缁勭洏鍑哄簱 true浠ｈ〃宸茬粡缁勭洏鍑哄簱
+// /// </summary>
+// /// <returns></returns>
+// [HttpGet("CheckPack")]
+// [AllowAnonymous]
+// [NonAction]
+// public async Task<bool> CheckPack()
+// {
+// var packList = await _lesPackWarehouseRep.Where(p => p.LesPackState == LesPackState.WEICHUKU).Select(n => n.OrderNo).Distinct().ToListAsync();
+// if (packList.Count >= 2) return false;
+// else return true;
+// }
- /// <summary>
- /// 璁惧鎶ヨ淇℃伅
- /// </summary>
- /// <returns></returns>
- [HttpPost("AddDeviceWaring")]
- [AllowAnonymous]
- [NonAction]
- public async Task AddDeviceWaring(AddDeviceWaringInput input)
- {
- //鍒ゆ柇wcsid鏄惁瀛樺湪
- var lesDeviceWaring = await _lesDeviceWaringRep.FirstOrDefaultAsync(u => u.WcsId == input.WcsId);
- if (lesDeviceWaring != null)
- {
- await _lesDeviceWaringRep.UpdateAsync(lesDeviceWaring);
- }
- else
- {
- lesDeviceWaring = input.Adapt<LesDeviceWaring>();
- await _lesDeviceWaringRep.InsertAsync(lesDeviceWaring);
- }
- }
+// /// <summary>
+// /// 璁惧鎶ヨ淇℃伅
+// /// </summary>
+// /// <returns></returns>
+// [HttpPost("AddDeviceWaring")]
+// [AllowAnonymous]
+// [NonAction]
+// public async Task AddDeviceWaring(AddDeviceWaringInput input)
+// {
+// //鍒ゆ柇wcsid鏄惁瀛樺湪
+// var lesDeviceWaring = await _lesDeviceWaringRep.FirstOrDefaultAsync(u => u.WcsId == input.WcsId);
+// if (lesDeviceWaring != null)
+// {
+// await _lesDeviceWaringRep.UpdateAsync(lesDeviceWaring);
+// }
+// else
+// {
+// lesDeviceWaring = input.Adapt<LesDeviceWaring>();
+// await _lesDeviceWaringRep.InsertAsync(lesDeviceWaring);
+// }
+// }
- #region 鍏敤鏂规硶
- /// <summary>
- /// 鏍规嵁宸烽亾鑾峰彇澶栦晶绗竴鎺�
- /// </summary>
- /// <param name="Aisle"></param>
- /// <returns></returns>
- [NonAction]
- public int GetOneRowByAisle(int Aisle)
- {
- if (Aisle >= 7)
- {
- return 1;
- }
- return (Aisle - 1) * 4 + 1;
- }
- /// <summary>
- /// 鏍规嵁宸烽亾鑾峰彇鍐呬晶绗簩鎺�
- /// </summary>
- /// <param name="Aisle"></param>
- /// <returns></returns>
- [NonAction]
- public int GetTwoRowByAisle(int Aisle)
- {
- if (Aisle >= 7)
- {
- return 2;
- }
- return (Aisle - 1) * 4 + 2;
- }
- /// <summary>
- /// 鏍规嵁宸烽亾鑾峰彇澶栦晶绗簩鎺�
- /// </summary>
- /// <param name="Aisle"></param>
- /// <returns></returns>
- [NonAction]
- public int GetThreeRowByAisle(int Aisle)
- {
- if (Aisle >= 7)
- {
- return 3;
- }
- return (Aisle - 1) * 4 + 3;
- }
- /// <summary>
- /// 鏍规嵁宸烽亾鑾峰彇澶栦晶绗竴鎺�
- /// </summary>
- /// <param name="Aisle"></param>
- /// <returns></returns>
- [NonAction]
- public int GetFourRowByAisle(int Aisle)
- {
- if (Aisle >= 7)
- {
- return 4;
- }
- return (Aisle - 1) * 4 + 4;
- }
- #endregion
- }
-}
+// #region 鍏敤鏂规硶
+// /// <summary>
+// /// 鏍规嵁宸烽亾鑾峰彇澶栦晶绗竴鎺�
+// /// </summary>
+// /// <param name="Aisle"></param>
+// /// <returns></returns>
+// [NonAction]
+// public int GetOneRowByAisle(int Aisle)
+// {
+// if (Aisle >= 7)
+// {
+// return 1;
+// }
+// return (Aisle - 1) * 4 + 1;
+// }
+// /// <summary>
+// /// 鏍规嵁宸烽亾鑾峰彇鍐呬晶绗簩鎺�
+// /// </summary>
+// /// <param name="Aisle"></param>
+// /// <returns></returns>
+// [NonAction]
+// public int GetTwoRowByAisle(int Aisle)
+// {
+// if (Aisle >= 7)
+// {
+// return 2;
+// }
+// return (Aisle - 1) * 4 + 2;
+// }
+// /// <summary>
+// /// 鏍规嵁宸烽亾鑾峰彇澶栦晶绗簩鎺�
+// /// </summary>
+// /// <param name="Aisle"></param>
+// /// <returns></returns>
+// [NonAction]
+// public int GetThreeRowByAisle(int Aisle)
+// {
+// if (Aisle >= 7)
+// {
+// return 3;
+// }
+// return (Aisle - 1) * 4 + 3;
+// }
+// /// <summary>
+// /// 鏍规嵁宸烽亾鑾峰彇澶栦晶绗竴鎺�
+// /// </summary>
+// /// <param name="Aisle"></param>
+// /// <returns></returns>
+// [NonAction]
+// public int GetFourRowByAisle(int Aisle)
+// {
+// if (Aisle >= 7)
+// {
+// return 4;
+// }
+// return (Aisle - 1) * 4 + 4;
+// }
+// #endregion
+// }
+//}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsCount/WmsLocationView/LocationViewService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsCount/WmsLocationView/LocationViewService.cs
index f6a8355..407463f 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsCount/WmsLocationView/LocationViewService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsCount/WmsLocationView/LocationViewService.cs
@@ -1,280 +1,280 @@
-锘縰sing Furion.DatabaseAccessor;
-using Furion.DependencyInjection;
-using Furion.DynamicApiController;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Admin.NET.Core;
+锘�//using Furion.DatabaseAccessor;
+//using Furion.DependencyInjection;
+//using Furion.DynamicApiController;
+//using Mapster;
+//using Microsoft.AspNetCore.Mvc;
+//using Microsoft.EntityFrameworkCore;
+//using Admin.NET.Core;
-namespace Admin.NET.Application
-{
- /// <summary>
- /// 搴撲綅璇曞浘鏈嶅姟
- /// </summary>
- [ApiDescriptionSettings("浠撳簱浣滀笟", Name = "LocationView", Order = 104)]
- [Route("api/[Controller]")]
- public class LocationViewService : IDynamicApiController, ITransient
- {
- private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
- private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
- private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
- private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
- private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
- private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
+//namespace Admin.NET.Application
+//{
+// /// <summary>
+// /// 搴撲綅璇曞浘鏈嶅姟
+// /// </summary>
+// [ApiDescriptionSettings("浠撳簱浣滀笟", Name = "LocationView", Order = 104)]
+// [Route("api/[Controller]")]
+// public class LocationViewService : IDynamicApiController, ITransient
+// {
+// private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
+// private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
+// private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
+// private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
+// private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
+// private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- public LocationViewService(
- IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
- IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
- IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
- IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRe,
- IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
- IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainer
- )
- {
- _wmsAreaRep = wmsAreaRep;
- _wmsPlaceRep = wmsPlaceRep;
- _wmsMaterialStockRep = wmsMaterialStockRep;
- _wmsContainerPlaceRep = wmsContainerPlaceRe;
- _wmsContainerRep = wmsContainerRep;
- _wmsMaterialContainerRep = wmsMaterialContainer;
- }
+// /// <summary>
+// /// 鏋勯�犲嚱鏁�
+// /// </summary>
+// public LocationViewService(
+// IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
+// IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
+// IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
+// IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRe,
+// IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
+// IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainer
+// )
+// {
+// _wmsAreaRep = wmsAreaRep;
+// _wmsPlaceRep = wmsPlaceRep;
+// _wmsMaterialStockRep = wmsMaterialStockRep;
+// _wmsContainerPlaceRep = wmsContainerPlaceRe;
+// _wmsContainerRep = wmsContainerRep;
+// _wmsMaterialContainerRep = wmsMaterialContainer;
+// }
- /// <summary>
- /// 鑾峰彇搴撳尯淇℃伅
- /// </summary>
- /// <returns></returns>
- [HttpGet("GetArea")]
- public async Task<List<WmsArea>> GetArea()
- {
- var areaList = await _wmsAreaRep.Where(n => n.AreaStatus == CommonStatus.ENABLE && n.WorkShopType == LesWorkShopType.FAPAOCHEJIAN).ToListAsync();
- return areaList;
- }
+// /// <summary>
+// /// 鑾峰彇搴撳尯淇℃伅
+// /// </summary>
+// /// <returns></returns>
+// [HttpGet("GetArea")]
+// public async Task<List<WmsArea>> GetArea()
+// {
+// var areaList = await _wmsAreaRep.Where(n => n.AreaStatus == CommonStatus.ENABLE && n.WorkShopType == LesWorkShopType.FAPAOCHEJIAN).ToListAsync();
+// return areaList;
+// }
- /// <summary>
- /// 鏍规嵁搴撳尯鑾峰彇宸烽亾
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("GetAisle")]
- public async Task<object> GetPalceAisle([FromQuery] GetPalceAisleInput input)
- {
+// /// <summary>
+// /// 鏍规嵁搴撳尯鑾峰彇宸烽亾
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("GetAisle")]
+// public async Task<object> GetPalceAisle([FromQuery] GetPalceAisleInput input)
+// {
- var objList=await _wmsPlaceRep.Where(n => n.AreaId == input.Areaid).OrderBy(n=>n.Aisle).Select(n => n.Aisle).Distinct().ToArrayAsync();
- for (int i = 0; i < objList.Length-1; i++)
- {
- for (int j = 0; j < objList.Length-1; j++)
- {
- int k = j + 1;
- if (objList[j] >objList[k])
- {
- var temp = objList[k];
- objList[k] = objList[j];
- objList[j] = temp;
- }
- }
- }
- return objList;
- }
+// var objList=await _wmsPlaceRep.Where(n => n.AreaId == input.Areaid).OrderBy(n=>n.Aisle).Select(n => n.Aisle).Distinct().ToArrayAsync();
+// for (int i = 0; i < objList.Length-1; i++)
+// {
+// for (int j = 0; j < objList.Length-1; j++)
+// {
+// int k = j + 1;
+// if (objList[j] >objList[k])
+// {
+// var temp = objList[k];
+// objList[k] = objList[j];
+// objList[j] = temp;
+// }
+// }
+// }
+// return objList;
+// }
- /// <summary>
- /// 鏍规嵁搴撳尯鍜屽贩閬撹幏鍙栨帓
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("GetPalceRowno")]
- public async Task<object> GetPalceRowno([FromQuery] GetPalceAisleRownoInput input)
- {
- var objList=await _wmsPlaceRep.Where(n => n.AreaId == input.Areaid && n.Aisle==input.Aisleid && n.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN).OrderBy(n => n.RowNo).Select(n => n.RowNo).Distinct().ToArrayAsync();
+// /// <summary>
+// /// 鏍规嵁搴撳尯鍜屽贩閬撹幏鍙栨帓
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("GetPalceRowno")]
+// public async Task<object> GetPalceRowno([FromQuery] GetPalceAisleRownoInput input)
+// {
+// var objList=await _wmsPlaceRep.Where(n => n.AreaId == input.Areaid && n.Aisle==input.Aisleid && n.WmsArea.WorkShopType == LesWorkShopType.FAPAOCHEJIAN).OrderBy(n => n.RowNo).Select(n => n.RowNo).Distinct().ToArrayAsync();
- for (int i = 0; i < objList.Length - 1; i++)
- {
- for (int j = 0; j < objList.Length - 1; j++)
- {
- int k = j + 1;
- if (objList[j] > objList[k])
- {
- var temp = objList[k];
- objList[k] = objList[j];
- objList[j] = temp;
- }
- }
- }
- return objList;
- }
+// for (int i = 0; i < objList.Length - 1; i++)
+// {
+// for (int j = 0; j < objList.Length - 1; j++)
+// {
+// int k = j + 1;
+// if (objList[j] > objList[k])
+// {
+// var temp = objList[k];
+// objList[k] = objList[j];
+// objList[j] = temp;
+// }
+// }
+// }
+// return objList;
+// }
- /// <summary>
- /// 鏍规嵁搴撳尯 鎺掕幏鍙栧簱浣嶄俊鎭�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("GetPalceList")]
- public async Task<PalceInfoOtput> GetPalceList([FromQuery] GetPalceListInput input)
- {
- var palceList = await _wmsPlaceRep.DetachedEntities
- .Where(p => p.AreaId == input.Areaid)
- .Where(input.Aisleid != 0, p => p.Aisle == input.Aisleid)
- .Where(input.Rowno != 0, p => p.RowNo == input.Rowno)
- .ToListAsync();
+// /// <summary>
+// /// 鏍规嵁搴撳尯 鎺掕幏鍙栧簱浣嶄俊鎭�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("GetPalceList")]
+// public async Task<PalceInfoOtput> GetPalceList([FromQuery] GetPalceListInput input)
+// {
+// var palceList = await _wmsPlaceRep.DetachedEntities
+// .Where(p => p.AreaId == input.Areaid)
+// .Where(input.Aisleid != 0, p => p.Aisle == input.Aisleid)
+// .Where(input.Rowno != 0, p => p.RowNo == input.Rowno)
+// .ToListAsync();
- //鑾峰彇鏈夊灏戝贩,鎺�,鍒�,灞�
- var Aisles = palceList.OrderBy(n => n.Aisle).Select(n => n.Aisle).Distinct().ToList();
+// //鑾峰彇鏈夊灏戝贩,鎺�,鍒�,灞�
+// var Aisles = palceList.OrderBy(n => n.Aisle).Select(n => n.Aisle).Distinct().ToList();
- var locationDataList = new List<WareLocationAisleData>();
- //宸烽亾
- foreach (var aisle in Aisles)
- {
- var aisleData = new WareLocationAisleData();
- aisleData.Aisle = aisle;
- aisleData.wareLocationRownoData = new List<WareLocationRownoData>();
- //鎺�
- var RowNos = palceList.Where(p=>p.Aisle==aisle).OrderBy(n => n.RowNo).Select(n => n.RowNo).Distinct().ToList();
- foreach (var row in RowNos)
- {
- var rownoData = new WareLocationRownoData();
- rownoData.Rowno = row;
- rownoData.wareLocationLayerData = new List<WareLocationLayerData>();
- //灞�
- var LayerNo = palceList.Where(p=>p.Aisle==aisle && p.RowNo==row).OrderByDescending(n => n.LayerNo).Select(n => n.LayerNo).Distinct();
- foreach (var lay in LayerNo)
- {
- var layerData = new WareLocationLayerData();
- layerData.Layer = lay;
- layerData.wareLocationColumnNoData = new List<PalceDetail>();
- //鍒�
- var ColumnNos = palceList.Where(p=>p.Aisle==aisle && p.RowNo==row).OrderByDescending(n => n.ColumnNo).Select(n => n.ColumnNo).Distinct();
- foreach (var col in ColumnNos)
- {
- var wareLocationMdoel = palceList.Where(p =>p.Aisle==aisle && p.RowNo == row && p.LayerNo == lay && p.ColumnNo == col).FirstOrDefault();
- if (wareLocationMdoel != null)
- {
- var locationDetail = new PalceDetail()
- {
- Id = wareLocationMdoel.Id,
- RowNo = wareLocationMdoel.RowNo,
- ColumnNo = wareLocationMdoel.ColumnNo,
- LayerNo = wareLocationMdoel.LayerNo,
- PlaceCode = wareLocationMdoel.PlaceCode,
- Islock = wareLocationMdoel.Islock,
- EmptyContainer = wareLocationMdoel.EmptyContainer,
- PlaceStatus = wareLocationMdoel.PlaceStatus,
- };
- layerData.wareLocationColumnNoData.Add(locationDetail);
- }
- else
- {
- layerData.wareLocationColumnNoData.Add(null);
- }
- }
- rownoData.wareLocationLayerData.Add(layerData);
- }
- aisleData.wareLocationRownoData.Add(rownoData);
- }
- locationDataList.Add(aisleData);
- }
+// var locationDataList = new List<WareLocationAisleData>();
+// //宸烽亾
+// foreach (var aisle in Aisles)
+// {
+// var aisleData = new WareLocationAisleData();
+// aisleData.Aisle = aisle;
+// aisleData.wareLocationRownoData = new List<WareLocationRownoData>();
+// //鎺�
+// var RowNos = palceList.Where(p=>p.Aisle==aisle).OrderBy(n => n.RowNo).Select(n => n.RowNo).Distinct().ToList();
+// foreach (var row in RowNos)
+// {
+// var rownoData = new WareLocationRownoData();
+// rownoData.Rowno = row;
+// rownoData.wareLocationLayerData = new List<WareLocationLayerData>();
+// //灞�
+// var LayerNo = palceList.Where(p=>p.Aisle==aisle && p.RowNo==row).OrderByDescending(n => n.LayerNo).Select(n => n.LayerNo).Distinct();
+// foreach (var lay in LayerNo)
+// {
+// var layerData = new WareLocationLayerData();
+// layerData.Layer = lay;
+// layerData.wareLocationColumnNoData = new List<PalceDetail>();
+// //鍒�
+// var ColumnNos = palceList.Where(p=>p.Aisle==aisle && p.RowNo==row).OrderByDescending(n => n.ColumnNo).Select(n => n.ColumnNo).Distinct();
+// foreach (var col in ColumnNos)
+// {
+// var wareLocationMdoel = palceList.Where(p =>p.Aisle==aisle && p.RowNo == row && p.LayerNo == lay && p.ColumnNo == col).FirstOrDefault();
+// if (wareLocationMdoel != null)
+// {
+// var locationDetail = new PalceDetail()
+// {
+// Id = wareLocationMdoel.Id,
+// RowNo = wareLocationMdoel.RowNo,
+// ColumnNo = wareLocationMdoel.ColumnNo,
+// LayerNo = wareLocationMdoel.LayerNo,
+// PlaceCode = wareLocationMdoel.PlaceCode,
+// Islock = wareLocationMdoel.Islock,
+// EmptyContainer = wareLocationMdoel.EmptyContainer,
+// PlaceStatus = wareLocationMdoel.PlaceStatus,
+// };
+// layerData.wareLocationColumnNoData.Add(locationDetail);
+// }
+// else
+// {
+// layerData.wareLocationColumnNoData.Add(null);
+// }
+// }
+// rownoData.wareLocationLayerData.Add(layerData);
+// }
+// aisleData.wareLocationRownoData.Add(rownoData);
+// }
+// locationDataList.Add(aisleData);
+// }
- return new PalceInfoOtput()
- {
- countNum = palceList.Count,
- cunhuoNum = palceList.Where(n => n.PlaceStatus == PlaceStatus.CUNHUO).Count(),
- emptyNum = palceList.Where(n => n.PlaceStatus == PlaceStatus.KONGXIAN).Count(),
- DaiRuNum = palceList.Where(n => n.PlaceStatus == PlaceStatus.DAIRU).Count(),
- DaichuNum = palceList.Where(n => n.PlaceStatus == PlaceStatus.DAICHU).Count(),
- emptyContainerNum = palceList.Where(p => p.EmptyContainer == YesOrNot.Y && p.PlaceStatus == PlaceStatus.CUNHUO).Count(),
- materialNum = palceList.Where(p => p.EmptyContainer == YesOrNot.N && p.PlaceStatus == PlaceStatus.CUNHUO).Count(),
- lockNum = palceList.Where(p => p.Islock == YesOrNot.Y).Count(),
- PalceDetails = locationDataList,
- };
- }
+// return new PalceInfoOtput()
+// {
+// countNum = palceList.Count,
+// cunhuoNum = palceList.Where(n => n.PlaceStatus == PlaceStatus.CUNHUO).Count(),
+// emptyNum = palceList.Where(n => n.PlaceStatus == PlaceStatus.KONGXIAN).Count(),
+// DaiRuNum = palceList.Where(n => n.PlaceStatus == PlaceStatus.DAIRU).Count(),
+// DaichuNum = palceList.Where(n => n.PlaceStatus == PlaceStatus.DAICHU).Count(),
+// emptyContainerNum = palceList.Where(p => p.EmptyContainer == YesOrNot.Y && p.PlaceStatus == PlaceStatus.CUNHUO).Count(),
+// materialNum = palceList.Where(p => p.EmptyContainer == YesOrNot.N && p.PlaceStatus == PlaceStatus.CUNHUO).Count(),
+// lockNum = palceList.Where(p => p.Islock == YesOrNot.Y).Count(),
+// PalceDetails = locationDataList,
+// };
+// }
- /// <summary>
- /// 鏍规嵁搴撲綅鑾峰彇瀵瑰簲淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("GetMaterialDetail")]
- [UnifyResult(typeof(MaterialDetailsOutput))]
- public async Task<object> GetMaterialDetail([FromQuery] GetMaterialDetailInput input)
- {
- var palceModel = await _wmsPlaceRep.FirstOrDefaultAsync(p => p.Id == input.Id);
- if (palceModel == null) return XnRestfulResultProvider.RESTfulMesaage("搴撲綅淇℃伅涓嶅瓨鍦�!");
- var MaterialStockList = await _wmsMaterialStockRep.Where(p => p.PlaceCode == palceModel.PlaceCode).ToListAsync();
- var model = new MaterialDetailsOutput()
- {
- PalceDetails = palceModel.Adapt<PalceDetail>()
- };
- if (MaterialStockList.Count > 0)
- {
- model.Containercode = MaterialStockList.FirstOrDefault().ContainerCode;
- model.WmsMaterialStocks = MaterialStockList;
- }
- return XnRestfulResultProvider.RESTfulResult(model);
- }
+// /// <summary>
+// /// 鏍规嵁搴撲綅鑾峰彇瀵瑰簲淇℃伅
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("GetMaterialDetail")]
+// [UnifyResult(typeof(MaterialDetailsOutput))]
+// public async Task<object> GetMaterialDetail([FromQuery] GetMaterialDetailInput input)
+// {
+// var palceModel = await _wmsPlaceRep.FirstOrDefaultAsync(p => p.Id == input.Id);
+// if (palceModel == null) return XnRestfulResultProvider.RESTfulMesaage("搴撲綅淇℃伅涓嶅瓨鍦�!");
+// var MaterialStockList = await _wmsMaterialStockRep.Where(p => p.PlaceCode == palceModel.PlaceCode).ToListAsync();
+// var model = new MaterialDetailsOutput()
+// {
+// PalceDetails = palceModel.Adapt<PalceDetail>()
+// };
+// if (MaterialStockList.Count > 0)
+// {
+// model.Containercode = MaterialStockList.FirstOrDefault().ContainerCode;
+// model.WmsMaterialStocks = MaterialStockList;
+// }
+// return XnRestfulResultProvider.RESTfulResult(model);
+// }
- /// <summary>
- /// 淇敼搴撲綅閿佸畾淇℃伅
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("UpdatePalceIslock")]
- [UnifyResult(typeof(object))]
- public async Task<object> UpdatePalceIslock([FromQuery] GetMaterialDetailInput input)
- {
- var palceModel = await _wmsPlaceRep.FirstOrDefaultAsync(p => p.Id == input.Id);
- if (palceModel == null) return XnRestfulResultProvider.RESTfulMesaage("搴撲綅淇℃伅涓嶅瓨鍦�!");
- if (palceModel.Islock == YesOrNot.Y)
- {
- palceModel.Islock = YesOrNot.N;
- }
- else
- {
- palceModel.Islock = YesOrNot.Y;
- }
- await _wmsPlaceRep.UpdateAsync(palceModel);
- return XnRestfulResultProvider.RESTfulResult();
- }
+// /// <summary>
+// /// 淇敼搴撲綅閿佸畾淇℃伅
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("UpdatePalceIslock")]
+// [UnifyResult(typeof(object))]
+// public async Task<object> UpdatePalceIslock([FromQuery] GetMaterialDetailInput input)
+// {
+// var palceModel = await _wmsPlaceRep.FirstOrDefaultAsync(p => p.Id == input.Id);
+// if (palceModel == null) return XnRestfulResultProvider.RESTfulMesaage("搴撲綅淇℃伅涓嶅瓨鍦�!");
+// if (palceModel.Islock == YesOrNot.Y)
+// {
+// palceModel.Islock = YesOrNot.N;
+// }
+// else
+// {
+// palceModel.Islock = YesOrNot.Y;
+// }
+// await _wmsPlaceRep.UpdateAsync(palceModel);
+// return XnRestfulResultProvider.RESTfulResult();
+// }
- /// <summary>
- /// 灏嗗簱浣嶇疆涓虹┖闂�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("UpdatePalceKongXian")]
- [UnifyResult(typeof(object))]
- [UnitOfWork]
- public async Task<object> UpdatePalceKongXian([FromQuery] GetMaterialDetailInput input)
- {
- var palceModel = await _wmsPlaceRep.FirstOrDefaultAsync(p => p.Id == input.Id);
- if (palceModel == null) return XnRestfulResultProvider.RESTfulMesaage("搴撲綅淇℃伅涓嶅瓨鍦�!");
- palceModel.PlaceStatus = PlaceStatus.KONGXIAN;
- await _wmsPlaceRep.UpdateAsync(palceModel);
+// /// <summary>
+// /// 灏嗗簱浣嶇疆涓虹┖闂�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("UpdatePalceKongXian")]
+// [UnifyResult(typeof(object))]
+// [UnitOfWork]
+// public async Task<object> UpdatePalceKongXian([FromQuery] GetMaterialDetailInput input)
+// {
+// var palceModel = await _wmsPlaceRep.FirstOrDefaultAsync(p => p.Id == input.Id);
+// if (palceModel == null) return XnRestfulResultProvider.RESTfulMesaage("搴撲綅淇℃伅涓嶅瓨鍦�!");
+// palceModel.PlaceStatus = PlaceStatus.KONGXIAN;
+// await _wmsPlaceRep.UpdateAsync(palceModel);
- var materialStockModel = await _wmsMaterialStockRep.Where(p => p.PlaceCode == palceModel.PlaceCode).FirstOrDefaultAsync();
- if (materialStockModel != null)
- {
- await _wmsMaterialStockRep.DeleteAsync(materialStockModel);
- }
- var containerPlaceModel = await _wmsContainerPlaceRep.Where(p => p.PlaceCode == palceModel.PlaceCode && p.ContainerPlaceStatus == CommonStatus.ENABLE).FirstOrDefaultAsync();
- if (containerPlaceModel != null)
- {
- containerPlaceModel.ContainerPlaceStatus = CommonStatus.DISABLE;
- await _wmsContainerPlaceRep.UpdateAsync(containerPlaceModel);
+// var materialStockModel = await _wmsMaterialStockRep.Where(p => p.PlaceCode == palceModel.PlaceCode).FirstOrDefaultAsync();
+// if (materialStockModel != null)
+// {
+// await _wmsMaterialStockRep.DeleteAsync(materialStockModel);
+// }
+// var containerPlaceModel = await _wmsContainerPlaceRep.Where(p => p.PlaceCode == palceModel.PlaceCode && p.ContainerPlaceStatus == CommonStatus.ENABLE).FirstOrDefaultAsync();
+// if (containerPlaceModel != null)
+// {
+// containerPlaceModel.ContainerPlaceStatus = CommonStatus.DISABLE;
+// await _wmsContainerPlaceRep.UpdateAsync(containerPlaceModel);
- var wmsMaterialContainerModal = await _wmsMaterialContainerRep.FirstOrDefaultAsync(p => p.ContainerCode == containerPlaceModel.ContainerCode && p.BindStatus == CommonStatus.ENABLE);
- if (containerPlaceModel != null) return XnRestfulResultProvider.RESTfulMesaage("鐗╂枡鎵樼洏淇℃伅涓嶅瓨鍦�!");
- containerPlaceModel.ContainerPlaceStatus = CommonStatus.DISABLE;
- await _wmsMaterialContainerRep.UpdateAsync(wmsMaterialContainerModal);
+// var wmsMaterialContainerModal = await _wmsMaterialContainerRep.FirstOrDefaultAsync(p => p.ContainerCode == containerPlaceModel.ContainerCode && p.BindStatus == CommonStatus.ENABLE);
+// if (containerPlaceModel != null) return XnRestfulResultProvider.RESTfulMesaage("鐗╂枡鎵樼洏淇℃伅涓嶅瓨鍦�!");
+// containerPlaceModel.ContainerPlaceStatus = CommonStatus.DISABLE;
+// await _wmsMaterialContainerRep.UpdateAsync(wmsMaterialContainerModal);
- var containerModel = await _wmsContainerRep.FirstOrDefaultAsync(p => p.ContainerCode == containerPlaceModel.ContainerCode);
- if (containerModel != null)
- {
- containerModel.ContainerStatus = ContainerStatus.KOUXIAN;
- await _wmsContainerRep.UpdateAsync(containerModel);
- }
- }
- return XnRestfulResultProvider.RESTfulResult();
- }
- }
-}
+// var containerModel = await _wmsContainerRep.FirstOrDefaultAsync(p => p.ContainerCode == containerPlaceModel.ContainerCode);
+// if (containerModel != null)
+// {
+// containerModel.ContainerStatus = ContainerStatus.KOUXIAN;
+// await _wmsContainerRep.UpdateAsync(containerModel);
+// }
+// }
+// return XnRestfulResultProvider.RESTfulResult();
+// }
+// }
+//}
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 9071135..d335688 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsArea.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsArea.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涓嬪崍5:20:46
+ * @desc : 搴撳尯琛�
+ */
namespace Admin.NET.Core
{
/// <summary>
@@ -11,73 +14,96 @@
/// </summary>
[Table("wms_area")]
[Comment("搴撳尯琛�")]
- public class WmsArea : DEntityBase, IEntityTypeBuilder<WmsArea>
+ public class WmsArea : DEntityBase
{
+
+
/// <summary>
- /// 鍚嶇О
+ /// 搴撳尯缂栫爜
/// </summary>
- [Comment("鍚嶇О")]
+ [Comment("搴撳尯缂栫爜")]
+ [Required]
+ [MaxLength(50)]
+ public string AreaCode { get; set; }
+
+
+ /// <summary>
+ /// 浠撳簱缂栧彿
+ /// </summary>
+ [Comment("浠撳簱缂栧彿")]
+ [Required]
+ [MaxLength(50)]
+ public string WarehouseCode { get; set; }
+
+
+ /// <summary>
+ /// 浠撳簱鍚嶇О
+ /// </summary>
+ [Comment("浠撳簱鍚嶇О")]
+ [Required]
+ [MaxLength(255)]
+ public string WarehouseName { get; set; }
+
+
+ /// <summary>
+ /// 搴撳尯鍚嶇О
+ /// </summary>
+ [Comment("搴撳尯鍚嶇О")]
[Required]
[MaxLength(50)]
public string AreaName { get; set; }
+
/// <summary>
- /// 鎻忚堪
+ /// 搴撳尯鎻忚堪
/// </summary>
- [Comment("鎻忚堪")]
- [MaxLength(250)]
+ [Comment("搴撳尯鎻忚堪")]
+ [MaxLength(50)]
public string AreaDesc { get; set; }
+
/// <summary>
- /// 鐘舵��;鏁版嵁瀛楀吀
+ /// 搴撳尯鐘舵��
/// </summary>
- [Comment("鐘舵��")]
+ [Comment("搴撳尯鐘舵��")]
[Required]
- public CommonStatus AreaStatus { get; set; }
+
+ public int AreaStatus { get; set; }
+
/// <summary>
- /// 鍒嗙被;鏁版嵁瀛楀吀
+ /// ERP浠ｇ爜
/// </summary>
- [Comment("鍒嗙被")]
+ [Comment("ERP浠ｇ爜")]
[Required]
- public AreaType AreaType { get; set; }
+ [MaxLength(50)]
+ public string ErpCode { get; set; }
+
/// <summary>
- /// 鏄惁涓洪挗骞冲彴
+ /// 鎵�灞炰粨搴�
/// </summary>
- [Comment("鏄惁涓洪挗骞冲彴")]
- public bool IsSteel { get; set; }
+ [Comment("鎵�灞炰粨搴�")]
+ [Required]
+
+ public long WarehouseId { get; set; }
+
/// <summary>
- /// 鎵�灞炶溅闂�
+ /// 鏄惁铏氭嫙
/// </summary>
- [Comment("鎵�灞炶溅闂�")]
- public LesWorkShopType WorkShopType { get; set; }
+ [Comment("鏄惁铏氭嫙")]
+ [Required]
- /// <summary>
- /// 搴撲綅琛�
- /// </summary>
- public ICollection<WmsPlace> WmsPlaces { get; set; }
+ public bool IsVirtually { get; set; }
- /// <summary>
- /// 搴撳彛琛�
- /// </summary>
- public ICollection<LesEntrance> LesEntrance { get; set; }
- /// <summary>
- /// 鏋勫缓涓�瀵瑰鐨勫叧绯�
- /// </summary>
- /// <param name="entityBuilder"></param>
- /// <param name="dbContext"></param>
- /// <param name="dbContextLocator"></param>
- public void Configure(EntityTypeBuilder<WmsArea> entityBuilder, DbContext dbContext, Type dbContextLocator)
- {
- entityBuilder.HasMany(x => x.WmsPlaces)
- .WithOne(x => x.WmsArea)
- .HasForeignKey(x => x.AreaId).IsRequired(true);
- entityBuilder.HasMany(x => x.LesEntrance)
- .WithOne(x => x.WmsArea)
- .HasForeignKey(x => x.AreaId).IsRequired(true);
- }
+
+
+
+
+
+
+
}
-}
+}
\ No newline at end of file
diff --git "a/\344\275\277\347\224\250\346\226\207\346\241\243/PDManer\346\226\207\344\273\266/\345\216\237\346\235\220\346\226\231\345\272\223\346\240\207\345\207\206\345\214\226.pdma.json" "b/\344\275\277\347\224\250\346\226\207\346\241\243/PDManer\346\226\207\344\273\266/\345\216\237\346\235\220\346\226\231\345\272\223\346\240\207\345\207\206\345\214\226.pdma.json"
index c35a49b..1a2f182 100755
--- "a/\344\275\277\347\224\250\346\226\207\346\241\243/PDManer\346\226\207\344\273\266/\345\216\237\346\235\220\346\226\231\345\272\223\346\240\207\345\207\206\345\214\226.pdma.json"
+++ "b/\344\275\277\347\224\250\346\226\207\346\241\243/PDManer\346\226\207\344\273\266/\345\216\237\346\235\220\346\226\231\345\272\223\346\240\207\345\207\206\345\214\226.pdma.json"
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.1.3",
"createdTime": "2024-4-12 12:56:29",
- "updatedTime": "2024-4-23 16:59:43",
+ "updatedTime": "2024-4-23 17:20:35",
"dbConns": [],
"profile": {
"default": {
@@ -669,7 +669,7 @@
"#DDE5FF"
],
"DDLToggleCase": "L",
- "menuWidth": "283px",
+ "menuWidth": "411px",
"extAttrProps": {
"attr1": {
"editType": "",
@@ -21572,8 +21572,8 @@
"defKey": "Id",
"defName": "Id涓婚敭",
"comment": "",
- "domain": "",
- "type": "bigint",
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "type": "",
"len": "",
"scale": "",
"primaryKey": true,
@@ -21598,7 +21598,7 @@
},
{
"defKey": "AreaCode",
- "defName": "缂栫爜",
+ "defName": "搴撳尯缂栫爜",
"comment": "",
"type": "",
"len": "",
@@ -21615,8 +21615,42 @@
"baseType": "F8A4AFB0-F3B7-4E32-A5F2-D4D8D3F4BACD"
},
{
+ "defKey": "WarehouseCode",
+ "defName": "浠撳簱缂栧彿",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
+ "id": "9ABF4E63-1F5A-4069-A5A7-8D1CD91FCB17"
+ },
+ {
+ "defKey": "WarehouseName",
+ "defName": "浠撳簱鍚嶇О",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "B19256E6-87E6-4A43-AD65-67095F06819F",
+ "id": "D5A9D295-99F8-422C-AF0E-B5F0D2BB833A"
+ },
+ {
"defKey": "AreaName",
- "defName": "鍚嶇О",
+ "defName": "搴撳尯鍚嶇О",
"comment": "",
"domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
"type": "",
@@ -21644,7 +21678,7 @@
},
{
"defKey": "AreaDesc",
- "defName": "鎻忚堪",
+ "defName": "搴撳尯鎻忚堪",
"comment": "",
"domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
"type": "",
@@ -21672,7 +21706,7 @@
},
{
"defKey": "AreaStatus",
- "defName": "鐘舵��",
+ "defName": "搴撳尯鐘舵��",
"comment": "",
"domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
"type": "",
@@ -21694,34 +21728,6 @@
"attr8": "",
"attr9": "",
"id": "583C7441-7624-4325-995A-F27AA673073F",
- "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811",
- "extProps": {},
- "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE"
- },
- {
- "defKey": "AreaType",
- "defName": "鍒嗙被",
- "comment": "",
- "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": true,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "attr1": "",
- "attr2": "",
- "attr3": "",
- "attr4": "",
- "attr5": "",
- "attr6": "",
- "attr7": "",
- "attr8": "",
- "attr9": "",
- "id": "3147E4D9-AA01-4F8A-A036-A16F0160E38B",
"baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811",
"extProps": {},
"uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE"
@@ -21783,11 +21789,28 @@
"uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE"
},
{
+ "defKey": "IsVirtually",
+ "defName": "鏄惁铏氭嫙",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
+ "id": "36E61A74-8758-49EC-B486-D1383B37EA03"
+ },
+ {
"defKey": "CreatedTime",
"defName": "鍒涘缓鏃堕棿",
"comment": "",
- "domain": "",
- "type": "datetimeoffset",
+ "domain": "E9456E44-8231-4BC0-B2CD-5FF4AEC6DE97",
+ "type": "",
"len": "",
"scale": "",
"primaryKey": false,
@@ -21814,8 +21837,8 @@
"defKey": "UpdatedTime",
"defName": "鏇存柊鏃堕棿",
"comment": "",
- "domain": "",
- "type": "datetimeoffset",
+ "domain": "E9456E44-8231-4BC0-B2CD-5FF4AEC6DE97",
+ "type": "",
"len": "",
"scale": "",
"primaryKey": false,
@@ -21842,8 +21865,8 @@
"defKey": "CreatedUserId",
"defName": "鍒涘缓鑰匢d",
"comment": "",
- "domain": "",
- "type": "bigint",
+ "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
+ "type": "",
"len": "",
"scale": "",
"primaryKey": false,
@@ -21870,9 +21893,9 @@
"defKey": "CreatedUserName",
"defName": "鍒涘缓鑰呭悕绉�",
"comment": "",
- "domain": "",
- "type": "nvarchar",
- "len": 50,
+ "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
+ "type": "",
+ "len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
@@ -21898,8 +21921,8 @@
"defKey": "UpdatedUserId",
"defName": "淇敼鑰匢d",
"comment": "",
- "domain": "",
- "type": "bigint",
+ "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
+ "type": "",
"len": "",
"scale": "",
"primaryKey": false,
@@ -21926,9 +21949,9 @@
"defKey": "UpdatedUserName",
"defName": "淇敼鑰呭悕绉�",
"comment": "",
- "domain": "",
- "type": "nvarchar",
- "len": 50,
+ "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
+ "type": "",
+ "len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
@@ -21954,9 +21977,9 @@
"defKey": "IsDeleted",
"defName": "杞垹闄ゆ爣璁�",
"comment": "",
- "domain": "",
- "type": "bit",
- "len": 1,
+ "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
+ "type": "",
+ "len": "",
"scale": "",
"primaryKey": false,
"notNull": true,
@@ -45817,7 +45840,7 @@
}
},
"defKey": "wms_container_type",
- "defName": "鎵樼洏绫诲瀷",
+ "defName": "瀹瑰櫒绫诲瀷",
"comment": "",
"properties": {
"partitioned by": "(date string)",
--
Gitblit v1.9.3