blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
pulg
2025-07-02 8953f14db850deaf66782197a5d2bff35fe41e1a 
 HH.WCS.QingXiNongfu/process/DeviceProcess.cs


@@ -144,7 +144,6 @@


            }




        }




        private static void Analysis13(string data, deviceInfo plc)


        {


            //用于  出库时 是否可以直达 提升机。  00 后面还需增加退料工单处理。 


@@ -313,7 +312,7 @@


                    si = "0";




                }


                else if (data.Contains("11"))// && (ods.Find(x => x.SQL_PLineNo.Contains("纸箱")) != null || plc.deviceName.Contains("T1"))


                if (data.Contains("11"))// && (ods.Find(x => x.SQL_PLineNo.Contains("纸箱")) != null || plc.deviceName.Contains("T1"))


                {


                    //if (!ods.Any())


                    //    return;


@@ -321,13 +320,22 @@


                    if (_cl.N_CURRENT_NUM > 0 || _clrel.Any())


                    {


                        LogHelper.Info($" time：{_clrel0?.T_CREATE} = s_type：{_clrel0.S_TYPE}");


                        //if (DateTime.Now.Subtract(_clrel0.T_CREATE).TotalSeconds < 10 || !string.IsNullOrEmpty(_clrel0.S_TYPE))


                        //    goto ballll;


                        //plg 2025年6月23日  去除10秒时间限制


                        if (_clrel.Any())


                            //if (DateTime.Now.Subtract(_clrel0.T_CREATE).TotalSeconds < 10 || !string.IsNullOrEmpty(_clrel0.S_TYPE))


                            //    goto ballll;


                            //plg 2025年6月23日  去除10秒时间限制


                            if (DateTime.Now.Subtract(_clrel0.T_CREATE).TotalSeconds < 3 || !string.IsNullOrEmpty(_clrel0.S_TYPE))


                                goto ballll;




                        {


                            if (od?.SQL_PLineNo == "T1提升机")


                            {


                                if (!string.IsNullOrEmpty(_clrel0.S_TYPE))


                                    goto ballll;


                            }


                            else


                            {


                                if (DateTime.Now.Subtract(_clrel0.T_CREATE).TotalSeconds < 3 || !string.IsNullOrEmpty(_clrel0.S_TYPE))


                                    goto ballll;


                            }


                        }


                        LocationHelper.DoAction(db =>


                            {


                                db.Deleteable(_clrel).ExecuteCommand();


@@ -368,7 +376,7 @@


                        if (sBit != null)


                        {


                            var sign = Settings.GetTimeStamp();


                            var res = TaskProcess.CreateTransport(sign, sBit.S_LOC_CODE, _cl.S_LOC_CODE, "原物料搬运-纸箱", new List<string> { _clrel.FirstOrDefault().S_CNTR_CODE }, sBit.N_CURRENT_NUM, 1, 1, 50);///, EdnRarea == "YWLYLTKQ" ? _clrel0.S_TYPE : "");


                            var res = TaskProcess.CreateTransport(sign, sBit.S_LOC_CODE, _cl.S_LOC_CODE, "原物料搬运-纸箱", new List<string> { _clrel.FirstOrDefault().S_CNTR_CODE }, sBit.N_CURRENT_NUM, 1, 1, 60);///, EdnRarea == "YWLYLTKQ" ? _clrel0.S_TYPE : "");


                            LogHelper.Info($"原物料搬运 上提升机。 {sign} 任务 ，创建{res} ");


                            //var res = TaskProcess.CreateTransport(sign, sBit.S_LOC_CODE, _cl.S_LOC_CODE, "原物料搬运-纸箱", new List<string> { _clrel.FirstOrDefault().S_CNTR_CODE }, sBit.N_CURRENT_NUM, 1, 1, 50);///, EdnRarea == "YWLYLTKQ" ? _clrel0.S_TYPE : "");


                            //LogHelper.Info($"原物料搬运 上提升机。 {sign} 任务 ，创建{res} ");


@@ -2712,7 +2720,6 @@


            //就查看有没有空的排了。 


            //if (endBit != null) ///  寻找未满排， 直接返回结果。 


            return endBit;


        //LogHelper.Info(" _tempList over！");




        //这里开始 寻找空排


        Empty:


@@ -3483,26 +3490,27 @@


                                        }


                                    if (endBit == null && _tempList.Any())


                                    {


                                        LogHelper.Info(" ar_RplaceRow over！");


                                        var ar_RplaceRows = LocationHelper.GetLocList(x => x.S_AREA_CODE != area1 && x.S_AREA_CODE.Contains(are) && x.S_LOCK_STATE != "报废");//.Select(x => x.N_ROW).Distinct();


                                                                                                                                                                            //var ar_RplaceRow1 = ar_RplaceRows.FindAll(x => x.S_LOCK_STATE != "无").Select(x => x.N_ROW).Distinct();


                                        IEnumerable<int> ar_RplaceRow1 = ar_RplaceRows.FindAll(x => "入库锁;出库锁".Contains(x.S_LOCK_STATE?.Trim())).Select(x => x.N_ROW).Distinct();


                                        LogHelper.Info(" 有锁排 - " + JsonConvert.SerializeObject(ar_RplaceRow1));                                                                                        //LogHelper.Info(" 有锁排 - " + JsonConvert.SerializeObject(ar_RplaceRow1));


                                        var ar_RplaceRow2 = ar_RplaceRows.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();


                                        LogHelper.Info(" 有货排： - " + JsonConvert.SerializeObject(ar_RplaceRow2));


                                        var ar_RplaceRow_rowlock = LocationHelper.GetRowLock(x => x.S_AREA_CODE.Contains(are))?.Select(x => x.N_ROW);


                                        LogHelper.Info(" ar_RplaceRow over！" + JsonConvert.SerializeObject(_tempList.Select(x => x.N_ROW).Distinct()));


                                        //var ar_RplaceRows = LocationHelper.GetLocList(x => x.S_AREA_CODE != area1 && x.S_AREA_CODE.Contains(are) && x.S_LOCK_STATE != "报废");//.Select(x => x.N_ROW).Distinct();


                                        //                                                                                                                                    //var ar_RplaceRow1 = ar_RplaceRows.FindAll(x => x.S_LOCK_STATE != "无").Select(x => x.N_ROW).Distinct();


                                        //IEnumerable<int> ar_RplaceRow1 = ar_RplaceRows.FindAll(x => "入库锁;出库锁".Contains(x.S_LOCK_STATE?.Trim())).Select(x => x.N_ROW).Distinct();


                                        //LogHelper.Info(" 有锁排 - " + JsonConvert.SerializeObject(ar_RplaceRow1));                                                                                        //LogHelper.Info(" 有锁排 - " + JsonConvert.SerializeObject(ar_RplaceRow1));


                                        //var ar_RplaceRow2 = ar_RplaceRows.FindAll(x => x.N_CURRENT_NUM > 0).Select(x => x.N_ROW).Distinct();


                                        //LogHelper.Info(" 有货排： - " + JsonConvert.SerializeObject(ar_RplaceRow2));


                                        //var ar_RplaceRow_rowlock = LocationHelper.GetRowLock(x => x.S_AREA_CODE.Contains(are))?.Select(x => x.N_ROW);




                                        var ar_RplaceRow = ar_RplaceRow1.Concat(ar_RplaceRow2).Concat(ar_RplaceRow_rowlock).Distinct();


                                        //var ar_RplaceRow = ar_RplaceRow1.Concat(ar_RplaceRow2).Concat(ar_RplaceRow_rowlock).Distinct();




                                        if (ar_RplaceRow.Any())


                                        {


                                            LogHelper.Info("排除非空排 - " + JsonConvert.SerializeObject(ar_RplaceRow));


                                            _tempList.RemoveAll(x => ar_RplaceRow.Contains(x.N_ROW));


                                        }


                                        if (_tempList.Any())//三个库区的交集空排


                                        {


                                            endBit = _tempList.OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();


                                        }


                                        //if (ar_RplaceRow.Any())


                                        //{


                                        //    LogHelper.Info("排除非空排 - " + JsonConvert.SerializeObject(ar_RplaceRow));


                                        //    _tempList.RemoveAll(x => ar_RplaceRow.Contains(x.N_ROW));


                                        //}


                                        //if (_tempList.Any())//三个库区的交集空排


                                        //{


                                        //    endBit = _tempList.OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();


                                        //}


                                        endBit = _tempList.OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();


                                    }




                                    #endregion