Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

liuying

2024-11-30 be14322d1b20857082dd47aeb895bd976dca13e0

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

@@ -10,6 +10,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Remoting.Messaging;
using System.ServiceModel.Configuration;
using System.Text;
using System.Threading;
@@ -55,6 +56,7 @@
                            var configValues = configValue.Split('|');
                            var packageCode = configValues[0];
                            var qitaoValue = configValues[1];//齐套  ä¸é½å¥—
                            var _UnlinePerson = configValues[2];
                            bool iscomplete = false;
                            if (qitaoValue.Equals("齐套"))
                            {
@@ -99,6 +101,18 @@
                            {
                                wmsDB.mes_package_linequeue.Remove(lineQueue);
                            }


                            //处理表  mes_order_gather
                            var errmsg = "";
                            var result = MyExtendHelper.HandlerOrderGather(wmsDB, package, qitaoValue, _UnlinePerson, out errmsg);
                            if (result == false)
                            {
                                SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = errmsg;
                                continue;
                            }


                            //新增下线记录
                            mes_package_unline_record record = new mes_package_unline_record();
                            record = ClassHelper.RotationMapping<mes_package_unline_record, mes_package_gather>(package);
@@ -107,53 +121,6 @@
                            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 (order.PackageNum == order.UnLinePackageNum)
                            {
                                order.IsUnline = true;
                            }
                            else
                            {
                                order.IsUnline = false;
                            }

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


                            wmsDB.SaveChanges();
@@ -169,5 +136,6 @@
            }
        }

   
    }
}