2

schangxiang@126.com

2024-11-30 28a7c0069cb18addcb85d33376e21f25bdb519ce

2

 CC/iWareCC_ASRS/ThreadService/04_BZ21£¨°áÔËÕû¶â»úÆ÷ÈË£©/DataProcess_BZ21.cs

@@ -199,6 +199,17 @@
                                wmsDB.mes_package_linequeue.Add(mesinequeue);
                                wmsDB.wms_rbline_task.Add(task); 
                                wmsDB.mes_push_packagecode.Add(putpakegecode);

                                //处理表  mes_order_gather
                                var errmsg = "";
                                var package = wmsDB.mes_package_gather.Where(x => x.PackageCode == upiObj.PackageCode).FirstOrDefault();
                                var resultAlert = DataProcess_ValidateQiTao.HandlerOrderGather(wmsDB, package, "", "", out errmsg);
                                if (resultAlert == false)
                                {
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ21 = errmsg;
                                    continue;
                                }

                                using (StationServiceClient client = new StationServiceClient())
                                {

@@ -222,7 +233,7 @@
                }
                catch (Exception ex)
                {
                    SystemWarningMsg._lbl_alert_DataProcess_BZ39 += " å‡ºçŽ°å¼‚常:" + ex.Message + SysGloble.SPLIT_STR;
                    SystemWarningMsg._lbl_alert_DataProcess_BZ21 += " å‡ºçŽ°å¼‚常:" + ex.Message + SysGloble.SPLIT_STR;
                    Log4NetHelper.WriteErrorLog(logType, " å‡ºçŽ°å¼‚常：" + ex.Message, ex);
                }
            }

 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;
@@ -103,12 +104,57 @@


                            //处理表  mes_order_gather
                            var errmsg = "";
                            var result = 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);
                            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();
                        }
                    }

                }
                catch (Exception ex)
                {
                    SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao += " å‡ºçŽ°å¼‚常:" + ex.Message + SysGloble.SPLIT_STR;
                    Log4NetHelper.WriteErrorLog(logType, " å‡ºçŽ°å¼‚常：" + ex.Message, ex);
                }
            }
        }

        /// <summary>
        /// å¤„理 è¡¨ mes_order_gather
        /// </summary>
        /// <param name="wmsDB"></param>
        /// <param name="package"></param>
        /// <param name="qitaoValue"></param>
        /// <param name="_UnlinePerson"></param>
        /// <param name="errMsg"></param>
        /// <returns></returns>
        public static bool HandlerOrderGather(WmsDBModel wmsDB, mes_package_gather package, string qitaoValue, string _UnlinePerson, out string errMsg)
        {
            errMsg = "";
            //处理表  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;
                errMsg = $"没有找到生产单号{package.Info5}的汇总数据";
                return false;
                            }
                            var order = wmsDB.mes_order_gather.Where(x => x.Info5 == package.Info5).FirstOrDefault();
                            if (order != null)
@@ -168,28 +214,7 @@
                                wmsDB.mes_order_gather.Add(order);
                            }


                            //新增下线记录
                            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();
                        }
                    }

                }
                catch (Exception ex)
                {
                    SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao += " å‡ºçŽ°å¼‚常:" + ex.Message + SysGloble.SPLIT_STR;
                    Log4NetHelper.WriteErrorLog(logType, " å‡ºçŽ°å¼‚常：" + ex.Message, ex);
                }
            }
            return true;
        }

    }

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

@@ -8,6 +8,7 @@
using Microsoft.CodeAnalysis.Operations;
using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
using Admin.NET.Application.Service.WmsCommonnQuery.Dto;
using System.Collections.Generic;

namespace Admin.NET.Application;
/// <summary>
@@ -24,6 +25,7 @@
    private readonly SqlSugarRepository<Mes_BatchOrderUPI_New> _mesBatchOrderUpiRep;
    private readonly SqlSugarRepository<Mes_Order_Gather> _mesOrderGatherRep;
    private readonly SqlSugarRepository<Mes_Package_UnLine_Record> _mesPackage_UnLine_RecordRep;
    private readonly SqlSugarRepository<Mes_Package_LineQueue> _mesPackage_LineQueueRep;

    public WmsCommonnQueryService(SqlSugarRepository<WmsRbLineTask> rep, SqlSugarRepository<WmsStockQuan> wmsStockQuanRep
        , SqlSugarRepository<Mes_Package_Gather> mesPackageGatherRep
@@ -31,6 +33,7 @@
        , SqlSugarRepository<Mes_BatchOrderUPI_New> mesBatchOrderUpiRep
        , SqlSugarRepository<Mes_Order_Gather> mesOrderGatherRep
        , SqlSugarRepository<Mes_Package_UnLine_Record> mesPackage_UnLine_RecordRep
        , SqlSugarRepository<Mes_Package_LineQueue> mesPackage_LineQueueRep
        )
    {
        _sysConfigRep = sysConfigRep;
@@ -40,6 +43,7 @@
        _mesBatchOrderUpiRep = mesBatchOrderUpiRep;
        _mesOrderGatherRep = mesOrderGatherRep;
        _mesPackage_UnLine_RecordRep = mesPackage_UnLine_RecordRep;
        _mesPackage_LineQueueRep = mesPackage_LineQueueRep;
    }

    /// <summary>
@@ -64,6 +68,39 @@
    }



    /// <summary>
    /// æŸ¥è¯¢ è®¡åˆ’生产订单记录 ï¼ˆå¤§å±ä½¿ç”¨ï¼‰
    /// </summary>
    /// <returns></returns>
    [HttpGet]
    [ApiDescriptionSettings(Name = "QueryPlanOrderList")]
    [Description("WmsCommonnQuery/QueryPlanOrderList")]
    public async Task<List<Mes_Order_Gather>> QueryPlanOrderList()
    {
        var list = await _mesPackage_LineQueueRep.AsQueryable()
            .OrderBy(g => g.Id)
            .ToListAsync(); // ç¡®ä¿èŽ·å–结果为 List
        List<Mes_Order_Gather> resultList = new List<Mes_Order_Gather>();
        foreach (var item in list)
        {
            if (resultList.Select(x => x.Info5).ToList().Contains(item.Info5))
            {

            }
            else
            {
                var mesOrderGather = await _mesOrderGatherRep.GetFirstAsync(x => x.Info5 == item.Info5);
                if (mesOrderGather != null)
                {
                    resultList.Add(mesOrderGather);
                }
            }
        }

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

    /// <summary>
    /// æŸ¥è¯¢ åŽ†å²ç”Ÿäº§è®¢å•è®°å½• ï¼ˆå¤§å±ä½¿ç”¨ï¼‰
    /// </summary>