111
cjs
2025-06-18 8ab19ae17dc98d3c79f87ca54aa4cdc75d174b12
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/EnentListen.cs
@@ -166,15 +166,7 @@
                    {
                        list.ForEach(a =>
                        {
                            if(a.deviceType == "1")
                            {
                                PLCControl.PickUpBlank(a);
                            }
                            else
                            {
                                PLCControl.PickUpBlankTwo(a);
                            }
                            PLCControl.PickUpBlankTwo(a);
                        });
                    }
                }
@@ -201,12 +193,15 @@
            #region 10006-叠盘机满托下线(3楼叠盘下线)-3楼叠盘下线--已完成(待测试)
            if (currActionModel.CN_N_ACTION_CODE == 10006)
            {
                var plc = Settings.GetPlcInfo().Where(a => a.enable == 1 && (a.deviceType == "15" || a.deviceType == "25")).FirstOrDefault();
                if (plc != null)
                var plc = Settings.GetPlcInfo().Where(a => a.enable == 1 && (a.deviceType == "15" || a.deviceType == "25")).ToList();
                if (plc.Count >0 )
                {
                    if (PickUpStartFree(plc.location))
                    foreach(var a in plc)
                    {
                        PLCControl.StackingLineEmpty(plc);
                        if (PickUpStartFree(a.location))
                        {
                            PLCControl.StackingLineEmpty(a);
                        }
                    }
                }
                //Thread.Sleep(500);
@@ -319,7 +314,7 @@
                        list.ForEach(a =>
                        {
                            // 包装机启动时读取【翻页通道】,根据页号获取五条数据,然后写入包装机
                            //ERPService.WriteItemInfo(a);
                            //ERPService.WriteItemInfoTwo(a);
                            PLCControl.CheckPackingMachineTetracobalt(a);
                        });
@@ -335,7 +330,7 @@
            {
                lock (lock10015)
                {
                    ERPService.insertMidTable();
                    //ERPService.insertMidTable();
                }
            }
            #endregion
@@ -349,7 +344,7 @@
                {
                    if (CheckStartFree(plc.location))
                    {
                        PLCControl.CheckPackingLineFullTwo(plc);
                        PLCControl.CheckPackingLineFullThree(plc);
                    }
                }
                //Thread.Sleep(500);