222

schangxiang@126.com

2024-11-30 8fb64d646e4a8bf929fdfeb7382d15ed0e7900eb

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

@@ -55,6 +55,7 @@
                            var configValues = configValue.Split('|');
                            var packageCode = configValues[0];
                            var qitaoValue = configValues[1];//齐套  ä¸é½å¥—
                            var _UnlinePerson = configValues[2];
                            bool iscomplete = false;
                            if (qitaoValue.Equals("齐套"))
                            {
@@ -99,14 +100,7 @@
                            {
                                wmsDB.mes_package_linequeue.Remove(lineQueue);
                            }
                            //新增下线记录
                            mes_package_unline_record record = new mes_package_unline_record();
                            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;
@@ -140,10 +134,29 @@
                            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;

                            var order_unLine = false;
                            //查询下一个包是不是属于该订单
                            var newLineQueue = wmsDB.mes_package_linequeue.OrderBy(x => x.Id).FirstOrDefault();
                            if (newLineQueue != null && newLineQueue.Info5 != order.Info5)
                            {
                                //表示是 åˆ‡æ¢ æ–°è®¢å•äº†ï¼Œè¯¥è®¢å•è¦æ›´æ–°ä¸º å·²ä¸‹çº¿ã€‚
                                order_unLine = true;
                            }
                            else
                            {
                                //判断该订单是否已下线
                                if (order.PackageNum == order.UnLinePackageNum)
                                {
                                    order_unLine = true;
                                }
                            }
                            //判断该订单是否已下线
                            if (order.PackageNum == order.UnLinePackageNum)
                            if (order_unLine)
                            {
                                order.IsUnline = true;
                                order.UnlineTime = DateTime.Now;
                                order.UnlinePerson = _UnlinePerson;
                            }
                            else
                            {
@@ -156,6 +169,16 @@
                            }


                            //新增下线记录
                            mes_package_unline_record record = new mes_package_unline_record();
                            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);


                            wmsDB.SaveChanges();
                        }
                    }