222

schangxiang@126.com

2024-11-29 896c08739dfa6526270755fe03bbe5963d8f9bf2

222

 CC/iWareCC_ASRS/ThreadService/05_BZ30(ÆëÌ×ÑéÖ¤)/DataProcess_ValidateQiTao.cs

@@ -80,11 +80,11 @@

                            //更新值
                            bz30Config.Value = "";
                            var gahter = wmsDB.mes_package_gather.Where(x => x.PackageCode == packageCode).FirstOrDefault();
                            if (gahter != null)
                            var package = wmsDB.mes_package_gather.Where(x => x.PackageCode == packageCode).FirstOrDefault();
                            if (package != null)
                            {
                                gahter.UpiStatus = (int)UpiStatusEnum.已下线;
                                gahter.AreaCode = (int)AreaCodeEnum.下线区域;
                                package.UpiStatus = (int)UpiStatusEnum.已下线;
                                package.AreaCode = (int)AreaCodeEnum.下线区域;
                            }
                            var upiList = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == packageCode).ToList();
                            foreach (var item in upiList)
@@ -101,13 +101,51 @@
                            }
                            //新增下线记录
                            mes_package_unline_record record = new mes_package_unline_record();
                            record = ClassHelper.RotationMapping<mes_package_unline_record, mes_package_gather>(gahter);
                            record = ClassHelper.RotationMapping<mes_package_unline_record, mes_package_gather>(package);
                            record.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                            record.CreateTime = DateTime.Now;
                            record.UpdateTime = DateTime.Now;
                            record.OpRemark = "下线";
                            wmsDB.mes_package_unline_record.Add(record);

                            //处理表  mes_order_gather
                            var isAddOrder = false;
                            var packageList = wmsDB.mes_package_gather.Where(x => x.Info5 == package.Info5).ToList();
                            if (packageList == null || packageList?.Count == 0)
                            {
                                SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = $"没有找到生产单号{package.Info5}的汇总数据";
                                continue;
                            }
                            var order = wmsDB.mes_order_gather.Where(x => x.Info5 == package.Info5).FirstOrDefault();
                            if (order != null)
                            {

                            }
                            else
                            {
                                order = new mes_order_gather()
                                {
                                    Id = Yitter.IdGenerator.YitIdHelper.NextId(),
                                    Info5 = package.Info5,
                                    OrderId = package.OrderId,
                                    PlanNo = package.PlanNo,
                                };
                                isAddOrder = true;
                            }
                            order.PackageNum = packageList.Count();
                            order.UnLinePackageNum = packageList.Where(x => x.UpiStatus == (int)UpiStatusEnum.已下线).Count();
                            order.NoUnLinePackageNum = order.PackageNum - order.UnLinePackageNum;

                            order.AllPackageArea = packageList.Sum(x => Convert.ToDecimal(x.Info13));
                            order.ScanPackageArea = packageList.Where(x => x.UpiStatus == (int)UpiStatusEnum.已下线).Sum(x => Convert.ToDecimal(x.Info13));
                            order.NoScanPackageArea = order.AllPackageArea - order.ScanPackageArea;
                            order.IsKitting = qitaoValue == "齐套" ? true : false;

                            if (isAddOrder)
                            {
                                wmsDB.mes_order_gather.Add(order);
                            }


                            wmsDB.SaveChanges();
                        }

 CC/iWareSql/WmsDBModel/WmsDBModel.cs

