同步代码

陈勇

3 天以前 6b74e1dcf5642c8f56975471e27780d695953989

 项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs

@@ -34,6 +34,13 @@
                Console.WriteLine(jsondata);
                var result = JsonConvert.DeserializeObject<List<pullLockInfo>>(jsondata.ToString());

                var lockInfo = _MESLockInfoRepository.QueryData().OrderByDescending(x => x.sequenceNo).FirstOrDefault();
                int serial = 1;
                if (lockInfo != null)
                {
                    serial = lockInfo.sequenceNo + 1;
                }

                foreach (var item in result)
                {
                    var assemblyOrderInfo = _assemblyOrderInfoRepository.QueryFirst(x => x.workOrderNo == item.workOrderNo && x.orderType == item.workOrderType);
@@ -52,7 +59,19 @@
                    }
                    else
                    {
                        OutStock = _VVStockInfoRepository.QueryData(x => x.pbMaterial == item.pbMaterial && x.StockStatus == 0 && x.LockOrder == 0 && x.StayStatus == 0 && x.workOrderType == item.workOrderType && x.CarType == (int)BodyType.PaintedBody).OrderBy(x => x.biwInPassTime).First();
                        OutStock = _VVStockInfoRepository.QueryData(x => x.pbMaterial == item.pbMaterial && x.StockStatus == 0 && x.LockOrder == 0 && x.StayStatus == 0 && x.workOrderType == item.workOrderType && x.CarType == (int)BodyType.PaintedBody && x.RoadwayNo != lockInfo.TCLine).OrderBy(x => x.biwInPassTime).FirstOrDefault();

                        if (null == OutStock)
                        {
                            OutStock = _VVStockInfoRepository.QueryData(x => x.pbMaterial == item.pbMaterial && x.StockStatus == 0 && x.LockOrder == 0 && x.StayStatus == 0 && x.workOrderType == item.workOrderType && x.CarType == (int)BodyType.PaintedBody).OrderBy(x => x.biwInPassTime).FirstOrDefault();
                        }
                        //var stockList = _VVStockInfoRepository.QueryData(x => x.pbMaterial == item.pbMaterial && x.StockStatus == 0 && x.LockOrder == 0 && x.StayStatus == 0 && x.workOrderType == item.workOrderType && x.CarType == (int)BodyType.PaintedBody).ToList();

                        //if (stockList.Any())
                        //{
                        //    var maxStock = stockList.GroupBy(x => x.RoadwayNo).OrderByDescending(x => x.Count());
                        //    OutStock = stockList.Where(x => x.RoadwayNo == maxStock.FirstOrDefault().Key).FirstOrDefault();
                        //}
                    }
                    if (OutStock == null)
                    {
@@ -62,12 +81,12 @@

                    var carBody = _carBodyRepository.QueryFirst(x => x.PVI == OutStock.PVI);

                    var lockInfo = _MESLockInfoRepository.QueryData().OrderByDescending(x => x.sequenceNo).FirstOrDefault();
                    int serial = 1;
                    if (lockInfo != null)
                    {
                        serial = lockInfo.sequenceNo + 1;
                    }
                    //var lockInfo = _MESLockInfoRepository.QueryData().OrderByDescending(x => x.sequenceNo).FirstOrDefault();
                    //int serial = 1;
                    //if (lockInfo != null)
                    //{
                    //    serial = lockInfo.sequenceNo + 1;
                    //}

                    Dt_MESLockInfo mESLockInfo = new Dt_MESLockInfo
                    {