增加空托堆叠和空托入货架的新逻辑，增加拆盘入库和回炉胶和废料的逻辑

杨张扬

4 天以前 2d2342157638cab98a4c59b0c687808cc2f98ea1

 core/WCSCore.cs

@@ -69,7 +69,11 @@
                                    WCSHelper.Begin(tN_Task, model.forklift_no);//已推送的任务的状态改成执行
                                    Task task4 = Task.Run(() =>
                                    {
                                        if (tN_Task.S_TYPE.Contains("点对点") || tN_Task.S_TYPE.Contains("满托出库上线") || tN_Task.S_TYPE.Contains("满托出库复检"))
                                        if (tN_Task.S_TYPE.Contains("点对点") 
                                        || tN_Task.S_TYPE.Contains("满托出库上线")
                                        || tN_Task.S_TYPE.Contains("满托出库复检")
                                        || tN_Task.S_TYPE.Contains("空托")
                                        )
                                        {
                                            //不开启扫码
                                        }
@@ -89,7 +93,7 @@
                                    
                                    Task task3 = Task.Run(() =>
                                    {
                                        EmptyInStackArea(tN_Task);
                                        EmptyInStackArea(tN_Task);//空托下线堆叠
                                    });

                                    Task task1 = Task.Run(() =>
@@ -149,7 +153,6 @@
                                        }
                                    });


                                    Task task12 = Task.Run(() =>
                                    {
                                        if (tN_Task.S_TYPE == "PDA满托下线入库" || tN_Task.S_TYPE == "PLC满托下线入库")
@@ -208,9 +211,8 @@
                        else
                        {
                            //安全请求等
                            TaskProcess.OperateReq(model.task_no, model.state, model.forklift_no, model.ext_data);
                            //TaskProcess.OperateReq(model.task_no, model.state, model.forklift_no, model.ext_data);
                        }
                       
                    }
                    else
                    {
@@ -589,7 +591,7 @@
                        //查询符合的未锁定已启用指定货区的当前数量合计后最接近容量的货位，终点
                        var endLoc = db.Queryable<TN_Location>().
                            Where(a => a.N_CURRENT_NUM + item.N_CURRENT_NUM <= a.N_CAPACITY && a.S_AREA_CODE == Settings.Areas[3] && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y").
                            OrderBy(a => a.N_CURRENT_NUM + item.N_CURRENT_NUM - a.N_CAPACITY, OrderByType.Desc).First();
                            ToList().OrderByDescending(a => a.N_CURRENT_NUM + item.N_CURRENT_NUM - a.N_CAPACITY).ThenBy(a=>a.N_ROW).ThenBy(a => a.N_COL).ToList().First();

                        if (endLoc == null)
                        {