Merge branch 'master' into csc

chengsc

2024-10-30 c06382f1b619e1dc7f37be36a0cee126239abdee

Merge branch 'master' into csc

 Admin.NET/WCS.Application/PLC/PLCService.cs

@@ -1993,7 +1993,7 @@
                            string TaskNo = "", EndLocate = "";
                            string strMsg = http.BindRequestRoadWay(checkTaskMedel.OrderNo,palletNo, checkTaskMedel.BoxCount.ToDecimal(),"0", checkTaskMedel.SkuNo, checkTaskMedel.LotNo, "","", boxInfoList, 
                                modDevice.StationNum, "1", "2", ref EndLocate, ref TaskNo);
                            if (!strMsg.Contains("-1"))
                            if (strMsg.Contains("-1"))
                            {
                                Log.Error(string.Format("申请巷道失败，码垛工位{0};原因{1}", modDevice.StationNum, strMsg));
                                break;
@@ -2137,15 +2137,15 @@
                var ret = plcConn.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PosLot, "1");
                if (ret.IsSucceed)
                {
                    //写入流程字成功后更新分拣任务
                    item.OrderNo = "";
                    item.TaskNo = "";
                    item.LotNo = "";
                    item.SkuNo = "";
                    item.SkuName = "";
                    item.BoxType = "";
                    item.Qty = 0;
                    item.PZNo = "";
                    //写入流程字成功后更新分拣任务    liudl 最后一托盘申请完入库才可清空
                    //item.OrderNo = "";
                    //item.TaskNo = "";
                    //item.LotNo = "";
                    //item.SkuNo = "";
                    //item.SkuName = "";
                    //item.BoxType = "";
                    //item.Qty = 0;
                    //item.PZNo = "";
                    item.Status = status;      // 绑定分道 0：解绑  1：绑定 

                    //更新分拣任务

 Admin.NET/WCS.Application/PLC/PLCTaskAction.cs

@@ -182,7 +182,7 @@
                            }
                        }

                        Thread.Sleep(10000);
                        Thread.Sleep(50000);
                    }
                    catch (OperationCanceledException)
                    {