代码更新

wangxinhui

昨天 011ca316e6ec2ed93e31c45a9ebd9d3c66664871

 ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs

@@ -1,6 +1,7 @@
using Autofac.Core;
using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using OfficeOpenXml.FormulaParsing.Excel.Operators;
using SqlSugar;
@@ -21,6 +22,7 @@
using WIDESEA_Common.TaskEnum;
using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO;
using WIDESEA_DTO.Basic;
@@ -229,6 +231,11 @@
                        _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfoOld, oldQty, oldQty < stockInfoOld.StockLength ? stockInfoOld.StockLength- oldQty: oldQty- stockInfoOld.StockLength, StockChangeTypeEnum.MaterielGroup);
                        return content.OK($"老厂领料退库RFID{stockInfoOld.RfidCode}条码{stockInfoOld.PalletCode}");
                    }
                    else if (stockInfoOld != null && stockInfoOld.MaterielInvOrgId == MaterielInvOrgEnum.老厂.ObjToInt() && stockInfoOld.StockStatus == StockStatusEmun.出库完成.ObjToInt() && stockInfoOld.StockLength<=0 && stationCode.IsNullOrEmpty())
                    {
                        _stockRepository.StockInfoRepository.DeleteAndMoveIntoHty(stockInfoOld, App.User.UserId > 0 ? OperateTypeEnum.人工完成 : OperateTypeEnum.自动完成);
                        throw new Exception($"{palletCode}RFID信息老厂领料后无库存退料");
                    }
                    else if (stockInfoOld != null)
                    {
                        throw new Exception($"{palletCode}RFID信息已存在");
@@ -358,9 +365,14 @@
                    throw new Exception($"未找到条码{stockInfoOld.PalletCode}一期ERP库存不存在");
                }
                BSTStockInfoDTO bSTStockInfoDTO = bSTResponse.Data ?? throw new Exception($"一期ERP未返回{stockInfoOld.PalletCode}的库存信息");
                if (stockInfoOld.StockLength <= 0 || bSTStockInfoDTO.StockMeter<=0)
                {
                    throw new Exception($"{stockInfoOld.RfidCode}绑定条码{stockInfoOld.PalletCode}库存为0");
                }
                stockInfoOld.IsPick = WhetherEnum.False.ObjToInt();
                decimal stockLength = bSTStockInfoDTO.StockMeter;
                if (weight != bSTStockInfoDTO.Qty && weight < stockInfoOld.InitialWeight)
                decimal errWeight = Math.Abs(weight - bSTStockInfoDTO.Qty);
                if (weight != bSTStockInfoDTO.Qty && weight < stockInfoOld.InitialWeight && errWeight <= AppSettings.Get("ErrWeight").ObjToInt())
                {
                    Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterialSourceId == stockInfoOld.MaterielId);
                    int gramWeight = (int)(materielInfo.MaterielWeight * 1000);
@@ -369,7 +381,7 @@
                        Paper_code = stockInfoOld.PalletCode,
                        Estimate_weight = bSTStockInfoDTO.Qty,
                        Actual_weight = weight,
                        Error_weight = Math.Abs(weight - bSTStockInfoDTO.Qty),
                        Error_weight = errWeight,
                        Weigh_time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                        Operator = "LiKu",
                        Width = bSTStockInfoDTO.W,
@@ -390,6 +402,11 @@
                stockInfoOld.StockLength = stockLength;
                stockInfoOld.StockOutLength = 0;
                stockInfoOld.WarehouseId = WarehouseEnum.LLDYL.ObjToInt();
                List<Dt_OutLineView> outLineViewsDel = _outboundRepository.OutLineViewRepository.QueryData(x=>x.PalletCode==stockInfoOld.PalletCode);
                if (outLineViewsDel.Count>0)
                {
                    _outboundRepository.OutLineViewRepository.DeleteData(outLineViewsDel);
                }
                content.OK("成功",data:stockInfoOld);
            }
            catch (Exception ex)
@@ -958,6 +975,10 @@
                {
                    item.Count -= count.Count;
                }
                if (item.Count >= 50 && count?.Count<=1)
                {
                    return item.RoadwayNo;
                }
            }
            return locationCounts.Where(x => x.Count > 0).OrderByDescending(x => x.Count).FirstOrDefault()?.RoadwayNo ?? "";
        }
@@ -982,14 +1003,20 @@
                    {
                        agvstation.IsOccupied = WhetherEnum.False.ObjToInt();
                    }
                    //叠盘任务单独完成
                    if (task.TaskType==TaskTypeEnum.EmptyStackPlate.ObjToInt())
                    //叠盘/冲切搬运至雾化 ä»»åŠ¡å•ç‹¬å®Œæˆ
                    if (task.TaskType==TaskTypeEnum.EmptyStackPlate.ObjToInt() || task.TaskType == TaskTypeEnum.PunchingInbound.ObjToInt())
                    {
                        task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
                        _unitOfWorkManage.BeginTran();
                        if (agvstation != null)
                        {
                            _basicRepository.AGVStationInfoRepository.UpdateData(agvstation);
                        }
                        if (task.ProductNo.IsNotEmptyOrNull())
                        {
                            Dt_MESProInOrderInfo mESProInOrderInfo = _inboundRepository.MESProInOrderInfoRepository.QueryFirst(x=>x.BarCode== task.ProductNo);
                            mESProInOrderInfo.MESProInStatus = InOrderStatusEnum.入库完成.ObjToInt();
                            _inboundRepository.MESProInOrderInfoRepository.UpdateData(mESProInOrderInfo);
                        }
                        BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? WIDESEA_Core.Enums.OperateTypeEnum.人工完成 : WIDESEA_Core.Enums.OperateTypeEnum.自动完成);
                        _unitOfWorkManage.CommitTran();
