change-回退

SlnMesnac.WCS/WCS/BearAgv.cs

@@ -621,16 +621,13 @@ namespace SlnMesnac.WCS.WCS
                         }
                     }
                 }
-                else if (task.TaskStatus == 4)  //agv已经退出接驳位
+                else if (task.TaskStatus == 4)  //agv已经退出接驳位，wcs把 线体忙碌状态改为0，接驳位到位信号 复位写0，出接驳位信号 0，清空RFID、机台号
                 {
                     if (workShop2Plc == null || !workShop2Plc.IsConnected)
                     {
                         _logger.Plc(DateTime.Now + "2#PLC未连接,请检查网络!");
                         return;
                     }
-                    //判断二次生成补空箱任务
-                    CreateSecondSuppleSmallPallet();
-
                     sqlSugarClient.AsTenant().BeginTran();
                     try
                     {
@@ -1286,7 +1283,7 @@ namespace SlnMesnac.WCS.WCS
                 int totalTaskCount = sqlSugarClient.Queryable<WcsTask>().Count();
                 int work2EmptyAmount = workShop2Plc.readInt16ByAddress(StaticData.GetPlcAddress("2#缓存链条线库存数"));
                 int work2LineBusyFlag = workShop2Plc.readInt16ByAddress(StaticData.GetPlcAddress("2#缓存空箱线体状态"));
-                if (work3EmptyAmount < 2 && totalTaskCount < 3 && suppleTaskCount == 1 && work2LineBusyFlag == 0 && work2EmptyAmount > 0)
+                if (work3EmptyAmount == 0 && totalTaskCount < 3 && suppleTaskCount == 1 && work2LineBusyFlag == 0 && work2EmptyAmount > 0)
                 {
                     workShop2Plc.writeInt16ByAddress(StaticData.GetPlcAddress("2#缓存空箱线体状态"), 1);
                     WcsTask task = new WcsTask();

SlnMesnac.WCS/WCS/CreateTaskByRecord.cs

@@ -605,18 +605,12 @@ namespace SlnMesnac.WCS.WCS
         {
             try
             {
-                int totalTaskAmount = sqlSugarClient.Queryable<WcsTask>().Count();
-                int EmptyTaskAmount = sqlSugarClient.Queryable<WcsTask>().Where(x => x.TaskType == StaticTaskType.SupplySmallPalletTask || x.TaskType == StaticTaskType.SupplySmallPalletFromTonerTask).Count();
                 //判断是否已经有空托盘补充任务
-                bool hasTask = sqlSugarClient.Queryable<WcsTask>().Any(x => (x.TaskType == StaticTaskType.SupplySmallPalletTask && x.TaskStatus < 5) || x.TaskType == StaticTaskType.SupplySmallPalletFromTonerTask);
+                bool hasTask = sqlSugarClient.Queryable<WcsTask>().Any(x => x.TaskType == StaticTaskType.SupplySmallPalletTask || x.TaskType == StaticTaskType.SupplySmallPalletFromTonerTask);
                 if (hasTask)
                 {
                     return;
                 }
-                if (totalTaskAmount >= 3 || EmptyTaskAmount >= 2)
-                {
-                    return;
-                }
                 //判断色粉存放处是否有空托盘
                 WcsBaseEquip? emptyPalletEquip = sqlSugarClient.Queryable<WcsBaseEquip>().InnerJoin<WmsPalletInfo>(
                     (wbe, wpi) => wbe.ContainerCode == wpi.PalletInfoCode && wpi.Amount == 0 && wbe.EquipStatus == 0)