| | |
| | | public partial class TaskService |
| | | { |
| | | /// <summary> |
| | | /// MESæåå
¥åºåæ¥æ¶ |
| | | /// </summary> |
| | | /// <returns></returns> |
| | | public MesResponseContent BagInfoSync(MesBagInfoModel bagInfoModel) |
| | | { |
| | | MesResponseContent content = new MesResponseContent(); |
| | | try |
| | | { |
| | | Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == bagInfoModel.WarehouseCode); |
| | | if (warehouse == null) |
| | | { |
| | | return content.Error("æªæ¾å°ä»åºä¿¡æ¯"); |
| | | } |
| | | ////éå¶ä»»å¡ |
| | | //Dt_Task task = BaseDal.QueryFirst(x => x.SourceAddress == bagInfoModel.WorkCenter && (x.TaskStatus == TaskStatusEnum.New.ObjToInt() || x.TaskStatus == TaskStatusEnum.Line_Execute.ObjToInt() || x.TaskStatus == TaskStatusEnum.Line_Executing.ObjToInt())); |
| | | //if (task!=null) |
| | | //{ |
| | | // return content.Error($"线ä½åå¨ä»»å¡ææ§è¡ä¸,è¶æ¡å·{task.PalletCode}"); |
| | | //} |
| | | Dt_Warehouse warehouseLocation = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA71.ToString()); |
| | | Dt_LocationInfo locationInfo = _basicRepository.LocationInfoRepository.QueryFirst(x => x.WarehouseId == warehouseLocation.WarehouseId); |
| | | if (locationInfo == null) |
| | | { |
| | | return content.Error($"æªæ¾å°{warehouse.WarehouseCode}è´§ä½ä¿¡æ¯"); |
| | | } |
| | | Dt_ProStockInfo proStockInfoOld = _stockRepository.ProStockInfoRepository.QueryFirst(x=>x.PalletCode==bagInfoModel.BatchNo); |
| | | if (proStockInfoOld != null) |
| | | { |
| | | return content.Error($"è¶æ¡{bagInfoModel.BatchNo}åºåä¿¡æ¯å·²åå¨"); |
| | | } |
| | | //å¤æè¯¥è¶æ¡å·çå
å
ä¿¡æ¯æ¯å¦åå¨ |
| | | Dt_MesProInOrder mesProInOrderOld = BaseDal.Db.Queryable<Dt_MesProInOrder>().Where(x => x.BatchNo == bagInfoModel.BatchNo && x.MesProStatus == InOrderStatusEnum.å
¥åºä¸.ObjToInt()).Includes(x => x.Details).First(); |
| | | if (mesProInOrderOld!=null) |
| | | { |
| | | return content.Error($"è¶æ¡{bagInfoModel.BatchNo}å
å
ä¿¡æ¯æªå®æ"); |
| | | } |
| | | List<string> proDetailsExists = _stockRepository.ProStockInfoDetailRepository.QueryData().Select(x=>x.BagNo).ToList(); |
| | | //å
å
ä¿¡æ¯ç»ç |
| | | List<Dt_MesProInOrderDetail> mesProInOrderDetails = new List<Dt_MesProInOrderDetail>(); |
| | | string palletCode = @"^C\d{5}$"; // æ£åè¡¨è¾¾å¼ |
| | | bool isValid = Regex.IsMatch(bagInfoModel.BatchNo, palletCode); |
| | | if (!isValid && bagInfoModel.BatchNo.Substring(0,3).ToUpper()!= "CPK") |
| | | { |
| | | return content.Error($"æ¡ç æ ¼å¼é误{bagInfoModel.BatchNo}"); |
| | | } |
| | | if (bagInfoModel.BatchNo.Substring(0, 3).ToUpper() == "CPK") |
| | | { |
| | | WebResponseContent inProRespone = InPKProStock(bagInfoModel, proDetailsExists, warehouse); |
| | | if (!inProRespone.Status) |
| | | { |
| | | return content.Error(inProRespone.Message); |
| | | } |
| | | _proInStatisticsService.SaveStatic(bagInfoModel); |
| | | return content.OK(inProRespone.Message); |
| | | } |
| | | |
| | | foreach (var item in bagInfoModel.BagDetails) |
| | | { |
| | | if (proDetailsExists.Contains(item.BagNo)) |
| | | { |
| | | return content.Error($"å
å
{item.BagNo}å·²åå¨"); |
| | | } |
| | | foreach (var child in item.BagItems) |
| | | { |
| | | Dt_MesProInOrderDetail mesProInOrderDetail = new Dt_MesProInOrderDetail() |
| | | { |
| | | BagNo = item.BagNo, |
| | | ProductCode = item.ProductCode, |
| | | ProductVersion = item.ProductVersion, |
| | | SETQty = child.SETQty, |
| | | OKPCSQTY = child.OKPCSQTY, |
| | | DateCode = item.DateCode, |
| | | XQty = child.XQty, |
| | | XSite = child.XSite, |
| | | Weight = item.Weight, |
| | | PackingDate = item.PackingDate, |
| | | LotNumber = child.LotNumber, |
| | | ERPOrder = child.ERPOrder, |
| | | SaleOrder = child.SaleOrder, |
| | | MoNumber = child.MoNumber, |
| | | }; |
| | | mesProInOrderDetails.Add(mesProInOrderDetail); |
| | | } |
| | | } |
| | | List<Dt_ProStockInfoDetail> proStockInfoDetails = new List<Dt_ProStockInfoDetail>(); |
| | | foreach (var item in mesProInOrderDetails) |
| | | { |
| | | proStockInfoDetails.Add(_mapper.Map<Dt_ProStockInfoDetail>(item)); |
| | | } |
| | | Dt_MesProInOrder mesProInOrder = new Dt_MesProInOrder() |
| | | { |
| | | WarehouseId = warehouse.WarehouseId, |
| | | ProInOrderNo = _outboundService.OutboundOrderService.CreateCodeByRule(nameof(RuleCodeEnum.ProInCodeRule)), |
| | | BatchNo = bagInfoModel.BatchNo, |
| | | WorkCenter = bagInfoModel.WorkCenter, |
| | | MesProStatus = InOrderStatusEnum.å
¥åºä¸.ObjToInt(), |
| | | UnPackStock = bagInfoModel.UnPackStock, |
| | | CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(), |
| | | Details = mesProInOrderDetails |
| | | }; |
| | | ProStockAttributeEnum attributeEnum = new ProStockAttributeEnum(); |
| | | switch (warehouse.WarehouseCode) |
| | | { |
| | | case "HA71": |
| | | attributeEnum = ProStockAttributeEnum.æå; |
| | | break; |
| | | case "HA72": |
| | | attributeEnum = ProStockAttributeEnum.å°¾æ°; |
| | | break; |
| | | case "HA73": |
| | | attributeEnum = ProStockAttributeEnum.ç å; |
| | | break; |
| | | default: |
| | | throw new Exception("æªæ¾å°è¯¥åºå屿§"); |
| | | } |
| | | Dt_ProStockInfo proStockInfo = new Dt_ProStockInfo() |
| | | { |
| | | PalletCode = bagInfoModel.BatchNo, |
| | | PalletType = 1, |
| | | ProStockAttribute= attributeEnum.ObjToInt(), |
| | | WarehouseId = warehouse.WarehouseId, |
| | | StockStatus = StockStatusEmun.å
¥åºç¡®è®¤.ObjToInt(), |
| | | proStockInfoDetails = proStockInfoDetails |
| | | }; |
| | | Dt_Task newTask = new Dt_Task() |
| | | { |
| | | CurrentAddress = bagInfoModel.WorkCenter, |
| | | Grade = 0, |
| | | NextAddress = "", |
| | | PalletCode = proStockInfo.PalletCode, |
| | | Roadway = locationInfo.RoadwayNo, |
| | | SourceAddress = bagInfoModel.WorkCenter, |
| | | TargetAddress = "", |
| | | TaskType = TaskTypeEnum.InProduct.ObjToInt(), |
| | | TaskStatus = TaskStatusEnum.New.ObjToInt(), |
| | | WarehouseId = warehouse.WarehouseId, |
| | | PalletType = proStockInfo.PalletType, |
| | | MaterielCode = proStockInfo.proStockInfoDetails.Where(x => x.ProStockId == proStockInfo.Id).FirstOrDefault()?.ProductCode, |
| | | Quantity = (float)proStockInfo.proStockInfoDetails.Where(x => x.ProStockId == proStockInfo.Id).Sum(x => x.StockPcsQty) |
| | | }; |
| | | _unitOfWorkManage.BeginTran(); |
| | | int taskId = BaseDal.AddData(newTask); |
| | | newTask.TaskId = taskId; |
| | | Db.InsertNav(proStockInfo).Include(x => x.proStockInfoDetails).ExecuteCommand(); |
| | | //ä¸ä¼ ERP |
| | | WebResponseContent responseContent = _inboundOrderService.FeedbackProIn(mesProInOrder); |
| | | _proInStatisticsService.SaveStatic(bagInfoModel); |
| | | if (!responseContent.Status) |
| | | { |
| | | mesProInOrder.UpErpStatus = WhetherEnum.False.ObjToInt(); |
| | | mesProInOrder.Remark = responseContent.Message; |
| | | } |
| | | else |
| | | { |
| | | mesProInOrder.UpErpStatus = WhetherEnum.True.ObjToInt(); |
| | | } |
| | | Db.InsertNav(mesProInOrder).Include(x => x.Details).ExecuteCommand(); |
| | | _unitOfWorkManage.CommitTran(); |
| | | //æ¨éä»»å¡ |
| | | PushTasksToWCS(new List<Dt_Task> { newTask }); |
| | | content.OK("æ¥æ¶æå"); |
| | | } |
| | | catch (Exception ex) |
| | | { |
| | | _unitOfWorkManage.RollbackTran(); |
| | | content.Error(ex.Message); |
| | | } |
| | | return content; |
| | | } |
| | | public WebResponseContent InPKProStock(MesBagInfoModel bagInfoModel, List<string> proDetailsExists,Dt_Warehouse wareSource) |
| | | { |
| | | Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseCode==WarehouseEnum.HA101.ToString()); |
| | | if (warehouse==null) |
| | | { |
| | | return WebResponseContent.Instance.Error("æªæ¾å°å¹³åºä»åºä¿¡æ¯"); |
| | | } |
| | | //å
å
ä¿¡æ¯ç»ç |
| | | List<Dt_MesProInOrderDetail> mesProInOrderDetails = new List<Dt_MesProInOrderDetail>(); |
| | | foreach (var item in bagInfoModel.BagDetails) |
| | | { |
| | | if (proDetailsExists.Contains(item.BagNo)) |
| | | { |
| | | return WebResponseContent.Instance.Error($"å
å
{item.BagNo}å·²åå¨"); |
| | | } |
| | | foreach (var child in item.BagItems) |
| | | { |
| | | Dt_MesProInOrderDetail mesProInOrderDetail = new Dt_MesProInOrderDetail() |
| | | { |
| | | BagNo = item.BagNo, |
| | | ProductCode = item.ProductCode, |
| | | ProductVersion = item.ProductVersion, |
| | | SETQty = child.SETQty, |
| | | OKPCSQTY = child.OKPCSQTY, |
| | | DateCode = item.DateCode, |
| | | XQty = child.XQty, |
| | | XSite = child.XSite, |
| | | Weight = item.Weight, |
| | | PackingDate = item.PackingDate, |
| | | LotNumber = child.LotNumber, |
| | | ERPOrder = child.ERPOrder, |
| | | SaleOrder = child.SaleOrder, |
| | | MoNumber = child.MoNumber, |
| | | OverInQuantity= child.OKPCSQTY |
| | | }; |
| | | mesProInOrderDetails.Add(mesProInOrderDetail); |
| | | } |
| | | } |
| | | List<Dt_ProStockInfoDetail> proStockInfoDetails = new List<Dt_ProStockInfoDetail>(); |
| | | foreach (var item in mesProInOrderDetails) |
| | | { |
| | | proStockInfoDetails.Add(_mapper.Map<Dt_ProStockInfoDetail>(item)); |
| | | } |
| | | Dt_MesProInOrder mesProInOrder = new Dt_MesProInOrder() |
| | | { |
| | | WarehouseId = warehouse.WarehouseId, |
| | | ProInOrderNo = _outboundService.OutboundOrderService.CreateCodeByRule(nameof(RuleCodeEnum.ProInCodeRule)), |
| | | BatchNo = bagInfoModel.BatchNo, |
| | | WorkCenter = bagInfoModel.WorkCenter, |
| | | MesProStatus = InOrderStatusEnum.å
¥åºå®æ.ObjToInt(), |
| | | UnPackStock = bagInfoModel.UnPackStock, |
| | | CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(), |
| | | Details = mesProInOrderDetails |
| | | }; |
| | | ProStockAttributeEnum attributeEnum = new ProStockAttributeEnum(); |
| | | switch (wareSource.WarehouseCode) |
| | | { |
| | | case "HA71": |
| | | attributeEnum = ProStockAttributeEnum.æå; |
| | | break; |
| | | case "HA72": |
| | | attributeEnum = ProStockAttributeEnum.å°¾æ°; |
| | | break; |
| | | case "HA73": |
| | | attributeEnum = ProStockAttributeEnum.ç å; |
| | | break; |
| | | default: |
| | | throw new Exception("æªæ¾å°è¯¥åºå屿§"); |
| | | } |
| | | proStockInfoDetails.ForEach(x => |
| | | { |
| | | x.ProOutDetailStatus = StockStatusEmun.å¹³åºå
¥åºå®æ.ObjToInt(); |
| | | }); |
| | | Dt_ProStockInfo proStockInfo = new Dt_ProStockInfo() |
| | | { |
| | | PalletCode = bagInfoModel.BatchNo, |
| | | PalletType = 1, |
| | | LocationCode= "æåå¾
åè´§åº", |
| | | ProStockAttribute = attributeEnum.ObjToInt(), |
| | | WarehouseId = warehouse.WarehouseId, |
| | | StockStatus = StockStatusEmun.å¹³åºå
¥åºå®æ.ObjToInt(), |
| | | proStockInfoDetails = proStockInfoDetails |
| | | }; |
| | | |
| | | _unitOfWorkManage.BeginTran(); |
| | | Db.InsertNav(proStockInfo).Include(x => x.proStockInfoDetails).ExecuteCommand(); |
| | | //ä¸ä¼ ERP |
| | | WebResponseContent responseContent = _inboundOrderService.FeedbackProIn(mesProInOrder); |
| | | if (!responseContent.Status) |
| | | { |
| | | mesProInOrder.UpErpStatus = WhetherEnum.False.ObjToInt(); |
| | | mesProInOrder.Remark = responseContent.Message; |
| | | } |
| | | else |
| | | { |
| | | mesProInOrder.UpErpStatus = WhetherEnum.True.ObjToInt(); |
| | | } |
| | | Db.InsertNav(mesProInOrder).Include(x => x.Details).ExecuteCommand(); |
| | | _unitOfWorkManage.CommitTran(); |
| | | return WebResponseContent.Instance.OK("æ¥æ¶æå"); |
| | | } |
| | | /// <summary> |
| | | /// å¤å
ä¿¡æ¯æ¥æ¶ |
| | | /// </summary> |
| | | public MesResponseContent BoxStockin(MesBoxInfoModel boxInfoModel) |
| | | { |
| | | MesResponseContent content = new MesResponseContent(); |
| | | try |
| | | { |
| | | Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA101.ToString()); |
| | | //æªååºåºåå· |
| | | string shipmentOrder = boxInfoModel.ShipmentOrder.Substring(0, boxInfoModel.ShipmentOrder.IndexOf("-")); |
| | | //夿MESä¼ å
¥çåºåºåå·æ¯å¦åå¨ |
| | | Dt_ProOutOrder proOutOrder = _outboundRepository.ProOutOrderRepository.Db.Queryable<Dt_ProOutOrder>().Where(x => x.ProOutOrderNo == shipmentOrder).Includes(x => x.Details).First(); |
| | | if (proOutOrder == null) |
| | | { |
| | | return content.Error($"åå·{shipmentOrder}ä¸åå¨"); |
| | | } |
| | | //夿å¤ç®±å·æ¯å¦å·²åå¨ |
| | | Dt_ProStockInfo ProStockOld = _stockRepository.ProStockInfoRepository.QueryFirst(x => x.PalletCode == boxInfoModel.BoxNo); |
| | | if (ProStockOld!=null) |
| | | { |
| | | return content.Error($"å¤ç®±å·{ProStockOld.PalletCode}ååºä¿¡æ¯å·²åå¨"); |
| | | } |
| | | //è·åæææååºåºå
å
ä¿¡æ¯ |
| | | List<Dt_ProStockInfoDetail> dt_ProStockInfos = _stockRepository.ProStockInfoDetailRepository.QueryData(x => x.ProOutDetailStatus == StockStatusEmun.åºåºå®æ.ObjToInt()); |
| | | //è·åMESå
å
ä¿¡æ¯ |
| | | List<Dt_MesProInOrderDetail> mesProInOrderDetails = new List<Dt_MesProInOrderDetail>(); |
| | | foreach (var item in boxInfoModel.Bags) |
| | | { |
| | | foreach (var child in item.BagItems) |
| | | { |
| | | Dt_ProStockInfoDetail? proStockInfoDetail = dt_ProStockInfos.Where(x => x.BagNo == item.BagNo)?.FirstOrDefault(); |
| | | if (proStockInfoDetail == null) |
| | | { |
| | | return content.Error($"å
å
{item.BagNo}è´§ç©ç¶æå¼å¸¸"); |
| | | } |
| | | if (proStockInfoDetail.OutboundQuantity<=0) |
| | | { |
| | | return content.Error($"å
å
{item.BagNo}åºåºæ°éæªåé
"); |
| | | } |
| | | Dt_MesProInOrderDetail mesProInOrderDetail = new Dt_MesProInOrderDetail() |
| | | { |
| | | BagNo = item.BagNo, |
| | | ProductCode = item.ProductCode, |
| | | ProductVersion = item.ProductVersion, |
| | | SETQty = child.SETQty, |
| | | OKPCSQTY = child.OKPCSQTY, |
| | | DateCode = item.DateCode, |
| | | XQty = child.XQty, |
| | | XSite = child.XSite, |
| | | Weight = item.Weight, |
| | | PackingDate = item.PackingDate, |
| | | LotNumber = child.LotNumber, |
| | | ERPOrder = child.ERPOrder, |
| | | SaleOrder = child.SaleOrder, |
| | | MoNumber = child.MoNumber, |
| | | }; |
| | | mesProInOrderDetails.Add(mesProInOrderDetail); |
| | | } |
| | | } |
| | | List<Dt_ProStockInfoDetail> proStockInfoDetails = new List<Dt_ProStockInfoDetail>(); |
| | | foreach (var item in mesProInOrderDetails) |
| | | { |
| | | proStockInfoDetails.Add(_mapper.Map<Dt_ProStockInfoDetail>(item)); |
| | | } |
| | | proStockInfoDetails.ForEach(x => |
| | | { |
| | | x.ProOutDetailStatus = StockStatusEmun.å¹³åºå
¥åºå®æ.ObjToInt(); |
| | | }); |
| | | |
| | | |
| | | _unitOfWorkManage.BeginTran(); |
| | | WebResponseContent UnBindContent = _stockService.ProStockInfoService.UnBindStock(proStockInfoDetails); |
| | | if (!UnBindContent.Status) |
| | | { |
| | | throw new Exception(UnBindContent.Message); |
| | | } |
| | | if (UnBindContent.Data!=null) |
| | | { |
| | | Dt_ProStockInfo proStockInfo = new Dt_ProStockInfo() |
| | | { |
| | | PalletCode = boxInfoModel.BoxNo, |
| | | PalletType = 0, |
| | | LocationCode = "æåå¾
åè´§åº", |
| | | WarehouseId = warehouse.WarehouseId, |
| | | ShipmentOrder = shipmentOrder, |
| | | StockStatus = StockStatusEmun.å¹³åºå
¥åºå®æ.ObjToInt(), |
| | | proStockInfoDetails = UnBindContent.Data as List<Dt_ProStockInfoDetail>, |
| | | ProStockAttribute = ProStockAttributeEnum.æå.ObjToInt() |
| | | }; |
| | | //æ ¹æ®å¤å
ä¿¡æ¯è§£ç»å
å
ä¸è¶æ¡åºåå
³ç³» |
| | | Db.InsertNav(proStockInfo).Include(x => x.proStockInfoDetails).ExecuteCommand(); |
| | | } |
| | | _unitOfWorkManage.CommitTran(); |
| | | return content.OK("å¤å
æ¥æ¶æå"); |
| | | } |
| | | catch (Exception ex) |
| | | { |
| | | content.Error(ex.Message); |
| | | } |
| | | return content; |
| | | } |
| | | /// <summary> |
| | | /// MESæååºåºååæ¥æ°æ®å¤ç |
| | | /// </summary> |
| | | public MesShipmentOrderSync MesOutSync(Dt_OutProStockInfo outProStockInfo, Dt_ProOutOrderDetail proOutOrderDetail,List<Dt_ProStockInfoDetail> proStockInfoDetails) |
| | | { |
| | | List<MesShipOrderDetail> mesShipOrderDetails = new List<MesShipOrderDetail>(); |
| | | //è·ååºåºå |
| | | Dt_ProOutOrder proOutOrder = _outboundService.ProOutOrderService.Repository.QueryFirst(x => x.Id == proOutOrderDetail.ProOrderId); |
| | | //è·åå®¢æ· |
| | | Dt_CustomerInfo customerInfo = _basicRepository.CustomerInfoRepository.QueryFirst(x => x.Code == proOutOrderDetail.EndCustomer); |
| | | List<string> outBags = proStockInfoDetails.Where(x => x.OutboundQuantity > 0).Select(x => x.BagNo).ToList(); |
| | | outBags.ForEach(x => |
| | | { |
| | | x = string.Format($"{0},{1},{2},0,{3}",x,outProStockInfo.PCode,outProStockInfo.DateCode,outProStockInfo.AssignQuantity.ObjToInt()); |
| | | }); |
| | | MesShipOrderDetail orderDetail = new MesShipOrderDetail() |
| | | { |
| | | ProductCode = proOutOrderDetail.PCode, |
| | | ProductVersion = proOutOrderDetail.PVer, |
| | | Qty = outProStockInfo.AssignQuantity, |
| | | DateCode = outProStockInfo.DateCode, |
| | | SaleOrder = proOutOrderDetail.SaleOrder, |
| | | Sequence = outProStockInfo.Id, |
| | | WorkCenter = "SPCK_OUTER-001", |
| | | PlasticBox = new List<PlasticBox> { new PlasticBox() |
| | | { |
| | | PlasticBoxNumber= outProStockInfo.PalletCode, |
| | | Insourcings = outBags |
| | | } |
| | | } |
| | | }; |
| | | mesShipOrderDetails.Add(orderDetail); |
| | | MesShipmentOrderSync shipmentOrderSync = new MesShipmentOrderSync() |
| | | { |
| | | ShipmentOrder = proOutOrder.ProOutOrderNo+"-"+ outProStockInfo.TaskNum, |
| | | PlantShipDate = proOutOrder.PlantShipDate.ToString("yyyy-MM-dd HH:mm:ss"), |
| | | Customer = proOutOrderDetail.EndCustomer, |
| | | FactoryCode = proOutOrderDetail.FactoryCode, |
| | | ShipName = customerInfo.Name, |
| | | ShippingAddress = customerInfo.NickName, |
| | | OrderDetails = mesShipOrderDetails |
| | | }; |
| | | return shipmentOrderSync; |
| | | } |
| | | /// <summary> |
| | | /// WMS忥æååºåºè³MES |
| | | /// </summary> |
| | | public WebResponseContent ShipmentOrderSync(MesShipmentOrderSync model) |
| | |
| | | } |
| | | return content; |
| | | } |
| | | |
| | | /// <summary> |
| | | /// MESæåè¿å·¥æåº |
| | | /// </summary> |
| | | /// <param name="model"></param> |
| | | /// <returns></returns> |
| | | public MesResponseContent RworkTask(RworkTaskModel model) |
| | | { |
| | | MesResponseContent content = new MesResponseContent(); |
| | | try |
| | | { |
| | | Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA72.ToString()); |
| | | if (warehouse == null) |
| | | { |
| | | return content.Error($"å°¾æ°ä»ä¿¡æ¯æªé
ç½®"); |
| | | } |
| | | Dt_MesRworkOutboundOrder rworkOutboundOrderOld = _outboundRepository.RworkOutboundOrderRepository.QueryFirst(x => x.TaskNo == model.TaskNo); |
| | | if (rworkOutboundOrderOld != null) |
| | | { |
| | | return content.Error($"æåºä»»å¡å{model.TaskNo}å·²åå¨"); |
| | | } |
| | | Dt_MesRworkOutboundOrder mesRworkOutboundOrder = new Dt_MesRworkOutboundOrder() |
| | | { |
| | | WarehouseId = warehouse.WarehouseId, |
| | | TaskNo = model.TaskNo, |
| | | OrderStatus = OutOrderStatusEnum.æªå¼å§.ObjToInt(), |
| | | CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(), |
| | | ProductCode = model.ProductCode, |
| | | ProductName = model.ProductName, |
| | | ProductVersion = model.ProductVersion, |
| | | DateCode = model.DateCode, |
| | | RequiredQuantity = model.RequiredQuantity, |
| | | FactoryCode = model.FactoryCode, |
| | | SaleOrder = model.SaleOrder, |
| | | OrderType = model.InventoryType |
| | | }; |
| | | List<Dt_Task> tasks = new List<Dt_Task>(); |
| | | List<Dt_ProStockInfo>? proStockInfos = null; |
| | | List<Dt_OutProStockInfo>? outProStockInfos = null; |
| | | List<Dt_LocationInfo>? locationInfos = null; |
| | | //åé
åºåçææåºä»»å¡ |
| | | (List<Dt_ProStockInfo>?, Dt_MesRworkOutboundOrder?, List<Dt_OutProStockInfo>?, List<Dt_LocationInfo>) result = _outboundService.RworkOutboundOrderService.AssignMesStocks(mesRworkOutboundOrder); |
| | | if (result.Item1 != null && result.Item1.Count > 0) |
| | | { |
| | | tasks = GetTasks(result.Item1, TaskTypeEnum.OutMesRworkProduct); |
| | | result.Item2.OrderStatus = OutOrderStatusEnum.åºåºä¸.ObjToInt(); |
| | | result.Item3.ForEach(x => |
| | | { |
| | | x.Status = OutLockStockStatusEnum.åºåºä¸.ObjToInt(); |
| | | }); |
| | | |
| | | proStockInfos = result.Item1; |
| | | mesRworkOutboundOrder = result.Item2; |
| | | outProStockInfos = result.Item3; |
| | | locationInfos = result.Item4; |
| | | } |
| | | else |
| | | { |
| | | throw new Exception("æ åºååé
"); |
| | | } |
| | | tasks.ForEach(x => |
| | | { |
| | | x.TargetAddress = "5236"; |
| | | x.OrderNo = mesRworkOutboundOrder.TaskNo; |
| | | }); |
| | | _unitOfWorkManage.BeginTran(); |
| | | |
| | | int id = BaseDal.AddData(tasks); |
| | | outProStockInfos.ForEach(x => |
| | | { |
| | | x.OrderNo = mesRworkOutboundOrder.TaskNo; |
| | | x.OrderDetailId = id; |
| | | }); |
| | | if (proStockInfos != null && proStockInfos.Count > 0 && outProStockInfos != null && outProStockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0) |
| | | { |
| | | WebResponseContent updateContent = _outboundService.RworkOutboundOrderService.LockOutboundStockDataUpdate(proStockInfos, outProStockInfos, locationInfos, tasks: tasks); |
| | | |
| | | if (!updateContent.Status) |
| | | { |
| | | _unitOfWorkManage.RollbackTran(); |
| | | return content.Error(updateContent.Message); |
| | | } |
| | | } |
| | | _outboundService.RworkOutboundOrderService.Repository.AddData(mesRworkOutboundOrder); |
| | | _unitOfWorkManage.CommitTran(); |
| | | return content.OK("æä¾è¿åºåæ¥æ¶æå"); |
| | | } |
| | | catch (Exception ex) |
| | | { |
| | | _unitOfWorkManage.RollbackTran(); |
| | | content.Error(ex.Message); |
| | | } |
| | | return content; |
| | | } |
| | | #region å¼ç¨ |
| | | /// <summary> |
| | | /// åºåæ¿æ°æ®è½¬æ¢ |
| | | /// </summary> |
| | | /// <returns></returns> |
| | | //public MesProductOutBound MesProOutBound(Dt_MesRworkOutboundOrder mesRworkOutboundOrder,List<Dt_ProStockInfoDetail> proStockInfoDetails) |
| | | //{ |
| | | // //è·åä»åºä¿¡æ¯ |
| | | // Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == mesRworkOutboundOrder.WarehouseId); |
| | | // List<MesInventoryInfo> inventoryInfos = new List<MesInventoryInfo>(); |
| | | // foreach (var item in proStockInfoDetails) |
| | | // { |
| | | // MesInventoryInfo mesInventoryInfo = new MesInventoryInfo() |
| | | // { |
| | | // Warhouseno = warehouse.WarehouseCode, |
| | | // InternalPackageNumber = item.BagNo, |
| | | // SetCount = (int)item.SETQty, |
| | | // EligiblePcsCount = (int)item.StockPcsQty |
| | | // }; |
| | | // inventoryInfos.Add(mesInventoryInfo); |
| | | // } |
| | | // MesProductOutBound mesProductOutBound = new MesProductOutBound() |
| | | // { |
| | | // TaskNo = mesRworkOutboundOrder.TaskNo, |
| | | // ProductCode = mesRworkOutboundOrder.ProductCode, |
| | | // ProductVersion = mesRworkOutboundOrder.ProductVersion, |
| | | // DateCode = mesRworkOutboundOrder.DateCode, |
| | | // SaleOrder = mesRworkOutboundOrder.SaleOrder, |
| | | // InventoryInfo = inventoryInfos |
| | | // }; |
| | | // return mesProductOutBound; |
| | | //} |
| | | #endregion |
| | | } |
| | | } |