From 0a4fdc2b4d0f5fb7d16fbd0182bef305105e3eae Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周二, 23 4月 2024 18:44:36 +0800
Subject: [PATCH] 调整库位实体 新增容器 容器类型实体
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/WmsInWarehouse/WmsInWarehouseService.cs | 576 ++++++++++++++++++++++++++++----------------------------
1 files changed, 288 insertions(+), 288 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/WmsInWarehouse/WmsInWarehouseService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/WmsInWarehouse/WmsInWarehouseService.cs
index 5c239eb..386eb80 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/WmsInWarehouse/WmsInWarehouseService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/WmsInWarehouse/WmsInWarehouseService.cs
@@ -1,317 +1,317 @@
-锘縰sing Furion.DatabaseAccessor;
-using Furion.DependencyInjection;
-using Furion.DynamicApiController;
-using Furion.FriendlyException;
-using Mapster;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using System.Linq.Dynamic.Core;
-using Admin.NET.Core;
-using Yitter.IdGenerator;
-using Microsoft.Extensions.Logging;
-using Microsoft.AspNetCore.Mvc.RazorPages;
+锘�//using Furion.DatabaseAccessor;
+//using Furion.DependencyInjection;
+//using Furion.DynamicApiController;
+//using Furion.FriendlyException;
+//using Mapster;
+//using Microsoft.AspNetCore.Authorization;
+//using Microsoft.AspNetCore.Mvc;
+//using Microsoft.EntityFrameworkCore;
+//using System.Linq.Dynamic.Core;
+//using Admin.NET.Core;
+//using Yitter.IdGenerator;
+//using Microsoft.Extensions.Logging;
+//using Microsoft.AspNetCore.Mvc.RazorPages;
-namespace Admin.NET.Application
-{
- /// <summary>
- /// Pda鐗╂枡鍏ュ簱
- /// </summary>
- [ApiDescriptionSettings("Pda鐗╂枡鍏ュ簱", Name = "WmsInWarehouse", Order = 100)]
- [Route("api/[Controller]")]
- public class WmsInWarehouseService : IDynamicApiController, ITransient
- {
- private readonly IRepository<WmsOrder, MasterDbContextLocator> _wmsOrderRep;
- private readonly IRepository<WmsOrderDetails, MasterDbContextLocator> _wmsOrderDetailsRep;
- private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
- private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
- private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
- private readonly IRepository<WmsWarehouseEntrance, MasterDbContextLocator> _wmsWarehouseEntranceRep;
- private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
- private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
- private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
- private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
- private readonly IRepository<WmsOrderType, MasterDbContextLocator> _wmsOrderTypeRep;
+//namespace Admin.NET.Application
+//{
+// /// <summary>
+// /// Pda鐗╂枡鍏ュ簱
+// /// </summary>
+// [ApiDescriptionSettings("Pda鐗╂枡鍏ュ簱", Name = "WmsInWarehouse", Order = 100)]
+// [Route("api/[Controller]")]
+// public class WmsInWarehouseService : IDynamicApiController, ITransient
+// {
+// private readonly IRepository<WmsOrder, MasterDbContextLocator> _wmsOrderRep;
+// private readonly IRepository<WmsOrderDetails, MasterDbContextLocator> _wmsOrderDetailsRep;
+// private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
+// private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
+// private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
+// private readonly IRepository<WmsWarehouseEntrance, MasterDbContextLocator> _wmsWarehouseEntranceRep;
+// private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
+// private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
+// private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
+// private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
+// private readonly IRepository<WmsOrderType, MasterDbContextLocator> _wmsOrderTypeRep;
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- public WmsInWarehouseService(
- IRepository<WmsOrder, MasterDbContextLocator> wmsOrderRep,
- IRepository<WmsOrderDetails, MasterDbContextLocator> wmsOrderDetailsRep,
- IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
- IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
- IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
- IRepository<WmsWarehouseEntrance, MasterDbContextLocator> wmsWarehouseEntranceRep,
- IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep,
- IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
- IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
- IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
- IRepository<WmsOrderType, MasterDbContextLocator> wmsOrderTypeRep
- )
- {
- _wmsOrderRep = wmsOrderRep;
- _wmsOrderDetailsRep = wmsOrderDetailsRep;
- _wmsTaskRep = wmsTaskRep;
- _wmsPlaceRep = wmsPlaceRep;
- _wmsAreaRep = wmsAreaRep;
- _wmsWarehouseEntranceRep = wmsWarehouseEntranceRep;
- _wmsMaterialContainerRep = wmsMaterialContainerRep;
- _wmsContainerRep = wmsContainerRep;
- _wmsContainerPlaceRep = wmsContainerPlaceRep;
- _wmsMaterialStockRep = wmsMaterialStockRep;
- _wmsOrderTypeRep = wmsOrderTypeRep;
- }
+// /// <summary>
+// /// 鏋勯�犲嚱鏁�
+// /// </summary>
+// public WmsInWarehouseService(
+// IRepository<WmsOrder, MasterDbContextLocator> wmsOrderRep,
+// IRepository<WmsOrderDetails, MasterDbContextLocator> wmsOrderDetailsRep,
+// IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
+// IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
+// IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
+// IRepository<WmsWarehouseEntrance, MasterDbContextLocator> wmsWarehouseEntranceRep,
+// IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep,
+// IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
+// IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
+// IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
+// IRepository<WmsOrderType, MasterDbContextLocator> wmsOrderTypeRep
+// )
+// {
+// _wmsOrderRep = wmsOrderRep;
+// _wmsOrderDetailsRep = wmsOrderDetailsRep;
+// _wmsTaskRep = wmsTaskRep;
+// _wmsPlaceRep = wmsPlaceRep;
+// _wmsAreaRep = wmsAreaRep;
+// _wmsWarehouseEntranceRep = wmsWarehouseEntranceRep;
+// _wmsMaterialContainerRep = wmsMaterialContainerRep;
+// _wmsContainerRep = wmsContainerRep;
+// _wmsContainerPlaceRep = wmsContainerPlaceRep;
+// _wmsMaterialStockRep = wmsMaterialStockRep;
+// _wmsOrderTypeRep = wmsOrderTypeRep;
+// }
- /// <summary>
- /// 鑾峰彇鎵樼洏
- /// </summary>
- /// <returns></returns>
- [HttpGet("GetContainer")]
- [UnifyResult(typeof(GetContainerOutput))]
- public async Task<object> CheckTray([FromQuery] GetContainerInput input)
- {
- var containerModel = await _wmsContainerRep.DetachedEntities.Where(z => z.ContainerCode == input.ContainerCode).FirstOrDefaultAsync();
- //濡傛灉鎵樼洏涓嶅瓨鍦ㄥ垯娣诲姞涓�涓�
- if (containerModel == null) {
- var ContainerInfo = input.Adapt<WmsContainer>();
- ContainerInfo.ContainerStatus = ContainerStatus.KOUXIAN;
- ContainerInfo.AssetNo = "N/A";
- ContainerInfo.ContainerCategory = ContainerCategory.GZP;
- ContainerInfo.ErpNo = "N/A";
- ContainerInfo.IsVirtually = YesOrNot.N;
- ContainerInfo.WorkShopType = LesWorkShopType.FAPAOCHEJIAN;
- await _wmsContainerRep.InsertNowAsync(ContainerInfo);
- containerModel = ContainerInfo;
- }
+// /// <summary>
+// /// 鑾峰彇鎵樼洏
+// /// </summary>
+// /// <returns></returns>
+// [HttpGet("GetContainer")]
+// [UnifyResult(typeof(GetContainerOutput))]
+// public async Task<object> CheckTray([FromQuery] GetContainerInput input)
+// {
+// var containerModel = await _wmsContainerRep.DetachedEntities.Where(z => z.ContainerCode == input.ContainerCode).FirstOrDefaultAsync();
+// //濡傛灉鎵樼洏涓嶅瓨鍦ㄥ垯娣诲姞涓�涓�
+// if (containerModel == null) {
+// var ContainerInfo = input.Adapt<WmsContainer>();
+// ContainerInfo.ContainerStatus = ContainerStatus.KOUXIAN;
+// ContainerInfo.AssetNo = "N/A";
+// ContainerInfo.ContainerCategory = ContainerCategory.GZP;
+// ContainerInfo.ErpNo = "N/A";
+// ContainerInfo.IsVirtually = YesOrNot.N;
+// ContainerInfo.WorkShopType = LesWorkShopType.FAPAOCHEJIAN;
+// await _wmsContainerRep.InsertNowAsync(ContainerInfo);
+// containerModel = ContainerInfo;
+// }
- var isExit = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == containerModel.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG && p.TaskStatus != TaskStatusEnum.QUXIAO);
- if (isExit) return XnRestfulResultProvider.RESTfulMesaage("鎵樼洏瀛樺湪鏈畬鎴愪换鍔�!");
+// var isExit = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == containerModel.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG && p.TaskStatus != TaskStatusEnum.QUXIAO);
+// if (isExit) return XnRestfulResultProvider.RESTfulMesaage("鎵樼洏瀛樺湪鏈畬鎴愪换鍔�!");
- isExit = await _wmsContainerPlaceRep.AnyAsync(p => p.ContainerCode == containerModel.ContainerCode && p.ContainerPlaceStatus == CommonStatus.ENABLE);
- if (isExit) return XnRestfulResultProvider.RESTfulMesaage("鎵樼洏瀛樺湪搴撲綅涓�!");
+// isExit = await _wmsContainerPlaceRep.AnyAsync(p => p.ContainerCode == containerModel.ContainerCode && p.ContainerPlaceStatus == CommonStatus.ENABLE);
+// if (isExit) return XnRestfulResultProvider.RESTfulMesaage("鎵樼洏瀛樺湪搴撲綅涓�!");
- var GetContainerOutputModel = new GetContainerOutput()
- {
- WmsContainer = containerModel.Adapt<WmsContainerDto>(),
- ContainerCode = containerModel.ContainerCode,
- };
- //鑾峰彇缁勭洏鏁版嵁
- GetContainerOutputModel.WmsMaterials = await _wmsMaterialContainerRep
- .Where(p => p.ContainerCode == containerModel.ContainerCode && p.BindStatus == CommonStatus.ENABLE)
- .OrderByDescending(p => p.CreatedTime)
- .ProjectToType<WmsMaterialContainer>().ToListAsync();
- return XnRestfulResultProvider.RESTfulResult(GetContainerOutputModel);
- }
+// var GetContainerOutputModel = new GetContainerOutput()
+// {
+// WmsContainer = containerModel.Adapt<WmsContainerDto>(),
+// ContainerCode = containerModel.ContainerCode,
+// };
+// //鑾峰彇缁勭洏鏁版嵁
+// GetContainerOutputModel.WmsMaterials = await _wmsMaterialContainerRep
+// .Where(p => p.ContainerCode == containerModel.ContainerCode && p.BindStatus == CommonStatus.ENABLE)
+// .OrderByDescending(p => p.CreatedTime)
+// .ProjectToType<WmsMaterialContainer>().ToListAsync();
+// return XnRestfulResultProvider.RESTfulResult(GetContainerOutputModel);
+// }
- /// <summary>
- /// 閫氳繃鍗曟嵁鍙疯幏鍙栨槑缁�
- /// </summary>
- /// <returns></returns>
- [HttpGet("PadGetMaterial")]
- [UnifyResult(typeof(List<PadGetMaterialOutput>))]
- public async Task<object> PadGetMaterial([FromQuery] PadGetMaterialInput input)
- {
- // 鏌ヨ鍗曟嵁灏忕被鏄�滅敓浜у叆搴撯�濈殑Id
- var wmsOrderType = await _wmsOrderTypeRep.FirstOrDefaultAsync(z => z.Name.Contains("鐢熶骇鍏ュ簱"));
- //鑾峰彇涓昏〃
- var wmsOrders = await _wmsOrderRep.DetachedEntities
- .Where(u => u.NO == input.NO && u.OrderStatus == OrderStatusEnum.YIXIAFA && u.OrderLargeCategory == wmsOrderType.Pid && u.OrderSubclass == wmsOrderType.Id)
- .FirstOrDefaultAsync();
- if (wmsOrders == null) return XnRestfulResultProvider.RESTfulMesaage("鍗曟嵁涓嶅瓨鍦ㄦ垨鏈笅鍙�!");
- var wmsOrderDetailList =await _wmsOrderDetailsRep.Where(x=>x.OrderId == wmsOrders.Id)
- .ProjectToType<PadGetMaterialOutput>()
- .ToADPagedListAsync(input.PageNo, input.PageSize);
- return XnRestfulResultProvider.RESTfulResult(wmsOrderDetailList);
- }
+// /// <summary>
+// /// 閫氳繃鍗曟嵁鍙疯幏鍙栨槑缁�
+// /// </summary>
+// /// <returns></returns>
+// [HttpGet("PadGetMaterial")]
+// [UnifyResult(typeof(List<PadGetMaterialOutput>))]
+// public async Task<object> PadGetMaterial([FromQuery] PadGetMaterialInput input)
+// {
+// // 鏌ヨ鍗曟嵁灏忕被鏄�滅敓浜у叆搴撯�濈殑Id
+// var wmsOrderType = await _wmsOrderTypeRep.FirstOrDefaultAsync(z => z.Name.Contains("鐢熶骇鍏ュ簱"));
+// //鑾峰彇涓昏〃
+// var wmsOrders = await _wmsOrderRep.DetachedEntities
+// .Where(u => u.NO == input.NO && u.OrderStatus == OrderStatusEnum.YIXIAFA && u.OrderLargeCategory == wmsOrderType.Pid && u.OrderSubclass == wmsOrderType.Id)
+// .FirstOrDefaultAsync();
+// if (wmsOrders == null) return XnRestfulResultProvider.RESTfulMesaage("鍗曟嵁涓嶅瓨鍦ㄦ垨鏈笅鍙�!");
+// var wmsOrderDetailList =await _wmsOrderDetailsRep.Where(x=>x.OrderId == wmsOrders.Id)
+// .ProjectToType<PadGetMaterialOutput>()
+// .ToADPagedListAsync(input.PageNo, input.PageSize);
+// return XnRestfulResultProvider.RESTfulResult(wmsOrderDetailList);
+// }
- /// <summary>
- /// 鎵ц浠呮敹璐ф搷浣滐紙缁勭洏锛�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("GroupDisk")]
- [UnitOfWork]
- public async Task<GroupDiskOutput> GroupDisk(GroupDiskInput input)
- {
- //鎵樼洏淇℃伅
- var containerModel = await _wmsContainerRep.FirstOrDefaultAsync(n => n.ContainerCode == input.ContainerCode && n.ContainerStatus != ContainerStatus.JINYONG);
- if (containerModel == null) throw Oops.Oh("鎵樼洏淇℃伅涓嶅瓨鍦�!");
+// /// <summary>
+// /// 鎵ц浠呮敹璐ф搷浣滐紙缁勭洏锛�
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("GroupDisk")]
+// [UnitOfWork]
+// public async Task<GroupDiskOutput> GroupDisk(GroupDiskInput input)
+// {
+// //鎵樼洏淇℃伅
+// var containerModel = await _wmsContainerRep.FirstOrDefaultAsync(n => n.ContainerCode == input.ContainerCode && n.ContainerStatus != ContainerStatus.JINYONG);
+// if (containerModel == null) throw Oops.Oh("鎵樼洏淇℃伅涓嶅瓨鍦�!");
- if (containerModel.ContainerStatus == ContainerStatus.FENJIAN) throw Oops.Oh("瀹瑰櫒瀛樺湪鍒嗘嫞淇℃伅!");
+// if (containerModel.ContainerStatus == ContainerStatus.FENJIAN) throw Oops.Oh("瀹瑰櫒瀛樺湪鍒嗘嫞淇℃伅!");
- if (containerModel.ContainerStatus == ContainerStatus.KUWEI) throw Oops.Oh("鎵樼洏瀛樺湪搴撲綅涓�!");
+// if (containerModel.ContainerStatus == ContainerStatus.KUWEI) throw Oops.Oh("鎵樼洏瀛樺湪搴撲綅涓�!");
- var isExit = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == containerModel.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG && p.TaskStatus != TaskStatusEnum.QUXIAO);
- if (isExit) throw Oops.Oh("鎵樼洏瀛樺湪鏈畬鎴愪换鍔′腑!");
+// var isExit = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == containerModel.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG && p.TaskStatus != TaskStatusEnum.QUXIAO);
+// if (isExit) throw Oops.Oh("鎵樼洏瀛樺湪鏈畬鎴愪换鍔′腑!");
- isExit = await _wmsContainerPlaceRep.AnyAsync(p => p.ContainerCode == containerModel.ContainerCode && p.ContainerPlaceStatus == CommonStatus.ENABLE);
- if (isExit) throw Oops.Oh("鎵樼洏瀛樺湪搴撲綅涓�!");
+// isExit = await _wmsContainerPlaceRep.AnyAsync(p => p.ContainerCode == containerModel.ContainerCode && p.ContainerPlaceStatus == CommonStatus.ENABLE);
+// if (isExit) throw Oops.Oh("鎵樼洏瀛樺湪搴撲綅涓�!");
- //缁勭洏淇℃伅
- var WmsMaterialContainerList = await _wmsMaterialContainerRep.Where(p => p.ContainerCode == input.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
+// //缁勭洏淇℃伅
+// var WmsMaterialContainerList = await _wmsMaterialContainerRep.Where(p => p.ContainerCode == input.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
- if (WmsMaterialContainerList.Count > 0) await _wmsMaterialContainerRep.DeleteAsync(WmsMaterialContainerList);
+// if (WmsMaterialContainerList.Count > 0) await _wmsMaterialContainerRep.DeleteAsync(WmsMaterialContainerList);
- //淇敼鎵樼洏鐘舵��
- containerModel.ContainerStatus = ContainerStatus.ZUPANG;
- await _wmsContainerRep.UpdateAsync(containerModel);
+// //淇敼鎵樼洏鐘舵��
+// containerModel.ContainerStatus = ContainerStatus.ZUPANG;
+// await _wmsContainerRep.UpdateAsync(containerModel);
- //缁勭洏鍗曟嵁
- var orderNo = Yitter.IdGenerator.YitIdHelper.NextId().ToString();
- if (input.WmsMaterials.Count >0)//鏈夌墿鏂欑殑鎯呭喌
- {
- foreach (var item in input.WmsMaterials)
- {
- var bindentranceModel = item.Adapt<WmsMaterialContainer>();
- bindentranceModel.MaterialName = item.Materialname;
- bindentranceModel.MaterialNo = item.Materialcode;
- bindentranceModel.MaterialId = 4567;//鏆傚畾
- bindentranceModel.ContainerId = containerModel.Id;
- bindentranceModel.ContainerCode = containerModel.ContainerCode;
- bindentranceModel.MaterialBatch = "N/A";
- bindentranceModel.MaterialSpec = "N/A";
- bindentranceModel.BindQuantity = item.Qty;
- bindentranceModel.BindStatus = CommonStatus.ENABLE;
- bindentranceModel.OrderNo = orderNo;
- bindentranceModel.MaterialDensity = "N/A";
- bindentranceModel.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- await _wmsMaterialContainerRep.InsertAsync(bindentranceModel);
- }
- }
- //else//绌烘墭鍏ュ簱鐨勬儏鍐�
- //{
- // // 鍒涘缓鏂扮粍鐩樿褰�
- // var bindentranceModel = new WmsMaterialContainer();
- // bindentranceModel.MaterialName = "绌烘墭";
- // bindentranceModel.MaterialNo = containerModel.ContainerCode;
- // bindentranceModel.MaterialId = 55555;//鏆傚畾
- // bindentranceModel.ContainerId = containerModel.Id;
- // bindentranceModel.ContainerCode = containerModel.ContainerCode;
- // bindentranceModel.MaterialBatch = "N/A";
- // bindentranceModel.MaterialSpec = containerModel.SpecLength + "*" + containerModel.SpecWidth;
- // bindentranceModel.BindQuantity = 1;
- // bindentranceModel.BindStatus = CommonStatus.ENABLE;
- // bindentranceModel.OrderNo = orderNo;
- // bindentranceModel.MaterialDensity = "N/A";
- // bindentranceModel.Id = YitIdHelper.NextId();
- // await _wmsMaterialContainerRep.InsertNowAsync(bindentranceModel);
- //}
- return new GroupDiskOutput()
- {
- Containercode = input.ContainerCode,
- OrderNo = orderNo
- };
- }
+// //缁勭洏鍗曟嵁
+// var orderNo = Yitter.IdGenerator.YitIdHelper.NextId().ToString();
+// if (input.WmsMaterials.Count >0)//鏈夌墿鏂欑殑鎯呭喌
+// {
+// foreach (var item in input.WmsMaterials)
+// {
+// var bindentranceModel = item.Adapt<WmsMaterialContainer>();
+// bindentranceModel.MaterialName = item.Materialname;
+// bindentranceModel.MaterialNo = item.Materialcode;
+// bindentranceModel.MaterialId = 4567;//鏆傚畾
+// bindentranceModel.ContainerId = containerModel.Id;
+// bindentranceModel.ContainerCode = containerModel.ContainerCode;
+// bindentranceModel.MaterialBatch = "N/A";
+// bindentranceModel.MaterialSpec = "N/A";
+// bindentranceModel.BindQuantity = item.Qty;
+// bindentranceModel.BindStatus = CommonStatus.ENABLE;
+// bindentranceModel.OrderNo = orderNo;
+// bindentranceModel.MaterialDensity = "N/A";
+// bindentranceModel.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// await _wmsMaterialContainerRep.InsertAsync(bindentranceModel);
+// }
+// }
+// //else//绌烘墭鍏ュ簱鐨勬儏鍐�
+// //{
+// // // 鍒涘缓鏂扮粍鐩樿褰�
+// // var bindentranceModel = new WmsMaterialContainer();
+// // bindentranceModel.MaterialName = "绌烘墭";
+// // bindentranceModel.MaterialNo = containerModel.ContainerCode;
+// // bindentranceModel.MaterialId = 55555;//鏆傚畾
+// // bindentranceModel.ContainerId = containerModel.Id;
+// // bindentranceModel.ContainerCode = containerModel.ContainerCode;
+// // bindentranceModel.MaterialBatch = "N/A";
+// // bindentranceModel.MaterialSpec = containerModel.SpecLength + "*" + containerModel.SpecWidth;
+// // bindentranceModel.BindQuantity = 1;
+// // bindentranceModel.BindStatus = CommonStatus.ENABLE;
+// // bindentranceModel.OrderNo = orderNo;
+// // bindentranceModel.MaterialDensity = "N/A";
+// // bindentranceModel.Id = YitIdHelper.NextId();
+// // await _wmsMaterialContainerRep.InsertNowAsync(bindentranceModel);
+// //}
+// return new GroupDiskOutput()
+// {
+// Containercode = input.ContainerCode,
+// OrderNo = orderNo
+// };
+// }
- /// <summary>
- /// 鎻愪氦鍏ュ簱
- /// </summary>
- /// <returns></returns>
- [HttpPost("PdaInWarehouse")]
- [UnitOfWork]
- public async Task PdaInWarehouse([FromBody] PdaInWarehouseInput input)
- {
+// /// <summary>
+// /// 鎻愪氦鍏ュ簱
+// /// </summary>
+// /// <returns></returns>
+// [HttpPost("PdaInWarehouse")]
+// [UnitOfWork]
+// public async Task PdaInWarehouse([FromBody] PdaInWarehouseInput input)
+// {
- //妫�鏌ユ墭鐩�
- var containerModel = await _wmsContainerRep.FirstOrDefaultAsync(p => p.ContainerCode == input.ContainerCode && p.ContainerStatus != ContainerStatus.JINYONG);
- if (containerModel == null) throw Oops.Oh("鎵樼洏涓嶅瓨鍦�!");
+// //妫�鏌ユ墭鐩�
+// var containerModel = await _wmsContainerRep.FirstOrDefaultAsync(p => p.ContainerCode == input.ContainerCode && p.ContainerStatus != ContainerStatus.JINYONG);
+// if (containerModel == null) throw Oops.Oh("鎵樼洏涓嶅瓨鍦�!");
- if (containerModel.ContainerStatus == ContainerStatus.FENJIAN) throw Oops.Oh("瀹瑰櫒瀛樺湪鍒嗘嫞淇℃伅!");
+// if (containerModel.ContainerStatus == ContainerStatus.FENJIAN) throw Oops.Oh("瀹瑰櫒瀛樺湪鍒嗘嫞淇℃伅!");
- var isExit = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == containerModel.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG && p.TaskStatus != TaskStatusEnum.QUXIAO);
- if (isExit) throw Oops.Oh("鎵樼洏瀛樺湪鏈畬鎴愪换鍔′腑!");
+// var isExit = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == containerModel.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG && p.TaskStatus != TaskStatusEnum.QUXIAO);
+// if (isExit) throw Oops.Oh("鎵樼洏瀛樺湪鏈畬鎴愪换鍔′腑!");
- var isInPlace = await _wmsContainerRep.FirstOrDefaultAsync(n => n.ContainerCode == input.ContainerCode && n.ContainerStatus == ContainerStatus.KUWEI);
- if (isInPlace != null) throw Oops.Oh("鎵樼洏瀛樺湪搴撲綅涓�!");
+// var isInPlace = await _wmsContainerRep.FirstOrDefaultAsync(n => n.ContainerCode == input.ContainerCode && n.ContainerStatus == ContainerStatus.KUWEI);
+// if (isInPlace != null) throw Oops.Oh("鎵樼洏瀛樺湪搴撲綅涓�!");
- isExit = await _wmsContainerPlaceRep.AnyAsync(p => p.ContainerCode == containerModel.ContainerCode && p.ContainerPlaceStatus == CommonStatus.ENABLE);
- if (isExit) throw Oops.Oh("鎵樼洏瀛樺湪搴撲綅涓�!");
+// isExit = await _wmsContainerPlaceRep.AnyAsync(p => p.ContainerCode == containerModel.ContainerCode && p.ContainerPlaceStatus == CommonStatus.ENABLE);
+// if (isExit) throw Oops.Oh("鎵樼洏瀛樺湪搴撲綅涓�!");
- //鍒犻櫎缁勭洏淇℃伅
- var oldwmsMaterialContainerList = await _wmsMaterialContainerRep.Where(p => p.ContainerCode == input.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
+// //鍒犻櫎缁勭洏淇℃伅
+// var oldwmsMaterialContainerList = await _wmsMaterialContainerRep.Where(p => p.ContainerCode == input.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
- if (oldwmsMaterialContainerList.Count > 0) await _wmsMaterialContainerRep.DeleteAsync(oldwmsMaterialContainerList);
+// if (oldwmsMaterialContainerList.Count > 0) await _wmsMaterialContainerRep.DeleteAsync(oldwmsMaterialContainerList);
- //缁勭洏鍗曟嵁鍙�
- var orderNo = Yitter.IdGenerator.YitIdHelper.NextId().ToString();
- if (input.WmsMaterials!=null || input.WmsMaterials.Count <= 0)//鏈夌墿鏂欑殑鎯呭喌
- {
- foreach (var item in input.WmsMaterials)
- {
- var bindentranceModel = item.Adapt<WmsMaterialContainer>();
- bindentranceModel.MaterialName = item.Materialname;
- bindentranceModel.MaterialNo = item.Materialcode;
- bindentranceModel.MaterialId = 4567;
- bindentranceModel.ContainerId = containerModel.Id;
- bindentranceModel.ContainerCode = containerModel.ContainerCode;
- bindentranceModel.MaterialBatch = "N/A";
- bindentranceModel.MaterialSpec = "N/A";
- bindentranceModel.BindQuantity = item.Qty;
- bindentranceModel.BindStatus = CommonStatus.ENABLE;
- bindentranceModel.OrderNo = orderNo;
- bindentranceModel.MaterialDensity = "N/A";
- bindentranceModel.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- await _wmsMaterialContainerRep.InsertAsync(bindentranceModel);
- ////鏇存敼鏄庣粏鍏ュ簱鏁伴噺
- //var wmsOrderDetailsModal = await _wmsOrderDetailsRep.FirstOrDefaultAsync(x => x.Id == item.Id);
- //wmsOrderDetailsModal.InventoryQty += item.Qty;
- }
- }
- //else//绌烘墭鍏ュ簱鐨勬儏鍐�
- //{
- // // 鍒涘缓鏂扮粍鐩樿褰�
- // var bindentranceModel = new WmsMaterialContainer();
- // bindentranceModel.MaterialName = "绌烘墭";
- // bindentranceModel.MaterialNo = containerModel.ContainerCode;
- // bindentranceModel.MaterialId = 55555;//鏆傚畾
- // bindentranceModel.ContainerId = containerModel.Id;
- // bindentranceModel.ContainerCode = containerModel.ContainerCode;
- // bindentranceModel.MaterialBatch = "N/A";//鏍规嵁鐗╂枡鐮佽В鏋�
- // bindentranceModel.MaterialSpec = containerModel.SpecLength + "*" + containerModel.SpecWidth;
- // bindentranceModel.BindQuantity = 1;
- // bindentranceModel.BindStatus = CommonStatus.ENABLE;
- // bindentranceModel.OrderNo = orderNo;
- // bindentranceModel.MaterialDensity = "N/A";//鏍规嵁鐗╂枡鐮佽В鏋�
- // bindentranceModel.Id = YitIdHelper.NextId();
- // await _wmsMaterialContainerRep.InsertNowAsync(bindentranceModel);
- //}
+// //缁勭洏鍗曟嵁鍙�
+// var orderNo = Yitter.IdGenerator.YitIdHelper.NextId().ToString();
+// if (input.WmsMaterials!=null || input.WmsMaterials.Count <= 0)//鏈夌墿鏂欑殑鎯呭喌
+// {
+// foreach (var item in input.WmsMaterials)
+// {
+// var bindentranceModel = item.Adapt<WmsMaterialContainer>();
+// bindentranceModel.MaterialName = item.Materialname;
+// bindentranceModel.MaterialNo = item.Materialcode;
+// bindentranceModel.MaterialId = 4567;
+// bindentranceModel.ContainerId = containerModel.Id;
+// bindentranceModel.ContainerCode = containerModel.ContainerCode;
+// bindentranceModel.MaterialBatch = "N/A";
+// bindentranceModel.MaterialSpec = "N/A";
+// bindentranceModel.BindQuantity = item.Qty;
+// bindentranceModel.BindStatus = CommonStatus.ENABLE;
+// bindentranceModel.OrderNo = orderNo;
+// bindentranceModel.MaterialDensity = "N/A";
+// bindentranceModel.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// await _wmsMaterialContainerRep.InsertAsync(bindentranceModel);
+// ////鏇存敼鏄庣粏鍏ュ簱鏁伴噺
+// //var wmsOrderDetailsModal = await _wmsOrderDetailsRep.FirstOrDefaultAsync(x => x.Id == item.Id);
+// //wmsOrderDetailsModal.InventoryQty += item.Qty;
+// }
+// }
+// //else//绌烘墭鍏ュ簱鐨勬儏鍐�
+// //{
+// // // 鍒涘缓鏂扮粍鐩樿褰�
+// // var bindentranceModel = new WmsMaterialContainer();
+// // bindentranceModel.MaterialName = "绌烘墭";
+// // bindentranceModel.MaterialNo = containerModel.ContainerCode;
+// // bindentranceModel.MaterialId = 55555;//鏆傚畾
+// // bindentranceModel.ContainerId = containerModel.Id;
+// // bindentranceModel.ContainerCode = containerModel.ContainerCode;
+// // bindentranceModel.MaterialBatch = "N/A";//鏍规嵁鐗╂枡鐮佽В鏋�
+// // bindentranceModel.MaterialSpec = containerModel.SpecLength + "*" + containerModel.SpecWidth;
+// // bindentranceModel.BindQuantity = 1;
+// // bindentranceModel.BindStatus = CommonStatus.ENABLE;
+// // bindentranceModel.OrderNo = orderNo;
+// // bindentranceModel.MaterialDensity = "N/A";//鏍规嵁鐗╂枡鐮佽В鏋�
+// // bindentranceModel.Id = YitIdHelper.NextId();
+// // await _wmsMaterialContainerRep.InsertNowAsync(bindentranceModel);
+// //}
- ////淇敼鎵樼洏鐘舵��
- //containerModel.ContainerStatus = ContainerStatus.ZUPANG;
- //await _wmsContainerRep.UpdateAsync(containerModel);
- //鍒嗛厤宸烽亾
- var Aisle = 1;
+// ////淇敼鎵樼洏鐘舵��
+// //containerModel.ContainerStatus = ContainerStatus.ZUPANG;
+// //await _wmsContainerRep.UpdateAsync(containerModel);
+// //鍒嗛厤宸烽亾
+// var Aisle = 1;
- //浠诲姟
- var takmodel = new WmsTask()
- {
- TaskNo = Yitter.IdGenerator.YitIdHelper.NextId().ToString(),
- TaskModel = TaskModel.QUANZIDONG,
- TaskType = TaskType.RUKU,
- TaskLevel = 1,
- TaskStatus = TaskStatusEnum.ZHIXINGZHONG,
- OrderNo = orderNo,
- OrderDetailsId = 0,
- ContainerCode = input.ContainerCode,
- SourcePlace = "鍏ュ簱鍙�",//鐜板満鎯呭喌涓虹┖
- ToPlace = "", //鐩爣浣�
- AreaName = "缁濈紭绔嬪簱",
- IsRead = true, //WCS鏄惁鍙互璇诲彇
- SendTimes = 1, //鍙戦�佹鏁�
- Aisle = Aisle,// 鏍规嵁搴撳尯id鑾峰彇鍑犲彿鎻愬崌鏈猴紝娴嬭瘯浣跨敤涓�鍙�
- TaskDodeviceStatus = TaskDodeviceStatusEnum.W
- };
- if (input.WmsMaterials == null || input.WmsMaterials.Count <= 0) {
- takmodel.Description = "绌烘墭";
- }
- else
- {
- takmodel.Description = "鐗╂枡";
- };
+// //浠诲姟
+// var takmodel = new WmsTask()
+// {
+// TaskNo = Yitter.IdGenerator.YitIdHelper.NextId().ToString(),
+// TaskModel = TaskModel.QUANZIDONG,
+// TaskType = TaskType.RUKU,
+// TaskLevel = 1,
+// TaskStatus = TaskStatusEnum.ZHIXINGZHONG,
+// OrderNo = orderNo,
+// OrderDetailsId = 0,
+// ContainerCode = input.ContainerCode,
+// SourcePlace = "鍏ュ簱鍙�",//鐜板満鎯呭喌涓虹┖
+// ToPlace = "", //鐩爣浣�
+// AreaName = "缁濈紭绔嬪簱",
+// IsRead = true, //WCS鏄惁鍙互璇诲彇
+// SendTimes = 1, //鍙戦�佹鏁�
+// Aisle = Aisle,// 鏍规嵁搴撳尯id鑾峰彇鍑犲彿鎻愬崌鏈猴紝娴嬭瘯浣跨敤涓�鍙�
+// TaskDodeviceStatus = TaskDodeviceStatusEnum.W
+// };
+// if (input.WmsMaterials == null || input.WmsMaterials.Count <= 0) {
+// takmodel.Description = "绌烘墭";
+// }
+// else
+// {
+// takmodel.Description = "鐗╂枡";
+// };
- await _wmsTaskRep.InsertAsync(takmodel);
- }
- }
-}
+// await _wmsTaskRep.InsertAsync(takmodel);
+// }
+// }
+//}
--
Gitblit v1.9.3