修复去线边的任务，完成后自动解绑失败的问题

杨张扬

12 小时以前 f9d7694d27475954449ce3073938af98a4798b07

 wms/SpecHelper.cs

@@ -280,14 +280,18 @@
        }

        /// <summary>
        /// 重置终点货位，只针对去线边的货品
        /// 重置终点货位，只针对去线边的货品和去原材料产线的空托
        /// </summary>
        /// <param name="tN_Task"></param>
        internal static void RestEndLoc(TN_Task tN_Task)
        {
            try
            {
                if (tN_Task.S_END_AREA == Settings.Areas[2] || tN_Task.S_TYPE.Contains("满托出库上线"))
                if (
                    tN_Task.S_END_AREA == Settings.Areas[2] || tN_Task.S_TYPE.Contains("满托出库上线") ||
                    Settings.ProductionLines.Select(a=>a.PointIn).ToList().Contains(tN_Task.S_END_LOC) ||
                    tN_Task.S_TYPE.Contains("线边空托上线")
                    )
                {
                    var db = new SqlHelper<object>().GetInstance();

@@ -311,12 +315,11 @@
                                return;
                            }

                            var locCnt = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == endLoc.S_CODE);
                            var locCnt = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == tN_Task.S_CNTR_CODE);

                            if (locCnt != null)
                            {
                                var cgInfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == locCnt.S_CNTR_CODE);

                                
                                if (db.Deleteable<TN_Loc_Container>(locCnt).ExecuteCommand() > 0)
                                {
                                    LogHelper.Info($"删除货位容器绑定关系成功，{JsonConvert.SerializeObject(locCnt)}");
@@ -328,6 +331,8 @@
                                    return;
                                }

                                var cgInfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == tN_Task.S_CNTR_CODE);

                                if (cgInfo != null)
                                {
                                    if (db.Deleteable<TN_CG_Detail>(cgInfo).ExecuteCommand() > 0)
@@ -337,6 +342,21 @@
                                    else
                                    {
                                        LogHelper.Info($"删除容器货品明细失败，{JsonConvert.SerializeObject(cgInfo)}");
                                        tran.RollbackTran();
                                        return;
                                    }
                                }

                                var cnt = db.Queryable<TN_Container>().First(it => it.S_CODE == cgInfo.S_CNTR_CODE);
                                if (cnt != null)
                                {
                                    if (db.Deleteable<TN_Container>(cnt).ExecuteCommand() > 0)
                                    {
                                        LogHelper.Info($"删除容器成功，{JsonConvert.SerializeObject(cnt)}");
                                    }
                                    else
                                    {
                                        LogHelper.Info($"删除容器失败，{JsonConvert.SerializeObject(cnt)}");
                                        tran.RollbackTran();
                                        return;
                                    }
@@ -405,13 +425,8 @@

                if (model != null)
                {
                    var target = db.Queryable<TN_InventoryM>().First(o => o.RFID == model.RFID);
                    if (target != null)
                    {
                        db.Deleteable<TN_InventoryM>(target).ExecuteCommand();
                    }
                    model.EXPIRATION = System.DateTime.Now.AddHours(GetExportTime(model.SPEC));
                    if (db.Insertable<TN_InventoryM>(model).ExecuteCommand() > 0)
                    if (db.Storageable<TN_InventoryM>(model).ExecuteCommand() > 0)
                    {
                        LogHelper.Info($"插入WMS库存明细成功，{log}");
                    }