1

huangxiaoqiang

2025-12-03 d292487812b280e7f484a5cdf6e8a994baa486fd

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs

@@ -172,7 +172,7 @@
                                MaterielCode = outboundOrderdetail.MaterielCode,
                                Position = item.LocationCode,
                                PalletCode = item.PalletCode,
                                AreaId = Convert.ToInt32(requestOut.AreaId),
                                AreaId = Convert.ToInt32(2),
                            };
                            taskDtos.Add(task);
                            item.StockInfoDetails.Where(x => x.MaterielCode == outboundOrderdetail.MaterielCode).FirstOrDefault().Status = (int)StockStateEmun.出库锁定;
@@ -210,19 +210,24 @@
                        {
                            taskDTOs.Add(CreateTaskDTO(item));
                            var result1 = _taskService.UpdateLocationStatus(item.SourceAddress, LocationEnum.InStockDisable, item.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
                            var result2 = _taskService.UpdateLocationStatus(item.TargetAddress, LocationEnum.Lock, item.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
                            locationStatusChangeRecords.AddRange(result1.Item1);
                            locationStatusChangeRecords.AddRange(result2.Item1);
                            locations.AddRange(result1.Item2);
                            locations.AddRange(result2.Item2);
                        }
                            var result2 = _taskService.UpdateEndLocationStatus(item.TargetAddress, LocationEnum.Lock, item.TaskNum.Value, StatusChangeTypeEnum.AutomaticOutbound);
                            if (result2.Item1 != null && result2.Item2 != null)
                            {
                                locationStatusChangeRecords.AddRange(result2.Item1);
                                locations.AddRange(result2.Item2);
                            }

                            locationStatusChangeRecords.AddRange(result1.Item1);
                            locations.AddRange(result1.Item2);
                        }
                        outboundOrder.OrderStatus = (int)OrderStateEmun.开始;
                        await _unitOfWorkManage.UseTranAsync(async () =>
                        {
                            _taskRepository.AddData(taskNews);
                            _stockInfoRepository.UpdateDataNav(result.Item1);
                            await _locationStatusChangeRecordRepository.AddDataAsync(locationStatusChangeRecords);
                            await _locationRepository.UpdateDataAsync(locations);
                            BaseDal.UpdateData(outboundOrder);
                            _productionoutboundOrderDetailRepository.UpdateData(result.Item2);
                            _outDetailsRepository.AddData(outDetails);
                        });
@@ -251,7 +256,9 @@
                Id = 0,
                TaskType = task.TaskType,
                AGVTaskNum = task.AGVTaskNum,
                Remark = task.Remark
                Remark = task.Remark,
                Floor =task.Floor,
                DoubleTray = task.DoubleTray,
            };
        }
        public (List<DtStockInfo>, Dt_ProductionOutboundOrderDetail) AssignStockOutbound(Dt_ProductionOutboundOrderDetail outboundOrderdetail, List<StockSelectViewDTO> stockSelectViews)
@@ -307,11 +314,16 @@

            }
            outboundOrderdetail.OverOutQuantity = outboundOrderdetail.OrderQuantity - needQuantity;
            outboundOrderdetail.NotOutQuantity = outboundOrderdetail.OrderQuantity - outboundOrderdetail.OverOutQuantity;

            if (outboundOrderdetail.OverOutQuantity != 0)
            {
                outboundOrderdetail.OrderDetailStatus = (int)OrderStateEmun.开始;
            }
            if (outboundOrderdetail.OverOutQuantity == outboundOrderdetail.OrderQuantity)
            {
                outboundOrderdetail.OrderDetailStatus = (int)OrderStateEmun.已完成;
            }
            return (outStockNews, outboundOrderdetail);
        }