@@ -97,6 +97,18 @@

        protected override void OnModelCreating(DbModelBuilder modelBuilder)
        {
            modelBuilder.Entity<mes_order_gather>()
                .Property(e => e.AllPackageArea)
                .HasPrecision(18, 4);

            modelBuilder.Entity<mes_order_gather>()
                .Property(e => e.ScanPackageArea)
                .HasPrecision(18, 4);

            modelBuilder.Entity<mes_order_gather>()
                .Property(e => e.NoScanPackageArea)
                .HasPrecision(18, 4);

            modelBuilder.Entity<test_place>()
                .Property(e => e.Length)
                .HasPrecision(10, 3);

 CC/iWareSql/WmsDBModel/mes_order_gather.cs

@@ -26,6 +26,16 @@

        public int PackageNum { get; set; }

        public int UnLinePackageNum { get; set; }

        public int NoUnLinePackageNum { get; set; }

        public decimal AllPackageArea { get; set; }

        public decimal ScanPackageArea { get; set; }

        public decimal NoScanPackageArea { get; set; }

        public DateTime? CreateTime { get; set; }

        public DateTime? UpdateTime { get; set; }

 CC/iWareSql/iWareSql.csproj

@@ -162,6 +162,7 @@
    <Compile Include="WmsDBModel\GoViewPro.cs" />
    <Compile Include="WmsDBModel\GoViewProData.cs" />
    <Compile Include="WmsDBModel\mes_batchOrderUPI_new.cs" />
    <Compile Include="WmsDBModel\mes_order_gather.cs" />
    <Compile Include="WmsDBModel\mes_package_gather.cs" />
    <Compile Include="WmsDBModel\mes_package_linequeue.cs" />
    <Compile Include="WmsDBModel\mes_package_unline_record.cs" />

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json

@@ -30,7 +30,7 @@
          "EnableIncreTable": false // å¯ç”¨è¡¨å¢žé‡æ›´æ–°-特性[IncreTable]
        },
        "SeedSettings": {
          "EnableInitSeed": true, // å¯ç”¨ç§å­åˆå§‹åŒ–
          "EnableInitSeed": false, // å¯ç”¨ç§å­åˆå§‹åŒ–
          "EnableIncreSeed": false // å¯ç”¨ç§å­å¢žé‡æ›´æ–°-特性[IncreSeed]
        }
      }

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

@@ -92,15 +92,28 @@
        {
            throw Oops.Oh("参数不能为空");
        }
        var singlePackage = await _mesPackageGatherRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
        if (singlePackage == null)

        var package = await _mesPackageGatherRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
        if (package == null)
        {
            throw Oops.Oh($"没有找到包号{input.PackageCode}的汇总数据");
        }



        var sysConfig = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.WmsBZ30_QiTao);
        if (sysConfig == null)
        {
            throw Oops.Oh($"没有配置 åˆ¤æ–­é½å¥— å€¼");
        }
        if (!string.IsNullOrEmpty(sysConfig.Value) && sysConfig.Value != "无")
        {
            throw Oops.Oh($"判断齐套值已经存在值{sysConfig.Value},不允许操作");
        }

        var setValue = "";
        var _QiTaoReuslt = "";
        var other_orderList = await _mesPackageGatherRep.AsQueryable().Where(x => x.Info5 == singlePackage.Info5 && x.PackageCode != input.PackageCode).ToListAsync();
        var other_orderList = await _mesPackageGatherRep.AsQueryable().Where(x => x.Info5 == package.Info5 && x.PackageCode != input.PackageCode).ToListAsync();
        var num = other_orderList.Where(x => x.UpiStatus == UpiStatusEnum.初始 || x.UpiStatus == UpiStatusEnum.不齐包).Count();
        if (num > 0)
        {
@@ -114,19 +127,12 @@
            _QiTaoReuslt = "齐套";
        }

        var sysConfig = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.WmsBZ30_QiTao);
        if (sysConfig == null)
        {
            throw Oops.Oh($"没有配置 åˆ¤æ–­é½å¥— å€¼");
        }
        if (!string.IsNullOrEmpty(sysConfig.Value) && sysConfig.Value != "无")
        {
            throw Oops.Oh($"判断齐套值已经存在值{sysConfig.Value},不允许操作");
        }


        sysConfig.Value = setValue;
        await _sysConfigRep.UpdateAsync(sysConfig);

        output = singlePackage.Adapt<ValidateQiTaoOutput>();
        output = package.Adapt<ValidateQiTaoOutput>();
        output.QiTaoReuslt = _QiTaoReuslt;
        return output;
    }
@@ -179,7 +185,7 @@
        var list = await _mesOrderGatherRep.AsQueryable()
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
            .Where(x=>((DateTime)x.CreateTime).ToString("yyyyMMdd")==DateTime.Now.ToString("yyyyMMdd"))
            .Where(x => ((DateTime)x.CreateTime).ToString("yyyyMMdd") == DateTime.Now.ToString("yyyyMMdd"))
            .Where(x => x.IsKitting == false)
            .OrderBy(g => g.Id)
            .ToListAsync(); // ç¡®ä¿èŽ·å–结果为 List