222

schangxiang@126.com

2024-12-20 a88527e8ced879d68307547bfa83901122a30361

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs

@@ -256,7 +256,7 @@
        var _QiTaoReuslt = "";
        bool isNewOrder = false;
        string _location = "BZ-33";
        var lastPackageUnline = await _mes_Package_UnLine_RecordRep.AsQueryable().Where(x => x.UpiFlag == UpiFlagEnum.正常).OrderByDescending(x => x.Id).FirstAsync();
        var lastPackageUnline = await _mes_Package_UnLine_RecordRep.AsQueryable().Where(x => x.UpiFlag == UpiFlagEnum.正常 && x.Location != "人工").OrderByDescending(x => x.Id).FirstAsync();
        if (lastPackageUnline == null)
        {//认为是新生产订单
            isNewOrder = true;
@@ -559,6 +559,20 @@
        await _wmsRecordPackageProcessRep.InsertAsync(wmsRecordPackage);


        //新增下线记录表
        var all_upiList = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.Info5 == singlePackage.Info5).ToListAsync();
        var all_unlineList = await _mes_Package_UnLine_RecordRep.AsQueryable().Where(x => x.Info5 == singlePackage.Info5).ToListAsync();
        Mes_Package_UnLine_Record record = new Mes_Package_UnLine_Record();
        record = singlePackage.Adapt<Mes_Package_UnLine_Record>();
        record.Id = Yitter.IdGenerator.YitIdHelper.NextId();
        record.Location = "人工";
        record.AllPackageNum = all_upiList.GroupBy(x => x.PackageCode).Count();
        record.CurUnlineIndexPackageNum = all_unlineList.GroupBy(x => x.PackageCode).Count() + 1;
        record.CreateTime = DateTime.Now;
        record.CreateUserName = _cretaorName;
        await _mes_Package_UnLine_RecordRep.InsertAsync(record);


        await _mesPackageGatherRep.UpdateAsync(singlePackage);
        await _mesBatchOrderUpiRep.UpdateRangeAsync(upiList);

@@ -587,12 +601,19 @@
        var packageList = await _mesPackageGatherRep.AsQueryable().Where(x => x.Info5 == singlePackage.Info5).ToListAsync();
        order.PackageNum = packageList.Count();
        order.UnLinePackageNum = packageList.Where(x => x.UpiStatus == UpiStatusEnum.已下线).Count() + 1;

        if (order.UnLinePackageNum > order.PackageNum)
        {
            order.UnLinePackageNum = order.PackageNum;
        }
        order.NgPackageNum = packageList.Where(x => x.UpiStatus == UpiStatusEnum.已下线 && x.UpiFlag == UpiFlagEnum.NG).Count();
        if (isNG)
        {
            order.NgPackageNum = order.NgPackageNum + 1;
        }
        if (order.NgPackageNum > order.PackageNum)
        {
            order.NgPackageNum = order.PackageNum;
        }

        order.NoUnLinePackageNum = order.PackageNum - order.UnLinePackageNum;