1

huangxiaoqiang

8 天以前 644cbe3e4eba765affa25454d69fee6286bb6094

 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/BoxingInfoService.cs

@@ -3,6 +3,7 @@
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.Linq.Expressions;
using System.Threading.Tasks;
using WIDESEA_Common;
using WIDESEA_Core.BaseRepository;
using WIDESEA_DTO.Basic;
@@ -60,6 +61,38 @@
    }

    #region 缁勭洏

    public async Task<WebResponseContent> GetPalletCodeInfo(string palletCode)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            var boxinginfo = await BaseDal.QueryFirstNavAsync(x => x.PalletCode == palletCode);
            if(boxinginfo != null)
            {
                List<PalletCodeInfo> obj = new List<PalletCodeInfo>();
                boxinginfo.BoxingInfoDetails.ForEach(x =>
                {
                    obj.Add(new PalletCodeInfo
                    {
                        orderNo=x.OrderNo,
                        warehouseName=x.Warehouse,
                        materialNo = x.MaterielCode,
                        quantity = x.Quantity,
                    });
                });
                
                return content.OK(data: obj);
            }
            return content.Error();
        }
        catch (Exception ex)
        {
            return content.Error(ex.Message);
        }
    }
    

    public async Task<WebResponseContent> AddGroupPlateAsync(GroupPlate groupPlate)
    {
        WebResponseContent content = new WebResponseContent();
@@ -93,6 +126,7 @@
                            x.Warehouse = InboundOrder.WarehouseName;
                            x.OrderNo = InboundOrder.UpperOrderNo;
                            x.Unit = InboundOrder.Unit;
                            x.WareHouseId = InboundOrder.WareHouseId;
                            x.Specs = InboundOrder.Specs;
                            x.Weight = InboundOrder.Weight;
                            x.Quantity = x.Quantity + item.quantity;
@@ -112,6 +146,7 @@
                                Unit = InboundOrder.Unit,
                                Specs = InboundOrder.Specs,
                                Weight = InboundOrder.Weight,
                                WareHouseId = InboundOrder.WareHouseId,
                                Quantity = item.quantity,
                                DrawingNumber = InboundOrder.ProductDrawingNumber,
                                Date = InboundOrder.Datetime,
@@ -152,16 +187,16 @@
            {
                return content.Error("鍙傛暟閿欒");
            }
            var stock = await BaseDal.QueryFirstNavAsync(x => x.PalletCode == groupPlate.palletCode && x.StockStatus == (int)StockStateEmun.缁勭洏鏆傚瓨);
            if (!stock.IsNullOrEmpty())
            var boxingInfo = await BaseDal.QueryFirstNavAsync(x => x.PalletCode == groupPlate.palletCode && x.StockStatus == (int)StockStateEmun.缁勭洏鏆傚瓨);
            if (!boxingInfo.IsNullOrEmpty())
            {
                stock.StockStatus = (int)StockStateEmun.缁勭洏鎾ら攢;
                DtStockInfo_Hty stockhty = stock.Adapt<DtStockInfo_Hty>();
                boxingInfo.StockStatus = (int)StockStateEmun.缁勭洏鎾ら攢;
                DtBoxingInfo_Hty stockhty = boxingInfo.Adapt<DtBoxingInfo_Hty>();
                stockhty.ModifyDate = DateTime.Now;
                await _unitOfWorkManage.UseTranAsync(async () =>
                {
                    await BaseDal.Db.DeleteNav<DtStockInfo>(x => x.Id == stock.Id)
                                            .Include(x => x.StockInfoDetails)
                    await BaseDal.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxingInfo.Id)
                                            .Include(x => x.BoxingInfoDetails)
                                            .ExecuteCommandAsync();
                    await AddStockHtyAsync(stockhty);
                });
@@ -178,7 +213,7 @@
            return content.Error(ex.Message);
        }
    }
    private async Task AddStockHtyAsync(DtStockInfo_Hty stockhty)
    private async Task AddStockHtyAsync(DtBoxingInfo_Hty stockhty)
    {
        var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(stockhty).IncludesAllFirstLayer().ExecuteCommandAsync();
        if (!isStockAdd)