针对ERP提供的字段，完善部分出库逻辑

kazelee

2025-06-09 ae6a8a95861a75ee580c75451f57e0504d2c367a

 core/WCSCore.cs

@@ -88,9 +88,9 @@
                        var nextOutboundTask = Task.Run(() => {
                            UpdateOutboundTaskState(3);
                        });
                        var pickUpReturnErpTask = Task.Run(() => {
                            PickUpReturnErp(TN_Task);
                        });
                        //var pickUpReturnErpTask = Task.Run(() => {
                        //    PickUpReturnErp(TN_Task);
                        //});
                    }

                    break;
@@ -110,6 +110,10 @@
                    //    });
                    //}

                    var recordTask = Task.Run(() => {
                        RecordTaskTable(TN_Task);
                    });

                    break;
                case 7: // 异常
                    TaskProcess.OperateStatus(TN_Task, 7); // 异常处理
@@ -124,6 +128,78 @@
            return true;
        }

        private static void RecordTaskTable(TN_Task task) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            try {
                var cgDetail = new TN_CG_Detail(); // 如果没有信息，默认就是空值，可以直接填入，不需要判断
                
                //var emptyTask = false; // 空托/空箱任务
                if (task.S_TYPE != TaskName.H好运箱_空箱上线 && task.S_TYPE != TaskName.H好运箱_空箱入库 &&
                    task.S_TYPE != TaskName.T托盘_空托上线 && task.S_TYPE != TaskName.T托盘_空托入库) {
                    // 非空托/空箱任务（空托/空箱任务无法在CGDetail查到物料信息）
                    //emptyTask= true;
                    cgDetail = db.Queryable<TN_CG_Detail>()
                        .Where(d => d.S_CNTR_CODE == task.S_CNTR_CODE)
                        .First();

                    if (cgDetail == null) {
                        info = $"任务{task.S_CODE}完成，记录出入库存在问题：无法在容器货品明细表中找到托盘{task.S_CNTR_CODE}对应的物料";
                        LogHelper.Info(info);
                        //return;
                        cgDetail = new TN_CG_Detail() ;
                        cgDetail.S_ITEM_CODE = "异常";
                    }
                }

                var isInbound = false; // 入库类型的任务（包括移库类任务）
                var inboundTasks = new List<string> {
                    TaskName.H好运箱_满箱下线入库, TaskName.H好运箱_空箱入库, TaskName.T托盘_满托下线入库, TaskName.T托盘_空托入库,
                    TaskName.C抽检_合格回库, TaskName.C抽检_不合格移库, TaskName.Y移库
                };
                if (inboundTasks.Contains(task.S_TYPE)) {
                    isInbound= true;
                }

                var record = new TN_Record_Table {
                    S_ITEM_CODE = cgDetail.S_ITEM_CODE,
                    S_BATCH_NO = cgDetail.S_BATCH_NO,
                    S_ITEM_NAME = cgDetail.S_ITEM_NAME,
                    S_LOC_CODE = isInbound ? task.S_END_LOC : task.S_START_LOC, // 入库记录终点货位，出库记录起点货位
                    S_CNTR_CODE = task.S_CNTR_CODE,
                    S_ITEM_SPEC = cgDetail.S_ITEM_SPEC,
                    S_NET_WEIGHT = cgDetail.S_NET_WEIGHT,
                    S_QUALITY_GRADE = cgDetail.S_QUALITY_GRADE,
                    S_STANDARD = cgDetail.S_STANDARD,
                    S_TASK_NO = task.S_CODE,
                    T_RECORD_TIME = DateTime.Now,
                    S_TYPE = task.S_TYPE,
                    S_BS_CODE = task.S_BS_TYPE,
                    N_QTY = cgDetail.N_ITEM_NUM,
                };

                // 数据库操作

                if (db.Insertable<TN_Record_Table>(record).ExecuteCommand() <= 0) {
                    info = "插入出入库记录表失败：" + JsonConvert.SerializeObject(record);
                    LogHelper.Info(info);
                    return;
                }

                info = "插入出入库记录表成功";
                LogHelper.Info(info);
            }
            catch (Exception ex) {
                LogHelper.InfoEx(ex);
            }
        }

        /// <summary>
        /// AGV产线安全交互逻辑实现
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public static ReturnResult SafetyInteraction(SafetyInteractionInfo model) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
@@ -291,8 +367,6 @@
            else {
                LogHelper.Info("暂无任务");
            }


        }
    }
}