去线边的，取消任务收到4后直接删除物料容器

杨张扬

4 天以前 7b3b60e8e01a1cf2fb97af695639b18210a160c0

 process/TaskProcess.cs

@@ -51,24 +51,23 @@
                CacheBitUpdate(mst, false);
                WCSHelper.End(mst);//任务状态改成结束
            }
            else 
            else   // 没有开始卸货
            {
                // 没有开始卸货
              
                WCSHelper.Fail(mst);//任务状态改成错误
                var db = new SqlHelper<object>().GetInstance();
                var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == mst.S_CNTR_CODE);
                if (cginfo!= null)
                {
                    db.Deleteable<TN_InventoryM>().Where(it => it.S_ID == cginfo.S_ID || it.RFID == mst.S_CNTR_CODE).ExecuteCommand();
                }
                else
                {
                    db.Deleteable<TN_InventoryM>().Where(it => it.RFID == mst.S_CNTR_CODE).ExecuteCommand();
                }
                db.Deleteable<TN_CG_Detail>().Where(it => it.S_CNTR_CODE == mst.S_CNTR_CODE).ExecuteCommand();
                db.Deleteable<TN_InventoryM>().Where(it => it.RFID == mst.S_CNTR_CODE).ExecuteCommand();
                db.Deleteable<TN_Loc_Container>().Where(it => it.S_CNTR_CODE == mst.S_CNTR_CODE).ExecuteCommand();
                db.Deleteable<TN_Container>().Where(it => it.S_CODE == mst.S_CNTR_CODE).ExecuteCommand();
                //必须删掉
            }
            if (!WCSHelper.CheckActionRecordExist(mst.S_CODE, 4))
            {
                LocationHelper.UnLockLoc(mst.S_START_LOC);//解锁起点
                LocationHelper.ErrorLocCntReset(new ErrorLocCntResetInfo() { locID = mst.S_START_LOC, reqCode = 1 });
            }
            LocationHelper.UnLockLoc(mst.S_START_LOC);//解锁起点
           
            LocationHelper.UnLockLoc(mst.S_END_LOC);//解锁终点
        }

@@ -155,13 +154,21 @@
                    var dic = new List<param>();
                    dic.Add(new param() { name = "IKey", value = "IKey" });
                    dic.Add(new param() { name = "From", value = start.ToString() });
                    dic.Add(new param() { name = "To", value = end.ToString() });
                    dic.Add(new param() { name = "FUNC", value = startLoc.N_LAYER.ToString() });

                    if (mst.S_TYPE.Contains("点对点") || mst.S_TYPE.Contains("满托出库上线") || mst.S_TYPE.Contains("满托出库复检"))
                    {
                        dic.Add(new param() { name = "FUNC", value = "0" });
                    }
                    else
                    {
                        dic.Add(new param() { name = "FUNC", value = startLoc.N_LAYER.ToString() });
                    }

                    dic.Add(new param() { name = "To", value = end.ToString() });
                    dic.Add(new param() { name = "Ctype", value = "0" });

                    
                    if (mst.S_TYPE == "余料下线入库" || mst.S_TYPE == "人工拆盘入库")
                    if (mst.S_TYPE.Contains("余料下线入库") || mst.S_TYPE.Contains("人工拆盘入库"))
                    {
                        dic.Add(new param() { name = "DATA", value = "1024" });
                    }
@@ -170,6 +177,8 @@
                        dic.Add(new param() { name = "DATA", value = "0" });
                    }

                    

                    var res = NDCApi.AddOrderNew(1, 1, mst.S_CODE, dic);//添加新命令
                    if (res != null && (res.err_code == 0 || res.err_code == 50009))
                    {