From 75c4ec6f18f5ae2db91a22b034ecbadf25a7880c Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 12:35:56 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/CallEmpty/CallEmptyService.cs | 206 +++++++++++++++++++++++++-------------------------
1 files changed, 103 insertions(+), 103 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/CallEmpty/CallEmptyService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/CallEmpty/CallEmptyService.cs
index 0f0cb29..ff50579 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/CallEmpty/CallEmptyService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsPda/CallEmpty/CallEmptyService.cs
@@ -1,107 +1,107 @@
-锘縰sing Furion.DatabaseAccessor;
-using Furion.DependencyInjection;
-using Furion.DynamicApiController;
-using Furion.FriendlyException;
-using Mapster;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using System.Linq.Dynamic.Core;
-using Admin.NET.Core;
-using Yitter.IdGenerator;
-using Microsoft.Extensions.Logging;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-using StackExchange.Redis;
+锘�//using Furion.DatabaseAccessor;
+//using Furion.DependencyInjection;
+//using Furion.DynamicApiController;
+//using Furion.FriendlyException;
+//using Mapster;
+//using Microsoft.AspNetCore.Authorization;
+//using Microsoft.AspNetCore.Mvc;
+//using Microsoft.EntityFrameworkCore;
+//using System.Linq.Dynamic.Core;
+//using Admin.NET.Core;
+//using Yitter.IdGenerator;
+//using Microsoft.Extensions.Logging;
+//using Microsoft.AspNetCore.Mvc.RazorPages;
+//using StackExchange.Redis;
-namespace Admin.NET.Application
-{
- /// <summary>
- /// Pda绌烘墭鍑哄簱
- /// </summary>
- [ApiDescriptionSettings("Pda绌烘墭鍑哄簱", Name = "CallEmpty", Order = 100)]
- [Route("api/[Controller]")]
- public class CallEmptyService : IDynamicApiController, ITransient
- {
- private readonly IRepository<WmsOrder, MasterDbContextLocator> _wmsOrderRep;
- private readonly IRepository<WmsOrderDetails, MasterDbContextLocator> _wmsOrderDetailsRep;
- private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
- private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
- private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
- private readonly IRepository<WmsWarehouseEntrance, MasterDbContextLocator> _wmsWarehouseEntranceRep;
- private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
- private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
- private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
- private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
- private readonly IRepository<WmsOrderType, MasterDbContextLocator> _wmsOrderTypeRep;
+//namespace Admin.NET.Application
+//{
+// /// <summary>
+// /// Pda绌烘墭鍑哄簱
+// /// </summary>
+// [ApiDescriptionSettings("Pda绌烘墭鍑哄簱", Name = "CallEmpty", Order = 100)]
+// [Route("api/[Controller]")]
+// public class CallEmptyService : IDynamicApiController, ITransient
+// {
+// private readonly IRepository<WmsOrder, MasterDbContextLocator> _wmsOrderRep;
+// private readonly IRepository<WmsOrderDetails, MasterDbContextLocator> _wmsOrderDetailsRep;
+// private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
+// private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
+// private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
+// private readonly IRepository<WmsWarehouseEntrance, MasterDbContextLocator> _wmsWarehouseEntranceRep;
+// private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
+// private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
+// private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
+// private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
+// private readonly IRepository<WmsOrderType, MasterDbContextLocator> _wmsOrderTypeRep;
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- public CallEmptyService(
- IRepository<WmsOrder, MasterDbContextLocator> wmsOrderRep,
- IRepository<WmsOrderDetails, MasterDbContextLocator> wmsOrderDetailsRep,
- IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
- IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
- IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
- IRepository<WmsWarehouseEntrance, MasterDbContextLocator> wmsWarehouseEntranceRep,
- IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep,
- IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
- IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
- IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
- IRepository<WmsOrderType, MasterDbContextLocator> wmsOrderTypeRep
- )
- {
- _wmsOrderRep = wmsOrderRep;
- _wmsOrderDetailsRep = wmsOrderDetailsRep;
- _wmsTaskRep = wmsTaskRep;
- _wmsPlaceRep = wmsPlaceRep;
- _wmsAreaRep = wmsAreaRep;
- _wmsWarehouseEntranceRep = wmsWarehouseEntranceRep;
- _wmsMaterialContainerRep = wmsMaterialContainerRep;
- _wmsContainerRep = wmsContainerRep;
- _wmsContainerPlaceRep = wmsContainerPlaceRep;
- _wmsMaterialStockRep = wmsMaterialStockRep;
- _wmsOrderTypeRep = wmsOrderTypeRep;
- }
+// /// <summary>
+// /// 鏋勯�犲嚱鏁�
+// /// </summary>
+// public CallEmptyService(
+// IRepository<WmsOrder, MasterDbContextLocator> wmsOrderRep,
+// IRepository<WmsOrderDetails, MasterDbContextLocator> wmsOrderDetailsRep,
+// IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
+// IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
+// IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
+// IRepository<WmsWarehouseEntrance, MasterDbContextLocator> wmsWarehouseEntranceRep,
+// IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep,
+// IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
+// IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
+// IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
+// IRepository<WmsOrderType, MasterDbContextLocator> wmsOrderTypeRep
+// )
+// {
+// _wmsOrderRep = wmsOrderRep;
+// _wmsOrderDetailsRep = wmsOrderDetailsRep;
+// _wmsTaskRep = wmsTaskRep;
+// _wmsPlaceRep = wmsPlaceRep;
+// _wmsAreaRep = wmsAreaRep;
+// _wmsWarehouseEntranceRep = wmsWarehouseEntranceRep;
+// _wmsMaterialContainerRep = wmsMaterialContainerRep;
+// _wmsContainerRep = wmsContainerRep;
+// _wmsContainerPlaceRep = wmsContainerPlaceRep;
+// _wmsMaterialStockRep = wmsMaterialStockRep;
+// _wmsOrderTypeRep = wmsOrderTypeRep;
+// }
- /// <summary>
- /// 鎻愪氦鍑哄簱
- /// </summary>
- /// <returns></returns>
- [HttpPost("PdaContainerOut")]
- [UnitOfWork]
- public async Task PdaContainerOut([FromBody] PdaContainerOutInput input)
- {
- //鏍规嵁杈撳叆鏁伴噺寰幆鍑哄簱鐨勬墭鐩樻暟閲�
- for (int i = 1; i < input.Qty+1; i++)
- {
- //鑾峰彇搴撳瓨涓殑绌烘墭鐩�
- var wmsMaterialStockModal = await _wmsMaterialStockRep.FirstOrDefaultAsync(x => x.Source == RuKuSourceEnum.KONGTUO);
- //鑾峰彇搴撲綅淇℃伅
- var wmsPlacModal = await _wmsPlaceRep.FirstOrDefaultAsync(x => x.PlaceCode == wmsMaterialStockModal.PlaceCode);
- //浠诲姟
- var takmodel = new WmsTask()
- {
- TaskNo = Yitter.IdGenerator.YitIdHelper.NextId().ToString(),
- TaskModel = TaskModel.QUANZIDONG,
- TaskType = TaskType.CHUKU,
- TaskLevel = 1,
- TaskStatus = TaskStatusEnum.WEIZHIXING,
- OrderNo = "N/A",
- OrderDetailsId = 0,
- ContainerCode = wmsMaterialStockModal.ContainerCode,
- SourcePlace = wmsMaterialStockModal.PlaceCode,
- ToPlace = wmsPlacModal.Aisle.ToString(), //鐩爣浣�
- AreaName = "缁濈紭绔嬪簱",
- IsRead = true, //WCS鏄惁鍙互璇诲彇
- SendTimes = 1, //鍙戦�佹鏁�
- Aisle = wmsPlacModal.Aisle,
- TaskDodeviceStatus = TaskDodeviceStatusEnum.W,
- Description = "绌烘墭"
- };
- await _wmsTaskRep.InsertAsync(takmodel);
- }
- }
- }
-}
+// /// <summary>
+// /// 鎻愪氦鍑哄簱
+// /// </summary>
+// /// <returns></returns>
+// [HttpPost("PdaContainerOut")]
+// [UnitOfWork]
+// public async Task PdaContainerOut([FromBody] PdaContainerOutInput input)
+// {
+// //鏍规嵁杈撳叆鏁伴噺寰幆鍑哄簱鐨勬墭鐩樻暟閲�
+// for (int i = 1; i < input.Qty+1; i++)
+// {
+// //鑾峰彇搴撳瓨涓殑绌烘墭鐩�
+// var wmsMaterialStockModal = await _wmsMaterialStockRep.FirstOrDefaultAsync(x => x.Source == RuKuSourceEnum.KONGTUO);
+// //鑾峰彇搴撲綅淇℃伅
+// var wmsPlacModal = await _wmsPlaceRep.FirstOrDefaultAsync(x => x.PlaceCode == wmsMaterialStockModal.PlaceCode);
+// //浠诲姟
+// var takmodel = new WmsTask()
+// {
+// TaskNo = Yitter.IdGenerator.YitIdHelper.NextId().ToString(),
+// TaskModel = TaskModel.QUANZIDONG,
+// TaskType = TaskType.CHUKU,
+// TaskLevel = 1,
+// TaskStatus = TaskStatusEnum.WEIZHIXING,
+// OrderNo = "N/A",
+// OrderDetailsId = 0,
+// ContainerCode = wmsMaterialStockModal.ContainerCode,
+// SourcePlace = wmsMaterialStockModal.PlaceCode,
+// ToPlace = wmsPlacModal.Aisle.ToString(), //鐩爣浣�
+// AreaName = "缁濈紭绔嬪簱",
+// IsRead = true, //WCS鏄惁鍙互璇诲彇
+// SendTimes = 1, //鍙戦�佹鏁�
+// Aisle = wmsPlacModal.Aisle,
+// TaskDodeviceStatus = TaskDodeviceStatusEnum.W,
+// Description = "绌烘墭"
+// };
+// await _wmsTaskRep.InsertAsync(takmodel);
+// }
+// }
+// }
+//}
--
Gitblit v1.9.3