1

wangxinhui

2024-12-24 636a0e56fb705177dbd043a90e47c4b8be20f8fc

1

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1e920e33-148d-49c7-8f92-7c522736eb31.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/83e3b476-d887-46bd-be7e-12e5279adff6.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs

@@ -10,139 +10,55 @@
    public enum TaskTypeEnum
    {
        /// <summary>
        /// åº“内移库
        /// é¢†æ–™å‡ºåº“
        /// </summary>
        [Description("库内移库")]
        Relocation = 300,
        /// <summary>
        /// åº“外移库
        /// </summary>
        [Description("库外移库")]
        RelocationIn = 301,
        /// <summary>
        /// å…¥åº“
        /// </summary>
        [Description("入库")]
        Inbound = 1050,
        /// <summary>
        /// ç›˜ç‚¹å…¥åº“
        /// </summary>
        [Description("盘点入库")]
        InInventory = 1100,
        /// <summary>
        /// åˆ†æ‹£å…¥åº“
        /// </summary>
        [Description("分拣入库")]
        InPick = 1150,
        /// <summary>
        /// è´¨æ£€å…¥åº“
        /// </summary>
        [Description("质检入库")]
        InQuality = 1200,
        /// <summary>
        /// æµ‹è¯•æž¶å…¥åº“
        /// </summary>
        [Description("测试架入库")]
        TestInbound = 2000,
        /// <summary>
        /// æ²¹å¢¨ä»“入库
        /// </summary>
        [Description("油墨仓入库")]
        PrintingInbound = 2050,
        /// <summary>
        /// è¾…料仓入库
        /// </summary>
        [Description("辅料仓入库")]
        AccessoryInbound = 2100,
        /// <summary>
        /// æ¿æ–™ä»“入库
        /// </summary>
        [Description("板料仓入库")]
        SheetInbound = 2150,
        /// <summary>
        /// å¹²è†œä»“入库
        /// </summary>
        [Description("干膜仓入库")]
        DryfilmInbound = 2200,
        /// <summary>
        /// PP仓入库
        /// </summary>
        [Description("PP仓入库")]
        PPInbound = 2250,
        /// <summary>
        /// æˆå“ä»“入库
        /// </summary>
        [Description("成品仓入库")]
        ProductInbound = 2300,
        /// <summary>
        /// é˜»ç„Šä»“入库
        /// </summary>
        [Description("阻焊仓入库")]
        SolderInbound = 2350,
        /// <summary>
        /// æµ‹è¯•æž¶é€€åº“
        /// </summary>
        [Description("测试架退库")]
        TestBackbound=2400,
        /// <summary>
        /// å‡ºåº“
        /// </summary>
        [Description("出库")]
        Outbound = 3000,
        [Description("领料出库")]
        Outbound = 100,
        /// <summary>
        /// ç›˜ç‚¹å‡ºåº“
        /// </summary>
        [Description("盘点出库")]
        OutInventory = 3050,
        OutInventory = 110,
        /// <summary>
        /// åˆ†æ‹£å‡ºåº“
        /// </summary>
        [Description("分拣出库")]
        OutPick = 3100,
        OutPick = 120,
        /// <summary>
        /// è´¨æ£€å‡ºåº“
        /// </summary>
        [Description("质检出库")]
        OutQuality = 3150,
        OutQuality = 130,
        /// <summary>
        /// æµ‹è¯•æž¶å‡ºåº“
        /// é‡‡è´­å…¥åº“
        /// </summary>
        [Description("测试架出库")]
        TestOutbound = 4000,
        [Description("采购入库")]
        Inbound = 510,
        /// <summary>
        /// æ²¹å¢¨ä»“出库
        /// ç›˜ç‚¹å…¥åº“
        /// </summary>
        [Description("油墨仓出库")]
        PrintingOutbound = 4050,
        [Description("盘点入库")]
        InInventory = 520,
        /// <summary>
        /// è¾…料仓出库
        /// åˆ†æ‹£å…¥åº“
        /// </summary>
        [Description("辅料仓出库")]
        AccessoryOutbound = 4100,
        [Description("分拣入库")]
        InPick = 530,
        /// <summary>
        /// æ¿æ–™ä»“出库
        /// è´¨æ£€å…¥åº“
        /// </summary>
        [Description("板料仓出库")]
        SheetOutbound = 4150,
        [Description("质检入库")]
        InQuality = 540,
        /// <summary>
        /// å¹²è†œä»“出库
        /// ç”Ÿäº§é€€æ–™
        /// </summary>
        [Description("干膜仓出库")]
        DryfilmOutbound = 4200,
        [Description("生产退料")]
        ProductionReturn = 550,
        /// <summary>
        /// PP仓出库
        /// å··é“内移库
        /// </summary>
        [Description("PP仓出库")]
        PPOutbound = 4250,
        /// <summary>
        /// æˆå“ä»“出库
        /// </summary>
        [Description("成品仓出库")]
        ProductOutbound = 4300,
        /// <summary>
        /// é˜»ç„Šä»“出库
        /// </summary>
        [Description("阻焊仓出库")]
        SolderOutbound = 4350,
        [Description("巷道内移库")]
        Relocation = 900
        
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs

@@ -39,7 +39,7 @@
    {
        ITaskRepository Repository { get; }

        WebResponseContent PushTasksToWCS();
        WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, string agvDescription = "");

        /// <summary>
        /// ç”³è¯·å…¥åº“任务(PDA使用，仅托盘绑定入库站台，不分配货位)

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs

@@ -64,7 +64,7 @@
                    SourceAddress = stockInfo.LocationCode,
                    TargetAddress = "",
                    TaskStatus = (int)TaskStatusEnum.New,
                    TaskType = (int)TaskTypeEnum.TestOutbound,
                    TaskType = (int)TaskTypeEnum.Outbound,
                    TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
                    PalletType = stockInfo.PalletType,
                    WarehouseId = stockInfo.WarehouseId,
@@ -86,7 +86,7 @@
                //_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfoDetails, beforeQuantity, totalQuantity, StockChangeTypeEnum.MaterielGroup);
                _unitOfWorkManage.CommitTran();
                //将任务推送到WCS
                PushTasksToWCS();
                PushTasksToWCS(new List<Dt_Task>() { taskOut },"AGV");
                responseContent.OK();
            }
            catch (Exception ex)
