同步

陈勇

2026-04-06 9de6c7c6d835ba5161d64114d154bfc7676244a1

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

@@ -39,14 +39,12 @@
                    var assemblyOrderInfo = _assemblyOrderInfoRepository.QueryFirst(x => x.workOrderNo == item.workOrderNo && x.orderType == item.workOrderType);
                    if (assemblyOrderInfo == null) throw new Exception($"鎷夊姩閿佽溅澶辫触:鏈煡鎬昏宸ュ崟鍙穥item.workOrderNo}");

                    Dt_PalletStockInfo carinfo = null;
                    //Dt_PalletStockInfo carinfo = null;
                    VV_StockInfo OutStock = new VV_StockInfo();
                    Dt_CarBodyInfo carbodyinfo = null;
                    //Dt_CarBodyInfo carbodyinfo = null;
                    if (!string.IsNullOrEmpty(item.pvi))
                    {
                        // carinfo = _palletStockInfoRepository.QueryFirst(x => x.PVI == item.pvi && x.pbMaterial == item.pbMaterial);
                        //carbodyinfo = _carBodyRepository.QueryFirst(x => x.pbMaterial == item.pbMaterial && x.PVI == item.pvi);
                        OutStock = _VVStockInfoRepository.QueryFirst(X => X.PVI == item.pvi && X.pbMaterial == item.pbMaterial);
                        OutStock = _VVStockInfoRepository.QueryFirst(x => x.PVI == item.pvi && x.StockStatus == 0 && x.LockOrder == 0 && x.StayStatus == 0 && x.CarType == (int)BodyType.PaintedBody);
                        if (OutStock == null)
                        {
                            throw new Exception($"鏈壘鍒版寚瀹歅VI杞﹁韩淇℃伅{item.pvi}");
@@ -54,11 +52,8 @@
                    }
                    else
                    {
                        //carinfo = _palletStockInfoRepository.QueryData(x => x.pbMaterial == item.pbMaterial).OrderBy(x => x.biwInPassTime).FirstOrDefault();
                        //carbodyinfo = _carBodyRepository.QueryData(x => x.pbMaterial == item.pbMaterial && x.BodyStatus == 0).OrderBy(x => x.biwInPassTime).FirstOrDefault();
                        OutStock = _VVStockInfoRepository.QueryData(x => x.pbMaterial == item.pbMaterial && x.StockStatus == 0 && x.LockOrder == 0 && x.workOrderType == item.workOrderType).OrderBy(x => x.biwInPassTime).FirstOrDefault();
                        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();
                    }

                    if (OutStock == null)
                    {
                        throw new Exception("鏈尮閰嶅埌杞﹁韩,鎷夊姩閿佸畾澶辫触");
@@ -131,12 +126,15 @@
                    //{
                    stockInfo.StockStatus = 0;
                    stockInfo.LockOrder = 1;
                    carBody.BodyStatus = 1;
                    //carBody.BodyStatus = 1;
                    assemblyOrderInfo.pvi = carBody.PVI;
                    carBody.assemblyWorrkNo = item.workOrderNo;

                    _MESLockInfoRepository.AddData(mESLockInfo);
                    _assemblyOrderInfoRepository.UpdateData(assemblyOrderInfo);
                    //_taskRepository.AddData(task);
                    _palletStockInfoRepository.UpdateData(stockInfo);
                    //_carBodyRepository.UpdateData(carbodyinfo);
                    _carBodyRepository.UpdateData(carBody);
                    _unitOfWorkManage.CommitTran();
                    //}