@@ -1046,7 +1073,7 @@
                            }
                            proInUpModel.PB_INV_PRODUCT_IN= pRODUCT_INItems;
                            string request = _invokeERPService.ERPProInUp(proInUpModel) ?? throw new Exception("成品入库接口请求失败");
                            if (!request.Contains("Success"))
                            if (!request.Contains("success"))
                            {
                                throw new Exception($"成品入库失败");
                            }
@@ -1933,13 +1960,13 @@
                    string request = _invokeERPService.ERPSemiProInUp(
                            new ERPProInUpModel()
                            {
                                PB_INV_PRODUCT_IN= pRODUCT_INItems
                                PB_INV_PRODUCT_IN = pRODUCT_INItems
                            }) ?? throw new Exception("半成品入库接口请求失败");
                    //生成半成品入库
                    List<Dt_MESProInOrderInfo> semiProInOrderInfos = mESProInOrderInfos.Where(x => x.MESProInStatus == InOrderStatusEnum.未开始.ObjToInt()).ToList();
                    List<Dt_MESProInOrderInfo> semiProInOrderInfos = mESProInOrderInfos.Where(x => x.MESProInStatus == InOrderStatusEnum.未开始.ObjToInt() && x.WarehouseId==WarehouseEnum.LLDYL.ObjToInt()).ToList();
                    if (semiProInOrderInfos.Count>0)
                    {
                        WebResponseContent webResponse = SemiProInbound(AddMESProInOrders.Where(x => x.MESProOrderType == MaterielTypeEnum.半成品.ObjToInt()).ToList());
                        WebResponseContent webResponse = SemiProInbound(semiProInOrderInfos);
                        if (!webResponse.Status)
                        {
                            throw new Exception(webResponse.Message);
@@ -1950,6 +1977,7 @@
                        {
                            throw new Exception(taskResponse.Message);
                        }
                        _inboundRepository.MESProInOrderInfoRepository.UpdateData(mESProInOrderInfos);
                    }
                }
                List<Dt_MESProInOrderInfo> proInOrderInfos = AddMESProInOrders.Where(x => x.MESProOrderType == MaterielTypeEnum.成品.ObjToInt()).ToList();
@@ -1984,7 +2012,6 @@
                {
                    return content.Error("传入信息为空");
                }
                
                List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData();
                List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
                List<Dt_Task> tasks = new List<Dt_Task>();
