1

647556386

2026-01-04 ff008cf08816776a6d9b08166def76721626618c

1

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs

@@ -5,6 +5,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_BasicService;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.OrderEnum;
@@ -68,7 +69,6 @@
                    return WebResponseContent.Instance.Error($"货位分配失败,未找到可分配货位");
                }


                var newTask = new Dt_Task()
                {                    
                    CurrentAddress = stations.GetValueOrDefault(stationCode) ?? "",
@@ -82,28 +82,18 @@
                    TaskStatus = TaskStatusEnum.New.ObjToInt(),
                    WarehouseId = stockInfo.WarehouseId,
                    PalletType = stockInfo.PalletType,
                    OrderNo= stockInfo.Details.FirstOrDefault()?.OrderNo
                    OrderNo= stockInfo.Details.FirstOrDefault()?.OrderNo,
                };
                //空箱
                if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt())
                if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt()|| stockInfo.StockStatus == StockStatusEmun.智仓入智仓组盘暂存.ObjToInt())
                {
                    _unitOfWorkManage.BeginTran();
                    newTask.TaskType = TaskTypeEnum.InEmpty.ObjToInt();
                    int taskId = BaseDal.AddData(newTask);
                    newTask.TaskId = taskId;

                    locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
                    _locationInfoService.UpdateData(locationInfo);
                    stockInfo.StockStatus = StockStatusEmun.入库确认.ObjToInt();

                    _stockRepository.UpdateData(stockInfo);
                    _unitOfWorkManage.CommitTran();
                }
                //智仓入智仓
                if (stockInfo.StockStatus == StockStatusEmun.智仓入智仓组盘暂存.ObjToInt())
                {
                    _unitOfWorkManage.BeginTran();
                    newTask.TaskType = TaskTypeEnum.AllocateInWarehouse.ObjToInt();
                    if (stockInfo.StockStatus == StockStatusEmun.智仓入智仓组盘暂存.ObjToInt())
                    {
                        newTask.TaskType = TaskTypeEnum.AllocateInWarehouse.ObjToInt();
                    }
                    int taskId = BaseDal.AddData(newTask);
                    newTask.TaskId = taskId;

@@ -124,8 +114,6 @@
                        inboundOrder = _inboundOrderService.Repository.QueryFirst(x => x.InboundOrderNo == orderNo && x.OrderStatus < InOrderStatusEnum.入库完成.ObjToInt());
                    
                    }


                    stockInfo.StockStatus = StockStatusEmun.入库确认.ObjToInt();

                    LocationStatusEnum lastStatus = (LocationStatusEnum)locationInfo.LocationStatus;

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs

@@ -82,7 +82,7 @@
                            MaterielCode = detailDto.MaterialCode,
                            MaterielName = materialName,
                            LineNo = detailDto.LineNo,
                            OrderQuantity = detailDto.Qty,
                            OrderQuantity = barcodeDto.Qty,
                            SupplyCode = barcodeDto.SupplyCode,
                            Unit = detailDto.Unit,
                            Barcode = barcodeDto.Barcode,