222

schangxiang@126.com

2024-11-30 8fb64d646e4a8bf929fdfeb7382d15ed0e7900eb

222

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

@@ -100,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;
@@ -141,8 +134,25 @@
                            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_unLine)
                            {
                                order.IsUnline = true;
                                order.UnlineTime = DateTime.Now;
@@ -159,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();
                        }
                    }

 CC/iWareSql/WmsDBModel/mes_order_gather.cs

@@ -28,7 +28,7 @@

        public DateTime? UnlineTime { get; set; }

        public string? UnlinePerson { get; set; }
        public string UnlinePerson { get; set; }

        public int PackageNum { get; set; }


 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs

@@ -13,6 +13,7 @@
/// é€šç”¨æŸ¥è¯¢æœåŠ¡
/// </summary>
[ApiDescriptionSettings(ApplicationConst.WmsCommonnQueryGroupName, Order = 100)]
[AllowAnonymous]
public class WmsCommonnQueryService : IDynamicApiController, ITransient
{
    private readonly SqlSugarRepository<WmsRbLineTask> _rep;
@@ -57,5 +58,32 @@

        return list; // ç»“æžœ
    }


    /// <summary>
    /// æŸ¥è¯¢ åŽ†å²ç”Ÿäº§è®¢å•è®°å½• ï¼ˆå¤§å±ä½¿ç”¨ï¼‰
    /// </summary>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "QueryHistoryOrderList")]
    [Description("WmsCommonnQuery/QueryHistoryOrderList")]
    public async Task<List<Mes_Order_Gather>> QueryHistoryOrderList()
    {
        //获取上班时间。
        var sysConfig_wms_unline_time = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.wms_unline_time);
        if (sysConfig_wms_unline_time == null || sysConfig_wms_unline_time.Value == "无")
        {
            throw Oops.Oh($"没有配置 åŒ…装下线登陆时间 å€¼");
        }
        var unLineTime = Convert.ToDateTime(sysConfig_wms_unline_time.Value);

        var list = await _mesOrderGatherRep.AsQueryable()
            .Where(x => x.UnlineTime >= unLineTime)
            .Where(x => x.IsUnline == true)
            .OrderByDescending(g => g.Id)
            .ToListAsync(); // ç¡®ä¿èŽ·å–结果为 List

        return list; // ç»“æžœ
    }
}