From 6097dd7e7d8a736729c4b8be66ea107eb740d9f1 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周二, 23 4月 2024 13:47:14 +0800
Subject: [PATCH] 基础数据新增实体
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/BindEntrance/BindEntranceService.cs | 944 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 472 insertions(+), 472 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/BindEntrance/BindEntranceService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/BindEntrance/BindEntranceService.cs
index 60da52f..97474d1 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/BindEntrance/BindEntranceService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/Common/BindEntrance/BindEntranceService.cs
@@ -1,518 +1,518 @@
-锘縰sing Furion.DatabaseAccessor;
-using Furion.DependencyInjection;
-using Furion.DynamicApiController;
-using Furion.FriendlyException;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Yitter.IdGenerator;
-using Admin.NET.Core;
+锘�//using Furion.DatabaseAccessor;
+//using Furion.DependencyInjection;
+//using Furion.DynamicApiController;
+//using Furion.FriendlyException;
+//using Mapster;
+//using Microsoft.AspNetCore.Mvc;
+//using Microsoft.EntityFrameworkCore;
+//using Yitter.IdGenerator;
+//using Admin.NET.Core;
-namespace Admin.NET.Application
-{
- /// <summary>
- /// 鍏ュ簱绠＄悊鏈嶅姟
- /// </summary>
- [ApiDescriptionSettings("鑷繁鐨勪笟鍔�", Name = "BindEntrance", Order = 100)]
- [Route("api/[Controller]")]
- public class BindEntranceService : IDynamicApiController, ITransient
- {
- private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
- private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
- private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
- private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
- private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
- private readonly IRepository<WmsMaterial, MasterDbContextLocator> _wmsMaterialRep;
- private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
- private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
+//namespace Admin.NET.Application
+//{
+// /// <summary>
+// /// 鍏ュ簱绠＄悊鏈嶅姟
+// /// </summary>
+// [ApiDescriptionSettings("鑷繁鐨勪笟鍔�", Name = "BindEntrance", Order = 100)]
+// [Route("api/[Controller]")]
+// public class BindEntranceService : IDynamicApiController, ITransient
+// {
+// private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
+// private readonly IRepository<WmsPlace, MasterDbContextLocator> _wmsPlaceRep;
+// private readonly IRepository<WmsTask, MasterDbContextLocator> _wmsTaskRep;
+// private readonly IRepository<WmsContainer, MasterDbContextLocator> _wmsContainerRep;
+// private readonly IRepository<WmsContainerPlace, MasterDbContextLocator> _wmsContainerPlaceRep;
+// private readonly IRepository<WmsMaterial, MasterDbContextLocator> _wmsMaterialRep;
+// private readonly IRepository<WmsMaterialStock, MasterDbContextLocator> _wmsMaterialStockRep;
+// private readonly IRepository<WmsMaterialContainer, MasterDbContextLocator> _wmsMaterialContainerRep;
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- public BindEntranceService(
- IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
- IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
- IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
- IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
- IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
- IRepository<WmsMaterial, MasterDbContextLocator> wmsMaterialRep,
- IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
- IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep)
- {
- this._wmsAreaRep = wmsAreaRep;
- this._wmsPlaceRep = wmsPlaceRep;
- this._wmsTaskRep = wmsTaskRep;
- this._wmsContainerRep = wmsContainerRep;
- this._wmsContainerPlaceRep = wmsContainerPlaceRep;
- this._wmsMaterialRep = wmsMaterialRep;
- this._wmsMaterialStockRep = wmsMaterialStockRep;
- this._wmsMaterialContainerRep = wmsMaterialContainerRep;
- }
+// /// <summary>
+// /// 鏋勯�犲嚱鏁�
+// /// </summary>
+// public BindEntranceService(
+// IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep,
+// IRepository<WmsPlace, MasterDbContextLocator> wmsPlaceRep,
+// IRepository<WmsTask, MasterDbContextLocator> wmsTaskRep,
+// IRepository<WmsContainer, MasterDbContextLocator> wmsContainerRep,
+// IRepository<WmsContainerPlace, MasterDbContextLocator> wmsContainerPlaceRep,
+// IRepository<WmsMaterial, MasterDbContextLocator> wmsMaterialRep,
+// IRepository<WmsMaterialStock, MasterDbContextLocator> wmsMaterialStockRep,
+// IRepository<WmsMaterialContainer, MasterDbContextLocator> wmsMaterialContainerRep)
+// {
+// this._wmsAreaRep = wmsAreaRep;
+// this._wmsPlaceRep = wmsPlaceRep;
+// this._wmsTaskRep = wmsTaskRep;
+// this._wmsContainerRep = wmsContainerRep;
+// this._wmsContainerPlaceRep = wmsContainerPlaceRep;
+// this._wmsMaterialRep = wmsMaterialRep;
+// this._wmsMaterialStockRep = wmsMaterialStockRep;
+// this._wmsMaterialContainerRep = wmsMaterialContainerRep;
+// }
- /// <summary>
- /// 鎵樼洏鏌ヨ缁勭洏鐗╂枡
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpGet("getcontainer")]
- [UnifyResult(typeof(BindEntranceOutput))]
- public async Task<object> GetContainer([FromQuery] BindEntranceInput input)
- {
- var bindEntranceOutputModel = new BindEntranceOutput();
+// /// <summary>
+// /// 鎵樼洏鏌ヨ缁勭洏鐗╂枡
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpGet("getcontainer")]
+// [UnifyResult(typeof(BindEntranceOutput))]
+// public async Task<object> GetContainer([FromQuery] BindEntranceInput input)
+// {
+// var bindEntranceOutputModel = new BindEntranceOutput();
- var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(n => n.ContainerCode == input.ContainerCode && n.ContainerStatus != ContainerStatus.JINYONG);
- if (wmsContainer == null)
- {
- var newWmsContainer = new WmsContainerDto();
- newWmsContainer.ContainerCode = input.ContainerCode;
- newWmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
- newWmsContainer.ContainerType = ContainerType.SULIAO;
+// var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(n => n.ContainerCode == input.ContainerCode && n.ContainerStatus != ContainerStatus.JINYONG);
+// if (wmsContainer == null)
+// {
+// var newWmsContainer = new WmsContainerDto();
+// newWmsContainer.ContainerCode = input.ContainerCode;
+// newWmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
+// newWmsContainer.ContainerType = ContainerType.SULIAO;
- bindEntranceOutputModel.ContainerCode = input.ContainerCode;
- bindEntranceOutputModel.WmsContainer = newWmsContainer;
+// bindEntranceOutputModel.ContainerCode = input.ContainerCode;
+// bindEntranceOutputModel.WmsContainer = newWmsContainer;
- if (wmsContainer != null)
- {
- var isWmsTask = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
- if (isWmsTask) return XnRestfulResultProvider.RESTfulMesaage("鍛ㄨ浆绠卞彿瀛樺湪鏈畬鎴愪换鍔�!");
+// if (wmsContainer != null)
+// {
+// var isWmsTask = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
+// if (isWmsTask) return XnRestfulResultProvider.RESTfulMesaage("鍛ㄨ浆绠卞彿瀛樺湪鏈畬鎴愪换鍔�!");
- bindEntranceOutputModel.WmsContainer = wmsContainer.Adapt<WmsContainerDto>();
- bindEntranceOutputModel.ContainerCode = wmsContainer.ContainerCode;
+// bindEntranceOutputModel.WmsContainer = wmsContainer.Adapt<WmsContainerDto>();
+// bindEntranceOutputModel.ContainerCode = wmsContainer.ContainerCode;
- // 鍛ㄨ浆绠卞彿缁勭洏鐘舵��
- if (wmsContainer.ContainerStatus == ContainerStatus.ZUPANG)
- {
- bindEntranceOutputModel.WmsMaterials = await _wmsMaterialContainerRep
- .Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ProjectToType<GetMaterialContainerOutput>().ToListAsync();
+// // 鍛ㄨ浆绠卞彿缁勭洏鐘舵��
+// if (wmsContainer.ContainerStatus == ContainerStatus.ZUPANG)
+// {
+// bindEntranceOutputModel.WmsMaterials = await _wmsMaterialContainerRep
+// .Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ProjectToType<GetMaterialContainerOutput>().ToListAsync();
- return XnRestfulResultProvider.RESTfulResult(bindEntranceOutputModel);
- }
- // 鍛ㄨ浆绠卞彿搴撲綅鐘舵��
- if (wmsContainer.ContainerStatus == ContainerStatus.KUWEI)
- {
- // 鏌ヨ鍛ㄨ浆绠卞彿涓庡簱浣嶅叧绯�
- var wmsContainerPlace = await _wmsContainerPlaceRep.FirstOrDefaultAsync(u => u.ContainerId == wmsContainer.Id && u.ContainerCode == wmsContainer.ContainerCode);
+// return XnRestfulResultProvider.RESTfulResult(bindEntranceOutputModel);
+// }
+// // 鍛ㄨ浆绠卞彿搴撲綅鐘舵��
+// if (wmsContainer.ContainerStatus == ContainerStatus.KUWEI)
+// {
+// // 鏌ヨ鍛ㄨ浆绠卞彿涓庡簱浣嶅叧绯�
+// var wmsContainerPlace = await _wmsContainerPlaceRep.FirstOrDefaultAsync(u => u.ContainerId == wmsContainer.Id && u.ContainerCode == wmsContainer.ContainerCode);
- if (wmsContainerPlace != null) bindEntranceOutputModel.PlaceCode = wmsContainerPlace.PlaceCode;
+// if (wmsContainerPlace != null) bindEntranceOutputModel.PlaceCode = wmsContainerPlace.PlaceCode;
- return XnRestfulResultProvider.RESTfulResult(bindEntranceOutputModel);
- }
- }
- }
- return XnRestfulResultProvider.RESTfulResult(bindEntranceOutputModel);
- }
+// return XnRestfulResultProvider.RESTfulResult(bindEntranceOutputModel);
+// }
+// }
+// }
+// return XnRestfulResultProvider.RESTfulResult(bindEntranceOutputModel);
+// }
- /// <summary>
- /// 鎵爜鑾峰彇鐗╂枡
- /// </summary>
- /// <returns></returns>
- [HttpGet("GetMaterial")]
- [UnifyResult(typeof(MaterialOutput))]
- public async Task<object> GetMaterial([FromQuery] GetMaterialInput input)
- {
- var material = new MaterialOutput();
- material.MaterialName = "鑳跺悎鏉�";
- material.MaterialNo = "JHB20110101";
- material.MaterialId = 43214325321513;
- material.MaterialBatch = "DIYIPICI001";
- material.MaterialType = MaterialType.BAOZHUANGCAILIAO;
- material.InspectionMethod = MaterialInspection.MIANJIAN;
- material.MaterialSpec = "";
- material.MaterialDensity = "";
- material.MaterialUnit = "";
- material.LesWorkshopSection = LesWorkshopSection.CNC;
- return XnRestfulResultProvider.RESTfulResult(material);
+// /// <summary>
+// /// 鎵爜鑾峰彇鐗╂枡
+// /// </summary>
+// /// <returns></returns>
+// [HttpGet("GetMaterial")]
+// [UnifyResult(typeof(MaterialOutput))]
+// public async Task<object> GetMaterial([FromQuery] GetMaterialInput input)
+// {
+// var material = new MaterialOutput();
+// material.MaterialName = "鑳跺悎鏉�";
+// material.MaterialNo = "JHB20110101";
+// material.MaterialId = 43214325321513;
+// material.MaterialBatch = "DIYIPICI001";
+// material.MaterialType = MaterialType.BAOZHUANGCAILIAO;
+// material.InspectionMethod = MaterialInspection.MIANJIAN;
+// material.MaterialSpec = "";
+// material.MaterialDensity = "";
+// material.MaterialUnit = "";
+// material.LesWorkshopSection = LesWorkshopSection.CNC;
+// return XnRestfulResultProvider.RESTfulResult(material);
- }
+// }
- /// <summary>
- /// 缁勭洏
- /// </summary>
- /// <returns></returns>
- [HttpPost("AutoWare")]
- public async Task AutoWare(WarehousingInput input)
- {
- // 鏍规嵁鎵樼洏鍙锋煡璇㈡墭鐩樺彿淇℃伅鏄惁宸插瓨鍦�
- var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(u => u.ContainerCode == input.ContainerCode);
- if (wmsContainer == null)
- {
- // 涓嶅瓨鍦ㄥ垯娣诲姞鎵樼洏鍙蜂俊鎭�
- wmsContainer = new WmsContainer
- {
- ContainerCode = input.ContainerCode,
- ContainerType = ContainerType.SULIAO,
- ContainerStatus = ContainerStatus.KOUXIAN,
- AssetNo = "N/A",
- ErpNo = "N/A"
- };
- await _wmsContainerRep.InsertNowAsync(wmsContainer);
- }
- // 鏌ヨ鏄惁浠诲姟宸插瓨鍦�
- var isExit = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
- if (isExit) throw Oops.Oh("鎵樼洏鍙峰瓨鍦ㄦ湭瀹屾垚浠诲姟涓�!");
+// /// <summary>
+// /// 缁勭洏
+// /// </summary>
+// /// <returns></returns>
+// [HttpPost("AutoWare")]
+// public async Task AutoWare(WarehousingInput input)
+// {
+// // 鏍规嵁鎵樼洏鍙锋煡璇㈡墭鐩樺彿淇℃伅鏄惁宸插瓨鍦�
+// var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(u => u.ContainerCode == input.ContainerCode);
+// if (wmsContainer == null)
+// {
+// // 涓嶅瓨鍦ㄥ垯娣诲姞鎵樼洏鍙蜂俊鎭�
+// wmsContainer = new WmsContainer
+// {
+// ContainerCode = input.ContainerCode,
+// ContainerType = ContainerType.SULIAO,
+// ContainerStatus = ContainerStatus.KOUXIAN,
+// AssetNo = "N/A",
+// ErpNo = "N/A"
+// };
+// await _wmsContainerRep.InsertNowAsync(wmsContainer);
+// }
+// // 鏌ヨ鏄惁浠诲姟宸插瓨鍦�
+// var isExit = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
+// if (isExit) throw Oops.Oh("鎵樼洏鍙峰瓨鍦ㄦ湭瀹屾垚浠诲姟涓�!");
- // 鏌ヨ宸茬粍鐩樹俊鎭�
- var wmsMaterialContainerList = await _wmsMaterialContainerRep
- .Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
- await _wmsMaterialContainerRep.DeleteAsync(wmsMaterialContainerList);
- var orderNo = "N/A";
- if (input.WmsMaterials.Count > 0)
- {
- wmsContainer.ContainerStatus = ContainerStatus.ZUPANG;
- orderNo = YitIdHelper.NextId().ToString();
- await _wmsContainerRep.UpdateAsync(wmsContainer);
- }
- // 鍒涘缓鏂扮粍鐩樿褰�
- foreach (var item in input.WmsMaterials)
- {
- //鍒涘缓缁勭洏璁板綍
- var bindentranceModel = new WmsMaterialContainer();
- bindentranceModel.ContainerId = wmsContainer.Id;
- bindentranceModel.ContainerCode = wmsContainer.ContainerCode;
- bindentranceModel.MaterialNo = item.MaterialNo;
- bindentranceModel.MaterialId = 478183507525701;
- bindentranceModel.MaterialBatch = item.MaterialBatch;
- bindentranceModel.BindQuantity = 1;
- bindentranceModel.BindStatus = CommonStatus.ENABLE;
- bindentranceModel.OrderNo = orderNo;
- bindentranceModel.MaterialName = item.MaterialName;
- bindentranceModel.MaterialDensity = "N/A";
- await _wmsMaterialContainerRep.InsertNowAsync(bindentranceModel);
- }
- }
+// // 鏌ヨ宸茬粍鐩樹俊鎭�
+// var wmsMaterialContainerList = await _wmsMaterialContainerRep
+// .Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
+// await _wmsMaterialContainerRep.DeleteAsync(wmsMaterialContainerList);
+// var orderNo = "N/A";
+// if (input.WmsMaterials.Count > 0)
+// {
+// wmsContainer.ContainerStatus = ContainerStatus.ZUPANG;
+// orderNo = YitIdHelper.NextId().ToString();
+// await _wmsContainerRep.UpdateAsync(wmsContainer);
+// }
+// // 鍒涘缓鏂扮粍鐩樿褰�
+// foreach (var item in input.WmsMaterials)
+// {
+// //鍒涘缓缁勭洏璁板綍
+// var bindentranceModel = new WmsMaterialContainer();
+// bindentranceModel.ContainerId = wmsContainer.Id;
+// bindentranceModel.ContainerCode = wmsContainer.ContainerCode;
+// bindentranceModel.MaterialNo = item.MaterialNo;
+// bindentranceModel.MaterialId = 478183507525701;
+// bindentranceModel.MaterialBatch = item.MaterialBatch;
+// bindentranceModel.BindQuantity = 1;
+// bindentranceModel.BindStatus = CommonStatus.ENABLE;
+// bindentranceModel.OrderNo = orderNo;
+// bindentranceModel.MaterialName = item.MaterialName;
+// bindentranceModel.MaterialDensity = "N/A";
+// await _wmsMaterialContainerRep.InsertNowAsync(bindentranceModel);
+// }
+// }
- /// <summary>
- /// 鑷姩鍏ュ簱
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("automaticWarehousing")]
- [UnitOfWork]
- public async Task AutomaticWarehousing(WarehousingInput input)
- {
- // 鏌ヨ娣峰悎鏂欏簱鍖轰俊鎭�
- var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.AreaName.Contains("缁濈紭绔嬪簱"));
- // 鏍规嵁鏂欑鍙锋煡璇㈠懆杞鍙蜂俊鎭槸鍚﹀凡瀛樺湪
- var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(u => u.ContainerCode == input.ContainerCode);
- if (wmsContainer == null)
- {
- // 涓嶅瓨鍦ㄥ垯娣诲姞鍛ㄨ浆绠卞彿淇℃伅
- wmsContainer = new WmsContainer
- {
- ContainerCode = input.ContainerCode,
- ContainerType = ContainerType.JINSHU,
- ContainerStatus = ContainerStatus.KOUXIAN,
- AssetNo = "N/A",
- ErpNo = "N/A"
- };
- await _wmsContainerRep.InsertNowAsync(wmsContainer);
- }
- else
- {
- // 鏇存柊鍛ㄨ浆绠卞彿鐘舵�佷负鈥滃簱浣嶁��
- wmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
- await _wmsContainerRep.UpdateAsync(wmsContainer);
- }
+// /// <summary>
+// /// 鑷姩鍏ュ簱
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("automaticWarehousing")]
+// [UnitOfWork]
+// public async Task AutomaticWarehousing(WarehousingInput input)
+// {
+// // 鏌ヨ娣峰悎鏂欏簱鍖轰俊鎭�
+// var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.AreaName.Contains("缁濈紭绔嬪簱"));
+// // 鏍规嵁鏂欑鍙锋煡璇㈠懆杞鍙蜂俊鎭槸鍚﹀凡瀛樺湪
+// var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(u => u.ContainerCode == input.ContainerCode);
+// if (wmsContainer == null)
+// {
+// // 涓嶅瓨鍦ㄥ垯娣诲姞鍛ㄨ浆绠卞彿淇℃伅
+// wmsContainer = new WmsContainer
+// {
+// ContainerCode = input.ContainerCode,
+// ContainerType = ContainerType.JINSHU,
+// ContainerStatus = ContainerStatus.KOUXIAN,
+// AssetNo = "N/A",
+// ErpNo = "N/A"
+// };
+// await _wmsContainerRep.InsertNowAsync(wmsContainer);
+// }
+// else
+// {
+// // 鏇存柊鍛ㄨ浆绠卞彿鐘舵�佷负鈥滃簱浣嶁��
+// wmsContainer.ContainerStatus = ContainerStatus.KOUXIAN;
+// await _wmsContainerRep.UpdateAsync(wmsContainer);
+// }
- // 鏌ヨ鍛ㄨ浆绠卞彿鏄惁宸插瓨鍦ㄤ换鍔�
- var isWmsTask = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
- if (isWmsTask) throw Oops.Oh("鍛ㄨ浆绠卞彿瀛樺湪鏈畬鎴愪换鍔′腑!");
+// // 鏌ヨ鍛ㄨ浆绠卞彿鏄惁宸插瓨鍦ㄤ换鍔�
+// var isWmsTask = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
+// if (isWmsTask) throw Oops.Oh("鍛ㄨ浆绠卞彿瀛樺湪鏈畬鎴愪换鍔′腑!");
- // 鍒犻櫎宸茬粍鐩樹俊鎭�
- var oldWmsMaterialContainerList = await _wmsMaterialContainerRep
- .Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
+// // 鍒犻櫎宸茬粍鐩樹俊鎭�
+// var oldWmsMaterialContainerList = await _wmsMaterialContainerRep
+// .Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
- foreach (var item in oldWmsMaterialContainerList)
- {
- await _wmsMaterialContainerRep.DeleteAsync(item);
- }
+// foreach (var item in oldWmsMaterialContainerList)
+// {
+// await _wmsMaterialContainerRep.DeleteAsync(item);
+// }
- // 缁勭洏鍗曟嵁 榛樿绌烘枡绠卞崟鎹�
- var source = ""; //瀹氫箟鍏ュ簱鏉ユ簮
- var orderNo = "N/A";
- if (input.WmsMaterials.Count > 0)
- {
- wmsContainer.ContainerStatus = ContainerStatus.ZUPANG;
- orderNo = YitIdHelper.NextId().ToString();
- await _wmsContainerRep.UpdateAsync(wmsContainer);
- source = "鐗╂枡";
- }
- else
- {
- source = "绌烘墭";
- }
- // 鏌ヨ鐗╂枡Id
- var wmsMaterial = await _wmsMaterialRep.FirstOrDefaultAsync(u => u.MaterialNo == "N/A" && u.MaterialName == "N/A" && u.MaterialBatch == "N/A");
+// // 缁勭洏鍗曟嵁 榛樿绌烘枡绠卞崟鎹�
+// var source = ""; //瀹氫箟鍏ュ簱鏉ユ簮
+// var orderNo = "N/A";
+// if (input.WmsMaterials.Count > 0)
+// {
+// wmsContainer.ContainerStatus = ContainerStatus.ZUPANG;
+// orderNo = YitIdHelper.NextId().ToString();
+// await _wmsContainerRep.UpdateAsync(wmsContainer);
+// source = "鐗╂枡";
+// }
+// else
+// {
+// source = "绌烘墭";
+// }
+// // 鏌ヨ鐗╂枡Id
+// var wmsMaterial = await _wmsMaterialRep.FirstOrDefaultAsync(u => u.MaterialNo == "N/A" && u.MaterialName == "N/A" && u.MaterialBatch == "N/A");
- // 鍒涘缓鏂扮粍鐩樿褰�
- foreach (var item in input.WmsMaterials)
- {
- var wmsMaterialContainer = item.Adapt<WmsMaterialContainer>();
- wmsMaterialContainer.OrderNo = orderNo;
- wmsMaterialContainer.ContainerId = wmsContainer.Id;
- wmsMaterialContainer.ContainerCode = wmsContainer.ContainerCode;
- wmsMaterialContainer.MaterialId = wmsMaterial.Id;
- wmsMaterialContainer.BindStatus = CommonStatus.ENABLE;
- await _wmsMaterialContainerRep.InsertNowAsync(wmsMaterialContainer);
- }
+// // 鍒涘缓鏂扮粍鐩樿褰�
+// foreach (var item in input.WmsMaterials)
+// {
+// var wmsMaterialContainer = item.Adapt<WmsMaterialContainer>();
+// wmsMaterialContainer.OrderNo = orderNo;
+// wmsMaterialContainer.ContainerId = wmsContainer.Id;
+// wmsMaterialContainer.ContainerCode = wmsContainer.ContainerCode;
+// wmsMaterialContainer.MaterialId = wmsMaterial.Id;
+// wmsMaterialContainer.BindStatus = CommonStatus.ENABLE;
+// await _wmsMaterialContainerRep.InsertNowAsync(wmsMaterialContainer);
+// }
- //if (input.Source == RuKuSourceEnum.KONGTUO)
- //else if (input.Source == RuKuSourceEnum.WULIAO)
+// //if (input.Source == RuKuSourceEnum.KONGTUO)
+// //else if (input.Source == RuKuSourceEnum.WULIAO)
- //鍒涘缓宸烽亾鍒嗛厤
- var wmsPlace = await _wmsPlaceRep.Where(u => u.PlaceStatus == PlaceStatus.KONGXIAN).ToListAsync();
- var one = wmsPlace.Where(s => s.Aisle==1).ToList().Count;
- var two = wmsPlace.Where(s => s.Aisle == 2).ToList().Count;
- var three = wmsPlace.Where(s => s.Aisle == 3).ToList().Count;
- var Aisle = 0;
- if (one >= two && one >= three)
- {
- Aisle = 1;
- }
- else if (two >= one && two >= three)
- {
- Aisle = 2;
- }
- else
- {
- Aisle = 3;
- }
+// //鍒涘缓宸烽亾鍒嗛厤
+// var wmsPlace = await _wmsPlaceRep.Where(u => u.PlaceStatus == PlaceStatus.KONGXIAN).ToListAsync();
+// var one = wmsPlace.Where(s => s.Aisle==1).ToList().Count;
+// var two = wmsPlace.Where(s => s.Aisle == 2).ToList().Count;
+// var three = wmsPlace.Where(s => s.Aisle == 3).ToList().Count;
+// var Aisle = 0;
+// if (one >= two && one >= three)
+// {
+// Aisle = 1;
+// }
+// else if (two >= one && two >= three)
+// {
+// Aisle = 2;
+// }
+// else
+// {
+// Aisle = 3;
+// }
- string taskNo = "RUKU"+ DateTime.Today.ToString("yyyyMMdd");
- var wmsTaskModel = await _wmsTaskRep.DetachedEntities.FirstOrDefaultAsync(u => EF.Functions.Like(u.TaskNo, $"%{taskNo}%"));
- if (wmsTaskModel == null)
- {
- taskNo = taskNo + "0001";
- }
- else
- {
- //鑾峰彇娴佹按鍙锋渶澶х殑鏁版嵁
- var maxSerialNumber = await _wmsTaskRep.MaxAsync(t => t.TaskNo);
- taskNo = Comm.GenerateNewInvoiceNumber(maxSerialNumber, 1);
- }
+// string taskNo = "RUKU"+ DateTime.Today.ToString("yyyyMMdd");
+// var wmsTaskModel = await _wmsTaskRep.DetachedEntities.FirstOrDefaultAsync(u => EF.Functions.Like(u.TaskNo, $"%{taskNo}%"));
+// if (wmsTaskModel == null)
+// {
+// taskNo = taskNo + "0001";
+// }
+// else
+// {
+// //鑾峰彇娴佹按鍙锋渶澶х殑鏁版嵁
+// var maxSerialNumber = await _wmsTaskRep.MaxAsync(t => t.TaskNo);
+// taskNo = Comm.GenerateNewInvoiceNumber(maxSerialNumber, 1);
+// }
- // 鍒涘缓浠诲姟
- var takmodel = new WmsTask()
- {
- TaskNo = taskNo,//YitIdHelper.NextId().ToString(),
- TaskModel = TaskModel.QUANZIDONG,
- TaskType = TaskType.RUKU,
- TaskLevel = 1,
- Aisle = Aisle,
- TaskStatus = TaskStatusEnum.WEIZHIXING,
- ContainerCode = wmsContainer.ContainerCode,
- SourcePlace = "鍏ュ簱鍙�",
- ToPlace = "",
- AreaName = wmsArea != null ? wmsArea.AreaName : "",
- OrderNo = orderNo,
- Description = source, //鍏ュ簱鏉ユ簮
- TaskDodeviceStatus = TaskDodeviceStatusEnum.WZX,
- IsRead = true
- };
- await _wmsTaskRep.InsertAsync(takmodel);
- }
+// // 鍒涘缓浠诲姟
+// var takmodel = new WmsTask()
+// {
+// TaskNo = taskNo,//YitIdHelper.NextId().ToString(),
+// TaskModel = TaskModel.QUANZIDONG,
+// TaskType = TaskType.RUKU,
+// TaskLevel = 1,
+// Aisle = Aisle,
+// TaskStatus = TaskStatusEnum.WEIZHIXING,
+// ContainerCode = wmsContainer.ContainerCode,
+// SourcePlace = "鍏ュ簱鍙�",
+// ToPlace = "",
+// AreaName = wmsArea != null ? wmsArea.AreaName : "",
+// OrderNo = orderNo,
+// Description = source, //鍏ュ簱鏉ユ簮
+// TaskDodeviceStatus = TaskDodeviceStatusEnum.WZX,
+// IsRead = true
+// };
+// await _wmsTaskRep.InsertAsync(takmodel);
+// }
- /// <summary>
- /// 浜哄伐鍏ュ簱
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- [HttpPost("manualWarehousing")]
- [UnitOfWork]
- public async Task ManualWarehousing(WarehousingInput input)
- {
- // 鏌ヨ娣峰悎鏂欏簱鍖轰俊鎭�
- var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.AreaName.Contains("缁濈紭绔嬪簱"));
- // 鏍规嵁鏂欑鍙锋煡璇㈠懆杞鍙蜂俊鎭槸鍚﹀凡瀛樺湪
- var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(u => u.ContainerCode == input.ContainerCode);
- if (wmsContainer == null)
- {
- // 涓嶅瓨鍦ㄥ垯娣诲姞鍛ㄨ浆绠卞彿淇℃伅
- wmsContainer = new WmsContainer
- {
- ContainerCode = input.ContainerCode,
- ContainerType = ContainerType.JINSHU,
- ContainerStatus = ContainerStatus.KUWEI,
- AssetNo = "N/A",
- ErpNo = "N/A"
- };
- await _wmsContainerRep.InsertNowAsync(wmsContainer);
- }
- else
- {
- // 鏇存柊鍛ㄨ浆绠卞彿鐘舵�佷负鈥滃簱浣嶁��
- wmsContainer.ContainerStatus = ContainerStatus.KUWEI;
- await _wmsContainerRep.UpdateAsync(wmsContainer);
- }
+// /// <summary>
+// /// 浜哄伐鍏ュ簱
+// /// </summary>
+// /// <param name="input"></param>
+// /// <returns></returns>
+// [HttpPost("manualWarehousing")]
+// [UnitOfWork]
+// public async Task ManualWarehousing(WarehousingInput input)
+// {
+// // 鏌ヨ娣峰悎鏂欏簱鍖轰俊鎭�
+// var wmsArea = await _wmsAreaRep.FirstOrDefaultAsync(u => u.AreaName.Contains("缁濈紭绔嬪簱"));
+// // 鏍规嵁鏂欑鍙锋煡璇㈠懆杞鍙蜂俊鎭槸鍚﹀凡瀛樺湪
+// var wmsContainer = await _wmsContainerRep.FirstOrDefaultAsync(u => u.ContainerCode == input.ContainerCode);
+// if (wmsContainer == null)
+// {
+// // 涓嶅瓨鍦ㄥ垯娣诲姞鍛ㄨ浆绠卞彿淇℃伅
+// wmsContainer = new WmsContainer
+// {
+// ContainerCode = input.ContainerCode,
+// ContainerType = ContainerType.JINSHU,
+// ContainerStatus = ContainerStatus.KUWEI,
+// AssetNo = "N/A",
+// ErpNo = "N/A"
+// };
+// await _wmsContainerRep.InsertNowAsync(wmsContainer);
+// }
+// else
+// {
+// // 鏇存柊鍛ㄨ浆绠卞彿鐘舵�佷负鈥滃簱浣嶁��
+// wmsContainer.ContainerStatus = ContainerStatus.KUWEI;
+// await _wmsContainerRep.UpdateAsync(wmsContainer);
+// }
- // 鏌ヨ鍛ㄨ浆绠卞彿鏄惁宸插瓨鍦ㄤ换鍔�
- var isWmsTask = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
- if (isWmsTask) throw Oops.Oh("鍛ㄨ浆绠卞彿瀛樺湪鏈畬鎴愪换鍔′腑!");
+// // 鏌ヨ鍛ㄨ浆绠卞彿鏄惁宸插瓨鍦ㄤ换鍔�
+// var isWmsTask = await _wmsTaskRep.AnyAsync(p => p.ContainerCode == wmsContainer.ContainerCode && p.TaskStatus != TaskStatusEnum.WANCHENG);
+// if (isWmsTask) throw Oops.Oh("鍛ㄨ浆绠卞彿瀛樺湪鏈畬鎴愪换鍔′腑!");
- // 鍒犻櫎宸茬粍鐩樹俊鎭�
- var oldWmsMaterialContainerList = await _wmsMaterialContainerRep
- .Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
+// // 鍒犻櫎宸茬粍鐩樹俊鎭�
+// var oldWmsMaterialContainerList = await _wmsMaterialContainerRep
+// .Where(p => p.ContainerCode == wmsContainer.ContainerCode && p.BindStatus == CommonStatus.ENABLE).ToListAsync();
- foreach (var item in oldWmsMaterialContainerList)
- {
- await _wmsMaterialContainerRep.DeleteAsync(item);
- }
+// foreach (var item in oldWmsMaterialContainerList)
+// {
+// await _wmsMaterialContainerRep.DeleteAsync(item);
+// }
- // 鏌ヨ搴撲綅淇℃伅 闅忔満鍒嗛厤搴撲綅
- var wmsPlace = new WmsPlace();
- if (string.IsNullOrEmpty(input.PlaceCode))
- wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.AreaId == wmsArea.Id && u.Islock == YesOrNot.N && u.PlaceStatus == PlaceStatus.KONGXIAN);
- else
- wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.AreaId == wmsArea.Id && u.PlaceCode == input.PlaceCode);
- if (wmsPlace == null) throw Oops.Oh("搴撲綅涓嶅瓨鍦�!");
- if (wmsPlace.Islock == YesOrNot.Y) throw Oops.Oh("搴撲綅琚攣瀹�!");
- if (wmsPlace.PlaceStatus != PlaceStatus.KONGXIAN) throw Oops.Oh("搴撲綅宸插瓨璐�!");
- // 鏇存柊搴撲綅鐘舵�佷负鈥滃瓨璐р��
- wmsPlace.PlaceStatus = PlaceStatus.CUNHUO;
+// // 鏌ヨ搴撲綅淇℃伅 闅忔満鍒嗛厤搴撲綅
+// var wmsPlace = new WmsPlace();
+// if (string.IsNullOrEmpty(input.PlaceCode))
+// wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.AreaId == wmsArea.Id && u.Islock == YesOrNot.N && u.PlaceStatus == PlaceStatus.KONGXIAN);
+// else
+// wmsPlace = await _wmsPlaceRep.FirstOrDefaultAsync(u => u.AreaId == wmsArea.Id && u.PlaceCode == input.PlaceCode);
+// if (wmsPlace == null) throw Oops.Oh("搴撲綅涓嶅瓨鍦�!");
+// if (wmsPlace.Islock == YesOrNot.Y) throw Oops.Oh("搴撲綅琚攣瀹�!");
+// if (wmsPlace.PlaceStatus != PlaceStatus.KONGXIAN) throw Oops.Oh("搴撲綅宸插瓨璐�!");
+// // 鏇存柊搴撲綅鐘舵�佷负鈥滃瓨璐р��
+// wmsPlace.PlaceStatus = PlaceStatus.CUNHUO;
- // 缁勭洏鍗曟嵁 榛樿绌烘枡绠卞崟鎹�
- var orderNo = "N/A";
- var source = ""; //瀹氫箟鍏ュ簱鏉ユ簮
- if (input.WmsMaterials.Count > 0)
- {
- orderNo = YitIdHelper.NextId().ToString();
- source = "鐗╂枡";
- }
- else
- {
- wmsPlace.EmptyContainer = YesOrNot.Y; //鏄惁绌烘墭
- source = "绌烘墭";
- }
- // 鏌ヨ鐗╂枡Id
- var wmsMaterial = await _wmsMaterialRep.FirstOrDefaultAsync(u => u.MaterialNo == "N/A" && u.MaterialName == "N/A" && u.MaterialBatch == "N/A");
+// // 缁勭洏鍗曟嵁 榛樿绌烘枡绠卞崟鎹�
+// var orderNo = "N/A";
+// var source = ""; //瀹氫箟鍏ュ簱鏉ユ簮
+// if (input.WmsMaterials.Count > 0)
+// {
+// orderNo = YitIdHelper.NextId().ToString();
+// source = "鐗╂枡";
+// }
+// else
+// {
+// wmsPlace.EmptyContainer = YesOrNot.Y; //鏄惁绌烘墭
+// source = "绌烘墭";
+// }
+// // 鏌ヨ鐗╂枡Id
+// var wmsMaterial = await _wmsMaterialRep.FirstOrDefaultAsync(u => u.MaterialNo == "N/A" && u.MaterialName == "N/A" && u.MaterialBatch == "N/A");
- // 鍒涘缓鏂扮粍鐩樿褰�
- foreach (var item in input.WmsMaterials)
- {
- var wmsMaterialContainer = item.Adapt<WmsMaterialContainer>();
- wmsMaterialContainer.OrderNo = orderNo;
- wmsMaterialContainer.ContainerId = wmsContainer.Id;
- wmsMaterialContainer.ContainerCode = wmsContainer.ContainerCode;
- wmsMaterialContainer.MaterialId = wmsMaterial.Id;
- wmsMaterialContainer.BindStatus = CommonStatus.ENABLE;
+// // 鍒涘缓鏂扮粍鐩樿褰�
+// foreach (var item in input.WmsMaterials)
+// {
+// var wmsMaterialContainer = item.Adapt<WmsMaterialContainer>();
+// wmsMaterialContainer.OrderNo = orderNo;
+// wmsMaterialContainer.ContainerId = wmsContainer.Id;
+// wmsMaterialContainer.ContainerCode = wmsContainer.ContainerCode;
+// wmsMaterialContainer.MaterialId = wmsMaterial.Id;
+// wmsMaterialContainer.BindStatus = CommonStatus.ENABLE;
- await _wmsMaterialContainerRep.InsertNowAsync(wmsMaterialContainer);
- }
+// await _wmsMaterialContainerRep.InsertNowAsync(wmsMaterialContainer);
+// }
- string taskNo = "RUKU" + DateTime.Today.ToString("yyyyMMdd");
- var wmsTaskModel = await _wmsTaskRep.DetachedEntities.FirstOrDefaultAsync(u => EF.Functions.Like(u.TaskNo, $"%{taskNo}%"));
- if (wmsTaskModel == null)
- {
- taskNo = taskNo + "0001";
- }
- else
- {
- //鑾峰彇娴佹按鍙锋渶澶х殑鏁版嵁
- var maxSerialNumber = await _wmsTaskRep.MaxAsync(t => t.TaskNo);
- taskNo = Comm.GenerateNewInvoiceNumber(maxSerialNumber, 1);
- }
+// string taskNo = "RUKU" + DateTime.Today.ToString("yyyyMMdd");
+// var wmsTaskModel = await _wmsTaskRep.DetachedEntities.FirstOrDefaultAsync(u => EF.Functions.Like(u.TaskNo, $"%{taskNo}%"));
+// if (wmsTaskModel == null)
+// {
+// taskNo = taskNo + "0001";
+// }
+// else
+// {
+// //鑾峰彇娴佹按鍙锋渶澶х殑鏁版嵁
+// var maxSerialNumber = await _wmsTaskRep.MaxAsync(t => t.TaskNo);
+// taskNo = Comm.GenerateNewInvoiceNumber(maxSerialNumber, 1);
+// }
- // 鍒涘缓浠诲姟
- var takmodel = new WmsTask()
- {
- TaskNo = taskNo,//YitIdHelper.NextId().ToString(),
- TaskModel = TaskModel.SHOUDONG,
- TaskType = TaskType.RUKU,
- TaskLevel = 1,
- Aisle = wmsPlace.Aisle,
- TaskStatus = TaskStatusEnum.WANCHENG,
- ContainerCode = wmsContainer.ContainerCode,
- SourcePlace = "鍏ュ簱鍙�",
- ToPlace = wmsPlace.PlaceCode,
- AreaName = wmsArea != null ? wmsArea.AreaName : "",
- OrderNo = orderNo,
- Description = source, //鍏ュ簱鏉ユ簮
- TaskDodeviceStatus = TaskDodeviceStatusEnum.W,
- UpdatedTime = DateTime.Now,
- };
- await _wmsTaskRep.InsertAsync(takmodel);
+// // 鍒涘缓浠诲姟
+// var takmodel = new WmsTask()
+// {
+// TaskNo = taskNo,//YitIdHelper.NextId().ToString(),
+// TaskModel = TaskModel.SHOUDONG,
+// TaskType = TaskType.RUKU,
+// TaskLevel = 1,
+// Aisle = wmsPlace.Aisle,
+// TaskStatus = TaskStatusEnum.WANCHENG,
+// ContainerCode = wmsContainer.ContainerCode,
+// SourcePlace = "鍏ュ簱鍙�",
+// ToPlace = wmsPlace.PlaceCode,
+// AreaName = wmsArea != null ? wmsArea.AreaName : "",
+// OrderNo = orderNo,
+// Description = source, //鍏ュ簱鏉ユ簮
+// TaskDodeviceStatus = TaskDodeviceStatusEnum.W,
+// UpdatedTime = DateTime.Now,
+// };
+// await _wmsTaskRep.InsertAsync(takmodel);
- // 鍒涘缓鎵樼洏鍙峰簱浣嶅叧绯昏〃
- var wmsContainerPlaceModel = new WmsContainerPlace()
- {
- PlaceId = wmsPlace.Id,
- PlaceCode = wmsPlace.PlaceCode,
- ContainerId = wmsContainer.Id,
- ContainerCode = wmsContainer.ContainerCode,
- ContainerPlaceStatus = CommonStatus.ENABLE
- };
- await _wmsContainerPlaceRep.InsertAsync(wmsContainerPlaceModel);
+// // 鍒涘缓鎵樼洏鍙峰簱浣嶅叧绯昏〃
+// var wmsContainerPlaceModel = new WmsContainerPlace()
+// {
+// PlaceId = wmsPlace.Id,
+// PlaceCode = wmsPlace.PlaceCode,
+// ContainerId = wmsContainer.Id,
+// ContainerCode = wmsContainer.ContainerCode,
+// ContainerPlaceStatus = CommonStatus.ENABLE
+// };
+// await _wmsContainerPlaceRep.InsertAsync(wmsContainerPlaceModel);
- // 鏇存柊搴撳瓨
- var wmsMaterialContainerList = await _wmsMaterialContainerRep.DetachedEntities
- .Where(p => p.OrderNo == orderNo && p.BindStatus == CommonStatus.ENABLE).ProjectToType<WmsMaterialContainer>().ToListAsync();
+// // 鏇存柊搴撳瓨
+// var wmsMaterialContainerList = await _wmsMaterialContainerRep.DetachedEntities
+// .Where(p => p.OrderNo == orderNo && p.BindStatus == CommonStatus.ENABLE).ProjectToType<WmsMaterialContainer>().ToListAsync();
- foreach (var item in wmsMaterialContainerList)
- {
- var wmsMaterialStock = await _wmsMaterialStockRep.FirstOrDefaultAsync(p => p.ContainerCode == wmsContainer.ContainerCode
- && p.MaterialBatch == item.MaterialBatch );
- if (wmsMaterialStock != null)
- {
- wmsMaterialStock.Source = RuKuSourceEnum.WULIAO;
- wmsMaterialStock.AreaId = wmsPlace.AreaId;
- wmsMaterialStock.PlaceCode = wmsPlace.PlaceCode;
- wmsMaterialStock.StockNumber += item.BindQuantity;
- await _wmsMaterialStockRep.UpdateAsync(wmsMaterialStock);
- }
- else
- {
- wmsMaterialStock = new WmsMaterialStock()
- {
- InspectionMethod = MaterialInspection.MIANJIAN,
- UnitType = UnitType.ZHONGLIANG,
- UnitNo = UnitNoType.T,
- MaterialNo = item.MaterialNo,
- MaterialType = MaterialType.CHENGPING,
- MaterialName = item.MaterialName,
- MaterialSpec = item.MaterialSpec,
- MaterialBatch = item.MaterialBatch,
- MaterialDensity = item.MaterialDensity,
- StockNumber = 1,
- PlaceCode = wmsPlace.PlaceCode,
- ContainerId = wmsContainer.Id,
- ContainerCode = wmsContainer.ContainerCode,
- AreaId = wmsPlace.AreaId,
- Source = RuKuSourceEnum.WULIAO
- };
- await _wmsMaterialStockRep.InsertAsync(wmsMaterialStock);
- }
- }
- // 绌烘枡绠卞叆搴�
- if (orderNo == "N/A")
- {
- var wmsMaterialStock = new WmsMaterialStock()
- {
- InspectionMethod = MaterialInspection.MIANJIAN,
- UnitType = UnitType.ZHONGLIANG,
- UnitNo = UnitNoType.T,
- MaterialNo = "N/A",
- MaterialType = MaterialType.KONGTUO,
- MaterialName = "N/A",
- MaterialSpec = "N/A",
- MaterialBatch = "N/A",
- MaterialDensity = "N/A",
- StockNumber = 0,
- PlaceCode = wmsPlace.PlaceCode,
- ContainerId = wmsContainer.Id,
- ContainerCode = wmsContainer.ContainerCode,
- AreaId = wmsPlace.AreaId,
- Source = RuKuSourceEnum.KONGTUO
- };
- await _wmsMaterialStockRep.InsertAsync(wmsMaterialStock);
- }
- }
- }
-}
\ No newline at end of file
+// foreach (var item in wmsMaterialContainerList)
+// {
+// var wmsMaterialStock = await _wmsMaterialStockRep.FirstOrDefaultAsync(p => p.ContainerCode == wmsContainer.ContainerCode
+// && p.MaterialBatch == item.MaterialBatch );
+// if (wmsMaterialStock != null)
+// {
+// wmsMaterialStock.Source = RuKuSourceEnum.WULIAO;
+// wmsMaterialStock.AreaId = wmsPlace.AreaId;
+// wmsMaterialStock.PlaceCode = wmsPlace.PlaceCode;
+// wmsMaterialStock.StockNumber += item.BindQuantity;
+// await _wmsMaterialStockRep.UpdateAsync(wmsMaterialStock);
+// }
+// else
+// {
+// wmsMaterialStock = new WmsMaterialStock()
+// {
+// InspectionMethod = MaterialInspection.MIANJIAN,
+// UnitType = UnitType.ZHONGLIANG,
+// UnitNo = UnitNoType.T,
+// MaterialNo = item.MaterialNo,
+// MaterialType = MaterialType.CHENGPING,
+// MaterialName = item.MaterialName,
+// MaterialSpec = item.MaterialSpec,
+// MaterialBatch = item.MaterialBatch,
+// MaterialDensity = item.MaterialDensity,
+// StockNumber = 1,
+// PlaceCode = wmsPlace.PlaceCode,
+// ContainerId = wmsContainer.Id,
+// ContainerCode = wmsContainer.ContainerCode,
+// AreaId = wmsPlace.AreaId,
+// Source = RuKuSourceEnum.WULIAO
+// };
+// await _wmsMaterialStockRep.InsertAsync(wmsMaterialStock);
+// }
+// }
+// // 绌烘枡绠卞叆搴�
+// if (orderNo == "N/A")
+// {
+// var wmsMaterialStock = new WmsMaterialStock()
+// {
+// InspectionMethod = MaterialInspection.MIANJIAN,
+// UnitType = UnitType.ZHONGLIANG,
+// UnitNo = UnitNoType.T,
+// MaterialNo = "N/A",
+// MaterialType = MaterialType.KONGTUO,
+// MaterialName = "N/A",
+// MaterialSpec = "N/A",
+// MaterialBatch = "N/A",
+// MaterialDensity = "N/A",
+// StockNumber = 0,
+// PlaceCode = wmsPlace.PlaceCode,
+// ContainerId = wmsContainer.Id,
+// ContainerCode = wmsContainer.ContainerCode,
+// AreaId = wmsPlace.AreaId,
+// Source = RuKuSourceEnum.KONGTUO
+// };
+// await _wmsMaterialStockRep.InsertAsync(wmsMaterialStock);
+// }
+// }
+// }
+//}
\ No newline at end of file
--
Gitblit v1.9.3