@@ -127,7 +127,7 @@
                    SourceAddress = backModel.SourceAddressCode,
                    TargetAddress = "",
                    TaskStatus = (int)TaskStatusEnum.New,
                    TaskType = (int)TaskTypeEnum.TestBackbound,
                    TaskType = (int)TaskTypeEnum.Outbound,
                    TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
                    PalletType = stockInfo.PalletType,
                    WarehouseId = stockInfo.WarehouseId,
@@ -137,8 +137,7 @@
                _unitOfWorkManage.BeginTran();
                _stockRepository.StockInfoRepository.UpdateData(stockInfo);
                _unitOfWorkManage.CommitTran();
                //将任务推送到WCS
                PushTasksToWCS();
                
                responseContent.OK();
            }
            catch (Exception ex)

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -92,13 +92,15 @@
        /// ä»»åŠ¡ä¿¡æ¯æŽ¨é€è‡³WCS
        /// </summary>
        /// <returns></returns>
        public WebResponseContent PushTasksToWCS()
        public WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, string agvDescription="")
        {
            try
            {
                List<Dt_Task> tasks = BaseDal.QueryData(x => (TaskTypes.Contains(x.TaskType) && x.TaskStatus == (int)TaskStatusEnum.New));
                List<WMSTaskDTO> taskDTOs = _mapper.Map<List<WMSTaskDTO>>(tasks);

                taskDTOs.ForEach(x =>
                {
                    x.AGVArea = agvDescription;
                });
                string response = HttpHelper.Post("http://127.0.0.1:9291/api/Task/ReceiveTask", taskDTOs.Serialize());

                return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("返回错误");
@@ -160,7 +162,7 @@
                locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();

                //测试架入库库存状态
                if (task.TaskType == TaskTypeEnum.TestInbound.ObjToInt())
                if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt())
                {
                    stockInfo.StockStatus = StockStatusEmun.入库完成未建出库单.ObjToInt();
                    stockInfo.Details.ForEach(x =>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs

@@ -18,15 +18,15 @@
        {
        }

        /// <summary>
        /// å°†WMS任务推送至WCS
        /// </summary>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("PushTasksToWCS"), AllowAnonymous]
        public WebResponseContent PushTasksToWCS()
        {
            return Service.PushTasksToWCS();
        }
        ///// <summary>
        ///// å°†WMS任务推送至WCS
        ///// </summary>
        ///// <returns></returns>
        //[HttpPost, HttpGet, Route("PushTasksToWCS"), AllowAnonymous]
        //public WebResponseContent PushTasksToWCS()
        //{
        //    return Service.PushTasksToWCS();
        //}

        /// <summary>
        /// ç”³è¯·å…¥åº“任务