@@ -2045,23 +2072,27 @@
                        NextAddress = "",
                        PalletCode = item.BarCode,
                        Roadway = "",
                        SourceAddress = CheckPointCode.AGVStationCode,
                        SourceAddress = item.PointCode.StartsWith("YS") ? CheckPointCode.AGVStationCode : CheckPointCode.MESPointCode,
                        TargetAddress = "",
                        TaskType = 0,
                        TaskStatus = TaskStatusEnum.New.ObjToInt(),
                        WarehouseId = materielInfo.WarehouseId,
                        PalletType = stockInfo.PalletType,
                        TaskLength = (int)item.Wide
                        TaskLength = (int)item.Wide,
                        WorkCentreCode=item.MakeCode,
                        MaterielCode = item.MaterialCode,
                        Quantity =item.ProQuantity
                    };
                    TaskTypeEnum taskTypeEnum = CheckPointCode.StationArea switch
                    {
                        nameof(StationAreaEnum.一楼印刷) => TaskTypeEnum.PrintYLInbound,
                        nameof(StationAreaEnum.一楼分切) => TaskTypeEnum.PartOffInbound,
                        nameof(StationAreaEnum.一楼纸张淋膜) => TaskTypeEnum.PaperFilmInbound,
                        nameof(StationAreaEnum.一楼无纺淋膜) => TaskTypeEnum.WFBYLInbound,
                        nameof(StationAreaEnum.一楼无纺织布) => TaskTypeEnum.WFBYLInbound,
                        nameof(StationAreaEnum.一楼无纺淋膜) => TaskTypeEnum.WFBLMYLInbound,
                        _ => throw new Exception("未找到对应任务")
                    };
                    if (taskTypeEnum == TaskTypeEnum.WFBYLInbound)
                    if (taskTypeEnum == TaskTypeEnum.WFBYLInbound || taskTypeEnum == TaskTypeEnum.WFBLMYLInbound)
                    {
                        Dt_AGVStationInfo? stationInfo = AssignWFBStation(_AGVStationInfos?.Select(x => x.AGVStationCode).ToList()) ?? throw new Exception("未找到可用无纺布暂存架");
                        newTask.NextAddress = stationInfo.AGVStationCode;
@@ -2127,6 +2158,10 @@
                throw new Exception(ex.Message);
            }
        }
        /// <summary>
        /// æˆå“ç»„盘
        /// </summary>
        /// <returns></returns>
        public WebResponseContent BoxingInBound(string stationCode,List<string> barCodes)
        {
            WebResponseContent content = new WebResponseContent();
@@ -2216,5 +2251,83 @@
            }
            return content;
        }
        /// <summary>
        /// åŠæˆå“æ‰˜ç›˜æ¬è¿å…¥åº“
        /// </summary>
        /// <returns></returns>
        public WebResponseContent SemiProIn(string barcode, string palletCode, string address)
        {
            
            WebResponseContent content = new WebResponseContent();
            try
            {
                //获取当前半成品信息
                Dt_MESProInOrderInfo mESProInOrderInfo = _inboundRepository.MESProInOrderInfoRepository.QueryFirst(x=>x.BarCode==barcode) ?? throw new Exception($"半成品条码{barcode}信息不存在，请核对信息");
                //获取加工中心
                Dt_MakeCenterInfo makeCenterInfo = _basicRepository.MakeCenterInfoRepository.QueryFirst(x=>x.MakeCode==mESProInOrderInfo.MakeCode);
                if (makeCenterInfo.MakeArea!=StationAreaEnum.一楼分切.ObjToInt() && makeCenterInfo.MakeArea != StationAreaEnum.一楼冲切.ObjToInt() && makeCenterInfo.MakeArea != StationAreaEnum.一楼模切.ObjToInt()) throw new Exception($"半成品条码{barcode}不属于分切/冲切/模切加工");

                //判断任务
                Dt_Task? taskExist = BaseDal.QueryFirst(x=>x.PalletCode==palletCode) == null ? null: throw new Exception($"托盘{palletCode}任务已存在");
                //判断库存
                Dt_ProStockInfo? proStockInfoExist = BaseDal.Db.Queryable<Dt_ProStockInfo>().Where(x => x.PalletCode== palletCode).Includes(x => x.proStockInfoDetails).First() == null ? null : throw new Exception($"托盘{palletCode}库存已存在"); ;
                //判断地址
                Dt_AGVStationInfo StationInfoStart = _basicRepository.AGVStationInfoRepository.QueryFirst(x=>x.AGVStationCode==address) ?? throw new Exception($"地址码{address}不存在");

                Dt_AGVStationInfo? StationInfoEnd = null;
                Dt_Task? newTask = null;
                #region é€»è¾‘判断：分切&模切入成品(辅料)库；冲切搬运至二楼雾化中转区）
                if (makeCenterInfo.MakeArea == StationAreaEnum.一楼冲切.ObjToInt())
                {
                    //获取雾化中转区点位
                    StationInfoEnd = _basicRepository.AGVStationInfoRepository.QueryFirst(x=>x.StationArea== StationAreaEnum.二楼雾化.ToString() && x.IsOccupied==WhetherEnum.False.ObjToInt()) ?? throw new Exception($"二楼雾化可用点位不足");
                    //生成任务
                    newTask = new Dt_Task()
                    {
                        CurrentAddress = StationInfoStart.AGVStationCode,
                        Grade = 0,
                        NextAddress = StationInfoEnd.AGVStationCode,
                        PalletCode = palletCode,
                        Roadway = "AGV",
                        SourceAddress = StationInfoStart.AGVStationCode,
                        TargetAddress = StationInfoEnd.AGVStationCode,
                        TaskType = TaskTypeEnum.PunchingInbound.ObjToInt(),
                        TaskStatus = TaskStatusEnum.New.ObjToInt(),
                        WarehouseId = mESProInOrderInfo.WarehouseId,
                        PalletType = PalletTypeEnum.SmallPallet.ObjToInt(),
                        TaskLength = (int)mESProInOrderInfo.Wide,
                        WorkCentreCode = mESProInOrderInfo.MakeCode,
                        MaterielCode=mESProInOrderInfo.MaterialCode,
                        Quantity=mESProInOrderInfo.ProQuantity,
                        ProductNo=mESProInOrderInfo.BarCode
                    };
                    StationInfoEnd.IsOccupied = 1;
                }
                else
                {
                    return content.Error("暂时无法满足");
                }
                mESProInOrderInfo.MESProInStatus = InOrderStatusEnum.入库中.ObjToInt();
                //数据库操作并推送WCS任务
                _unitOfWorkManage.BeginTran();
                _basicRepository.AGVStationInfoRepository.UpdateData(StationInfoEnd);
                BaseDal.AddData(newTask);
                _inboundRepository.MESProInOrderInfoRepository.UpdateData(mESProInOrderInfo);
                WebResponseContent taskResponse = PushTasksToWCS(new List<Dt_Task>() { newTask });
                if (!taskResponse.Status)
                {
                    throw new Exception(taskResponse.Message);
                }
                _unitOfWorkManage.CommitTran();
                #endregion
                content.OK();
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                content.Error(ex.Message);
            }
            return content;
        }
    }
}