´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/ApiInfoService.cs
@@ -10,6 +10,7 @@ using WIDESEAWCS_Core.Helper; using WIDESEAWCS_DTO; using WIDESEAWCS_DTO.RGV.FOURBOT; using WIDESEAWCS_DTO.WMS; using WIDESEAWCS_IBasicInfoService; using WIDESEAWCS_Model.Models; @@ -55,15 +56,24 @@ } else if (apiInfo.Remark.Contains("å¯ä¹å£«")) { GALAXISReturn gALAXISReturn = response.DeserializeObject<GALAXISReturn>(); if (gALAXISReturn == null) throw new Exception($"{apiInfo.Remark}ååºå 容转æ¢å®ä½å¤±è´¥"); if (gALAXISReturn.data.returnStatus != 0) throw new Exception(gALAXISReturn.data.returnInfo); content.Data = gALAXISReturn; } else if (apiInfo.Remark.Contains("海康")) { HIKROBOTReturn hIKROBOTReturn = response.DeserializeObject<HIKROBOTReturn>(); if (hIKROBOTReturn == null) throw new Exception($"{apiInfo.Remark}ååºå 容转æ¢å®ä½å¤±è´¥"); if (hIKROBOTReturn.code != "SUCCESS") throw new Exception(hIKROBOTReturn.message); content.Data = hIKROBOTReturn; } else if (apiInfo.Remark.Contains("WMS")) { WMSReturn wMSReturn = response.DeserializeObject<WMSReturn>(); if (wMSReturn == null) throw new Exception($"{apiInfo.Remark}ååºå 容转æ¢å®ä½å¤±è´¥"); if (wMSReturn.code != 200) throw new Exception(wMSReturn.message); content.Data = wMSReturn; } content.OK(); } ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/UpLocationStatusDTO.cs
@@ -6,24 +6,18 @@ namespace WIDESEAWCS_DTO.WMS { public class UpLocationStatusDTO public class UpStationTypeDTO { /// <summary> /// ä»åºid /// ç«å°ç±»å /// 1å ¥åºç«å°ï¼2åºåºç«å°ï¼3åºå ¥åºç«å° /// </summary> public int WarehouseId { get; set; } public int stationType { get; set; } /// <summary> /// ç¦ç¨ç¶æï¼0 å¯ç¨ï¼3 ç¦ç¨ï¼ /// ç«å°ç¼å· /// </summary> public int EnableStatus { get; set; } /// <summary> /// è´§ä½ç¼å·å表 /// </summary> public string[] LocationNubList { get; set; } public string stationCode { get; set; } } } ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/WMS/UpStationTypeDTO.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,29 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace WIDESEAWCS_DTO.WMS { public class UpLocationStatusDTO { /// <summary> /// ä»åºid /// </summary> public int WarehouseId { get; set; } /// <summary> /// ç¦ç¨ç¶æï¼0 å¯ç¨ï¼3 ç¦ç¨ï¼ /// </summary> public int EnableStatus { get; set; } /// <summary> /// è´§ä½ç¼å·å表 /// </summary> public string[] LocationNubList { get; set; } } } ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs
@@ -338,9 +338,6 @@ WebResponseContent PLCAlarmtoWMS(string ErrorMsg); WebResponseContent UpStationType(UpStationTypeDTO stationTypeDTO); } } ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs
@@ -47,6 +47,18 @@ } /// <summary> /// ä¿®æ¹åºå ¥å£ç«å°ç±»å /// </summary> /// <param name="taskDTOs"></param> /// <returns></returns> [HttpPost, Route("UpStationType"), AllowAnonymous] public WMSReturn UpStationType([FromBody] UpStationTypeDTO stationTypeDTO) { WebResponseContent content = _taskService.UpStationType(stationTypeDTO); return WMSReturnMethod.ReturnWMS(content); } /// <summary> /// å¹³åºè´§ä½ä¸ä¸æ¶å®¹å¨ /// </summary> /// <param name="taskDTOs"></param> ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
@@ -42,6 +42,7 @@ "WMS": { "ReceiveTask": "WMSä¸åä»»å¡", "ContainerRequest": "容卿µå¨è¯·æ±", "UpStationType": "ä¿®æ¹åºå ¥å£ç«å°ç±»å", "UpOrDownContainer": "å¹³åºè´§ä½ä¸ä¸æ¶å®¹å¨", "CancelWMSTask": "WMSåæ¶ä»»å¡", "IQCResult": "夿£ç»æåé¦", ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -1427,6 +1427,20 @@ _trackloginfoService.AddTrackLog(wMSContainerFlow, content, "容卿µå¨è¯·æ±", "", ""); } } public WebResponseContent UpStationType(UpStationTypeDTO stationTypeDTO) { try { Dt_StationManger stationManger = _stationMangerService.Repository.QueryFirst(x => x.StationCode == stationTypeDTO.stationCode) ?? throw new Exception($"æªæ¾å°ç«å°ç¼å·ã{stationTypeDTO.stationCode}ãä¿¡æ¯"); stationManger.StationType = stationTypeDTO.stationType; _stationMangerService.Repository.UpdateData(stationManger); return WebResponseContent.Instance.OK(); } catch (Exception ex) { return WebResponseContent.Instance.Error(ex.Message); } } /// <summary> /// è´¨æ£ç»æåé¦ /// </summary> @@ -1889,7 +1903,7 @@ WMSReturn wMSReturn = response.DeserializeObject<WMSReturn>(); if (wMSReturn == null) throw new Exception("WMSè¿åç»æè½¬æ¢å¤±è´¥ï¼"); if (!wMSReturn.success) throw new Exception(wMSReturn.message); return content.OK(); return content.OK(); } catch (Exception ex) { ÏîÄ¿×ÊÁÏ/ÓëÉÏÓÎϵͳ½Ó¿ÚÇåµ¥/WMS½Ó¿Ú¶Ô½ÓÎĵµ_V1.1.4.docxBinary files differ
ÏîÄ¿×ÊÁÏ/ÓëÉÏÓÎϵͳ½Ó¿ÚÇåµ¥/WMS½Ó¿Ú¶Ô½ÓÎĵµ_V20260421.docxBinary files differ
ÏîÄ¿×ÊÁÏ/ÓëÉÏÓÎϵͳ½Ó¿ÚÇåµ¥/WMS½Ó¿Ú¶Ô½ÓÎĵµ_V2026324.docxBinary files differ
ÏîÄ¿×ÊÁÏ/ÓëÉÏÓÎϵͳ½Ó¿ÚÇåµ¥/WMS½Ó¿Ú¶Ô½ÓÎĵµ_V260318.docxBinary files differ
ÏîÄ¿×ÊÁÏ/ÓëÉÏÓÎϵͳ½Ó¿ÚÇåµ¥/wms½Ó¿ÚÎĵµ3-10(1).xlsxBinary files differ
ÏîÄ¿×ÊÁÏ/ÓëÉÏÓÎϵͳ½Ó¿ÚÇåµ¥/½Ó¿ÚµØÖ·.xlsxBinary files differ