Admin
22 小时以前 fd7fa01f87026b9db4cc6d44c0f93987b9bc27f2
最新
已删除4个文件
已修改12个文件
106 ■■■■■ 文件已修改
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v9.bin 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v9.bin 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.strings.v9.bin 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db-shm 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db-wal 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db-shm 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db-wal 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue
@@ -68,7 +68,8 @@
        { field: 'palletCode', title: '车轮条码', type: 'string', width: 180, align: 'left' },
        { field: 'carType', title: '车型', type: 'string', width: 75, align: 'left' },
        { field: 'wheels_gkcc', title: '毂孔均值', type: 'string', width: 90, align: 'left' },
        { field: 'wheelsNewOrOld', title: '新/旧', type: 'string', width: 70, align: 'left' },
        //{ field: 'wheelsNewOrOld', title: '新/旧', type: 'string', width: 70, align: 'left' },
{ field: 'wheelsNewOrOld', title: '新旧类型', type: 'string',  width: 100, align: 'left',bind: { key: "NewOld", data: [] }} ,
        { field: 'pnboundNo', title: '单据号', type: 'string', width: 110, align: 'left',hidden:true },
        { field: 'groupID', title: '库存ID', type: 'int', width: 110, hidden: true, align: 'left' },
        { field: 'groupDetailId', title: '组盘明细ID', type: 'int', width: 110, hidden: true, align: 'left' },
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v9.bin
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v9.bin
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.strings.v9.bin
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db-shm
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db-wal
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db-shm
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db-wal
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin
Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs
@@ -374,6 +374,12 @@
        /// </summary>
        [Description("入库任务异常")]
        InException = 299,
        /// <summary>
        /// å…¥åº“任务异常删除
        /// </summary>
        [Description("入库任务异常删除")]
        InAbnormalCompletion = 10001,
    }
    #endregion å…¥åº“任务状态
@@ -462,6 +468,12 @@
        /// </summary>
        [Description("出库任务异常")]
        OutException = 199,
        /// <summary>
        /// å‡ºåº“任务异常删除
        /// </summary>
        [Description("出库任务异常删除")]
        OutAbnormalCompletion = 10002,
    }
    /// <summary>
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -929,7 +929,7 @@
                return content.Error("未找到任务信息!");
            }
            if (task.TaskState != (int)TaskInStatusEnum.InNew && task.TaskState != (int)TaskOutStatusEnum.OutNew && task.TaskState != (int)TaskStatus.Created)
            if (task.TaskState != (int)TaskInStatusEnum.InNew && task.TaskState != (int)TaskOutStatusEnum.OutNew && task.TaskState != (int)TaskStatus.Created && task.TaskState != (int)TaskInStatusEnum.InAbnormalCompletion && task.TaskState != (int)TaskOutStatusEnum.OutAbnormalCompletion)
            {
                return content.Error("任务不处于新建状态,禁止删除!");
            }
@@ -944,48 +944,69 @@
            // æ ¹æ®ä»»åŠ¡ç±»åž‹è°ƒç”¨ç›¸åº”çš„å®Œæˆä»»åŠ¡æ–¹æ³•
            // éªŒè¯åº“存是否存在
            var stock = _WheelsStockRepository.QueryFirstNavAsync(x => x.Wheels_Num.Contains(task.PalletCode) && x.Wheels_Location == task.SourceAddress);
            var ZdpStock = _ZdpStockRepository.QueryFirstNavAsync(x => x.Zdp_code == task.PalletCode && x.Zdp_Location == task.SourceAddress);
            bool res = false;
            switch (task.TaskType)
            if(task.TaskState== (int)TaskInStatusEnum.InAbnormalCompletion || task.TaskState == (int)TaskOutStatusEnum.OutAbnormalCompletion)
            {
                case (int)TaskInboundTypeEnum.Inbound:
                case (int)TaskInboundTypeEnum.InWheels:
                case (int)TaskInboundTypeEnum.InBrake:
                    LogFactory.GetLog("任务完成").InfoFormat(true, "入库任务", "");
                        res = SellectLocationInfo(task,1);
                    break;
                var taskHtyNG2 = CreateHistoricalTask(task, true);
                case (int)TaskOutboundTypeEnum.Outbound:
                case (int)TaskOutboundTypeEnum.OutWheels:
                    LogFactory.GetLog("任务完成").InfoFormat(true, "出库任务", "");
                        res = SellectLocationInfo(task,2);
                    break;
                //if (task.TaskState == (int)TaskInStatusEnum.InNew || task.TaskState == (int)TaskOutStatusEnum.OutNew)
                //{
                //    //if(task.TaskType ==  )
                //}
                case (int)TaskOutboundTypeEnum.OutBrake:
                    LogFactory.GetLog("任务完成").InfoFormat(true, "制动盘出库任务", "");
                        res = SellectLocationInfo(task,3);
                    break;
                // æ·»åŠ åŽ†å²ä»»åŠ¡
                var isTaskHtyAdd2 = _task_HtyRepository.AddData(taskHtyNG2) > 0;
                case (int)TaskRelocationTypeEnum.Relocation:
                    if (stock != null)
                    {
                        res = SellectLocationInfo(task,4);
                    }
                    else
                    {
                        res = SellectLocationInfo(task,5);
                    }
                    break;
                // åˆ é™¤ä»»åŠ¡æ•°æ®
                var isTaskDelete2 = BaseDal.Delete(task.TaskId);
                default:
                    return content.Error("任务类型不存在");
                return content.OK("删除成功!");
            }
            if (!res)
            else
            {
                return content.Error("在执行任务分类的时候出现错误!");
                var stock = _WheelsStockRepository.QueryFirstNavAsync(x => x.Wheels_Num.Contains(task.PalletCode) && x.Wheels_Location == task.SourceAddress);
                var ZdpStock = _ZdpStockRepository.QueryFirstNavAsync(x => x.Zdp_code == task.PalletCode && x.Zdp_Location == task.SourceAddress);
                bool res = false;
                switch (task.TaskType)
                {
                    case (int)TaskInboundTypeEnum.Inbound:
                    case (int)TaskInboundTypeEnum.InWheels:
                    case (int)TaskInboundTypeEnum.InBrake:
                        LogFactory.GetLog("任务完成").InfoFormat(true, "入库任务", "");
                        res = SellectLocationInfo(task, 1);
                        break;
                    case (int)TaskOutboundTypeEnum.Outbound:
                    case (int)TaskOutboundTypeEnum.OutWheels:
                        LogFactory.GetLog("任务完成").InfoFormat(true, "出库任务", "");
                        res = SellectLocationInfo(task, 2);
                        break;
                    case (int)TaskOutboundTypeEnum.OutBrake:
                        LogFactory.GetLog("任务完成").InfoFormat(true, "制动盘出库任务", "");
                        res = SellectLocationInfo(task, 3);
                        break;
                    case (int)TaskRelocationTypeEnum.Relocation:
                        if (stock != null)
                        {
                            res = SellectLocationInfo(task, 4);
                        }
                        else
                        {
                            res = SellectLocationInfo(task, 5);
                        }
                        break;
                    default:
                        return content.Error("任务类型不存在");
                }
                if (!res)
                {
                    return content.Error("在执行任务分类的时候出现错误!");
                }
            }
            var taskHtyNG = CreateHistoricalTask(task, true);