core/WCSCore.cs
@@ -61,7 +61,7 @@
                                //sendsencondtask(TN_Task);
                                WMSHelper.End(TN_Task);
                                //出库任务完成 修改配盘单状态为完成
                                if (TN_Task.N_TYPE == 2)
                                if (TN_Task.N_TYPE == 2&&TN_Task.S_TYPE!="出库空托盘")
                                {
                                    WMSHelper.EndTn(TN_Task.S_CNTR_CODE);
                                }
@@ -69,6 +69,7 @@
                            case 7:
                                TaskProcess.OperateStatus(TN_Task, 7);
                                WCSHelper.Fail(TN_Task);
                                WMSHelper.Fail(TN_Task);
                                //sendsencondtask(TN_Task);
                                //WMSHelper.End(TN_Task);
                                break;
@@ -83,7 +84,7 @@
                    }
                    else {
                        //安全请求等
                        TaskProcess.OperateReq( TN_Task, model.State, model.ForkliftNo, model.ExtData, model.Ext1);
                        TaskProcess.OperateReq( TN_Task, model.State, model.ForkliftNo, model.ExtData);
                    }
                }
            }
@@ -100,7 +101,26 @@
                WMSHelper.UpdateTaskState(optask);
            }
        }
        //public static bool SendCd()
        //{
        //    var result = false;
        //    var dic = new Dictionary<string, string>();
        //    var dic1 = new Dictionary<string, string>();
        //    dic.Add("ExtDeviceNo", "1");
        //    //判断
        //    var res = NDC.OrderAdd(99, dic, dic1);
        //    if (res != null && (res.Res.ErrCode == 0 || res.Res.ErrCode == 50009))
        //    {
        //        result = true;
        //    }
        //    return result;
        //}
        /// <summary>
        /// 任务分发,根据调度类型发给不同的调度系统
        /// </summary>
@@ -133,10 +153,6 @@
                var end = LocationHelper.GetLoc(wcsTask.S_END_LOC);
                if (model.code == "0") {
                    
                    //入库
                    //标记任务完成
                    //标记作业完成
                    wcsTask.N_B_STATE = 3;
                    WCSHelper.UpdateStatus(wcsTask,"完成");
                    var wmsTask = WMSHelper.GetWmsTask(wcsTask.S_OP_CODE);
@@ -147,6 +163,6 @@
                    sendsencondtask(wcsTask);
                }
            }
        }
        }
    }
}