´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs
@@ -101,5 +101,10 @@ /// </summary> [Description("ä»»å¡å¼å¸¸")] Exception = 990, /// <summary> /// æåæºæ§è¡ä¸ /// </summary> [Description("å åæºå¾ æ§è¡")] HT_Executing = 110, } } ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs
@@ -239,7 +239,8 @@ OtherDevice otherDevice = (OtherDevice)device; otherDevice.SetValue(GroundStationDBName.W_PutFinish, true, stationManger.StationCode); Thread.Sleep(1000); otherDevice.SetValue(GroundStationDBName.W_PutFinish, false, stationManger.StationCode); return WebResponseContent.Instance.OK(); } catch (Exception ex) ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ÓÍÄ«²Ö/CommonHoisterJob.cs
@@ -93,8 +93,7 @@ task.NextAddress = locationCode; task.DeviceCode = stationManger.StackerCraneCode; task.TaskState = TaskStatusEnum.SC_Execute.ObjToInt(); _taskRepository.UpdateData(task); _taskService.UpdateTask(task, TaskStatusEnum.SC_Execute, deviceCode: task.DeviceCode, targetAddress: task.TargetAddress, currentAddress: task.CurrentAddress, nextAddress: task.NextAddress); bool isWrite = hoister.SetValue(HoisterDBName.RequestIn, false, deviceChildCode); } else @@ -107,13 +106,15 @@ Dt_Task task = _taskRepository.QueryFirst(x => x.TaskState == TaskStatusEnum.New.ObjToInt() && string.IsNullOrEmpty(x.TargetAddress) && _taskService.TaskOutboundTypes.Contains(x.TaskType)); if (task != null) { task.TaskState=TaskStatusEnum.HT_Executing.ObjToInt(); _taskService.UpdateTask(task, TaskStatusEnum.HT_Executing); bool isWrite = hoister.SetValue(HoisterDBName.RequestOut, true, deviceChildCode); WriteError(hoister.DeviceName, $"请æ±åºåº,设å¤ç¼å·:{deviceChildCode},ä»»å¡å·:{task.TaskNum}"); } } else if (!leisure && !tray && !requestIn && !inbounding && requestOut && outbounding) { Dt_Task task = _taskRepository.QueryFirst(x => x.TaskState == TaskStatusEnum.New.ObjToInt() && string.IsNullOrEmpty(x.TargetAddress) && _taskService.TaskOutboundTypes.Contains(x.TaskType)); Dt_Task task = _taskRepository.QueryFirst(x => x.TaskState == TaskStatusEnum.HT_Executing.ObjToInt() && string.IsNullOrEmpty(x.TargetAddress) && _taskService.TaskOutboundTypes.Contains(x.TaskType)); if (task != null) { Dt_StationManger? stationManger = stationMangers.FirstOrDefault(x => x.StationCode == deviceChildCode); ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/public/webconfig.js
@@ -1,4 +1,4 @@ window.webConfig = { "webApiBaseUrl": "http://127.0.0.1:9283/", "webApiBaseUrl": "http://127.0.0.1:9293/", "webApiProduction":"http://10.30.4.92:9283/" } ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/extension/system/Sys_User.js
@@ -30,6 +30,7 @@ style: { 'margin-right': '15px' }, onClick: (e) => { e.stopPropagation() console.log(row); this.$refs.gridHeader.open(row); } }, "ä¿®æ¹å¯ç " ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/extension/system/Sys_User/Sys_UserGridHeader.vue
@@ -59,11 +59,11 @@ if (this.password.length < 6) return this.$Message.error("å¯ç é¿åº¦è³å°6ä½"); let url = "/api/user/modifyUserPwd?password=" + "/api/User/ModifyUserPwd?password=" + this.password + "&userName=" + this.row.UserName; this.http.post(url, {}, true).then((x) => { this.row.userName; this.http.post(url, null, true).then((x) => { if (!x.status) { return this.$message.error(x.message); } ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/062176ae-3338-43a8-9030-bb1a16e68b97.vsidxBinary files differ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/35b9e878-61a3-436f-b549-08084babf3ff.vsidxBinary files differ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d39d9aff-c2cd-40cb-82ad-2a7895fa7047.vsidxBinary files differ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/ISys_UserService.cs
@@ -21,5 +21,6 @@ WebResponseContent GetCurrentUserInfo(); WebResponseContent ModifyPwd(string oldPwd, string newPwd); WebResponseContent ModifyUserPwd(string password, string userName); } } ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs
@@ -779,83 +779,83 @@ /// </summary> /// <param name="id"></param> /// <returns></returns> public WebResponseContent FeedbackInboundOrder(int id) { try { Dt_InboundOrder inboundOrder = Db.Queryable<Dt_InboundOrder>().Where(x => x.Id == id).Includes(x => x.Details).First(); if (inboundOrder == null) { return WebResponseContent.Instance.Error($"æªæ¾å°å ¥åºåä¿¡æ¯"); } if (inboundOrder.Details == null || inboundOrder.Details.Count == 0) { return WebResponseContent.Instance.Error($"æªæ¾å°å ¥åºåæç»ä¿¡æ¯"); } if (inboundOrder.OrderStatus == InOrderStatusEnum.å ¥åºå®æ.ObjToInt()) { return WebResponseContent.Instance.Error($"å ¥åºåæ®å·²å®æ"); } //public WebResponseContent FeedbackInboundOrder(int id) //{ // try // { // Dt_InboundOrder inboundOrder = Db.Queryable<Dt_InboundOrder>().Where(x => x.Id == id).Includes(x => x.Details).First(); // if (inboundOrder == null) // { // return WebResponseContent.Instance.Error($"æªæ¾å°å ¥åºåä¿¡æ¯"); // } // if (inboundOrder.Details == null || inboundOrder.Details.Count == 0) // { // return WebResponseContent.Instance.Error($"æªæ¾å°å ¥åºåæç»ä¿¡æ¯"); // } // if (inboundOrder.OrderStatus == InOrderStatusEnum.å ¥åºå®æ.ObjToInt()) // { // return WebResponseContent.Instance.Error($"å ¥åºåæ®å·²å®æ"); // } List<Dt_StockInfo> stockInfos = Db.Queryable<Dt_StockInfo>().Where(x => x.Details.Any(v => v.OrderNo == inboundOrder.InboundOrderNo)).Includes(x => x.Details).ToList(); List<Dt_Warehouse> warehouses = Db.Queryable<Dt_Warehouse>().ToList(); // List<Dt_StockInfo> stockInfos = Db.Queryable<Dt_StockInfo>().Where(x => x.Details.Any(v => v.OrderNo == inboundOrder.InboundOrderNo)).Includes(x => x.Details).ToList(); // List<Dt_Warehouse> warehouses = Db.Queryable<Dt_Warehouse>().ToList(); List<ERPInboundDetailModel> detailModels = new List<ERPInboundDetailModel>(); foreach (var item in inboundOrder.Details) { Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.Details.Any(v => v.InboundOrderRowNo == item.RowNo && v.MaterielCode == item.MaterielCode)); if (stockInfo == null) { return WebResponseContent.Instance.Error($"æªæ¾å°åºåä¿¡æ¯"); } // List<ERPInboundDetailModel> detailModels = new List<ERPInboundDetailModel>(); // foreach (var item in inboundOrder.Details) // { // Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.Details.Any(v => v.InboundOrderRowNo == item.RowNo && v.MaterielCode == item.MaterielCode)); // if (stockInfo == null) // { // return WebResponseContent.Instance.Error($"æªæ¾å°åºåä¿¡æ¯"); // } Dt_Warehouse? warehouse = warehouses.FirstOrDefault(x => x.WarehouseId == stockInfo.WarehouseId); if (warehouse == null) { return WebResponseContent.Instance.Error($"æªæ¾å°ä»åºä¿¡æ¯"); } // Dt_Warehouse? warehouse = warehouses.FirstOrDefault(x => x.WarehouseId == stockInfo.WarehouseId); // if (warehouse == null) // { // return WebResponseContent.Instance.Error($"æªæ¾å°ä»åºä¿¡æ¯"); // } ERPInboundDetailModel detailModel = new ERPInboundDetailModel() { ExpiryDate = stockInfo.Details.FirstOrDefault()?.EffectiveDate ?? "", LocationCode = warehouse.WarehouseCode, MaterialsCode = item.MaterielCode, MfgDate = stockInfo.Details.FirstOrDefault()?.ProductionDate ?? "", QtyCustoms = "0", Quantity = stockInfo.Details.Sum(x => x.StockQuantity).ToString(), Rack = stockInfo.LocationCode, ReceiptCode = inboundOrder.UpperOrderNo, ReceiptSerNo = item.RowNo.ToString() }; detailModels.Add(detailModel); } Dt_Warehouse? warehouse2 = warehouses.FirstOrDefault(x => x.WarehouseId == inboundOrder.WarehouseId); if (warehouse2 == null) { return WebResponseContent.Instance.Error($"æªæ¾å°ä»åºä¿¡æ¯"); } ERPInboundModel model = new ERPInboundModel() { Code = inboundOrder.InboundOrderNo, CreatorCode = inboundOrder.Creater,//æµè¯ EntDate = inboundOrder.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"), StockDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), SuppliersId = inboundOrder.SupplierId, Type = "S", UniqueTag = inboundOrder.Id.ToString(), WarehouseCode = warehouse2.WarehouseCode, Way = 1, Details = detailModels }; //æµè¯æ³¨é _invokeERPService.InvokeInboundOrderApi(model); return WebResponseContent.Instance.OK(); } catch (Exception ex) { return WebResponseContent.Instance.Error(ex.Message); } } // ERPInboundDetailModel detailModel = new ERPInboundDetailModel() // { // ExpiryDate = stockInfo.Details.FirstOrDefault()?.EffectiveDate ?? "", // LocationCode = warehouse.WarehouseCode, // MaterialsCode = item.MaterielCode, // MfgDate = stockInfo.Details.FirstOrDefault()?.ProductionDate ?? "", // QtyCustoms = "0", // Quantity = stockInfo.Details.Sum(x => x.StockQuantity).ToString(), // Rack = stockInfo.LocationCode, // ReceiptCode = inboundOrder.UpperOrderNo, // ReceiptSerNo = item.RowNo.ToString() // }; // detailModels.Add(detailModel); // } // Dt_Warehouse? warehouse2 = warehouses.FirstOrDefault(x => x.WarehouseId == inboundOrder.WarehouseId); // if (warehouse2 == null) // { // return WebResponseContent.Instance.Error($"æªæ¾å°ä»åºä¿¡æ¯"); // } // ERPInboundModel model = new ERPInboundModel() // { // Code = inboundOrder.InboundOrderNo, // CreatorCode = inboundOrder.Creater,//æµè¯ // EntDate = inboundOrder.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"), // StockDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), // SuppliersId = inboundOrder.SupplierId, // Type = "S", // UniqueTag = inboundOrder.Id.ToString(), // WarehouseCode = warehouse2.WarehouseCode, // Way = 1, // Details = detailModels // }; // //æµè¯æ³¨é // _invokeERPService.InvokeInboundOrderApi(model); // return WebResponseContent.Instance.OK(); // } // catch (Exception ex) // { // return WebResponseContent.Instance.Error(ex.Message); // } //} public int GetPalletType(Dt_Warehouse warehouse, string palletCode, Dt_MaterielInfo materielInfo) { ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs
@@ -157,7 +157,6 @@ }; Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder() { OrderNo = model.OrderNo, UpperOrderNo = model.OrderNo, OrderStatus = OutOrderStatusEnum.æªå¼å§.ObjToInt(), OrderType = OutOrderTypeEnum.Issue.ObjToInt(), @@ -240,31 +239,37 @@ //æµè¯æ¶åºç»ERP䏿¥åºåºå®æ if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString()) { stockInfos = TestOutStocksUpdate(warehouse).Data as List<Dt_StockInfo> ?? new List<Dt_StockInfo>(); List<ERPPickItemModel> eRPOutPick = new List<ERPPickItemModel>(); for (int i = 0; i < stockInfos.Count; i++) List<ERPPickModel> eRPPicks = new List<ERPPickModel>(); foreach (var item in outboundOrder.Details) { ERPPickItemModel pickItemModel = new ERPPickItemModel() if (item.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()) continue; stockInfos = TestOutStocksUpdate(warehouse, item).Data as List<Dt_StockInfo> ?? null; if (stockInfos == null) continue; List<ERPPickItemModel> eRPOutPick = new List<ERPPickItemModel>(); for (int i = 0; i < stockInfos.Count; i++) { Lotno = stockInfos[i].Details[0].BatchNo, Qty = stockInfos[i].Details[0].StockQuantity.ObjToInt().ToString(), Location = warehouse.WarehouseCode ERPPickItemModel pickItemModel = new ERPPickItemModel() { Lotno = stockInfos[i].Details[0].BatchNo, Qty = stockInfos[i].Details[0].StockQuantity.ObjToInt().ToString(), Location = warehouse.WarehouseCode }; eRPOutPick.Add(pickItemModel); } ERPPickModel pickModel = new ERPPickModel() { Rowindex = item.RowNo, Material = item.MaterielCode, Qty = (item.OrderQuantity.ObjToInt()).ToString(), Dataitem = eRPOutPick }; eRPOutPick.Add(pickItemModel); eRPPicks.Add(pickModel); } ERPPickModel pickModel = new ERPPickModel() { Rowindex = outboundOrder.Details[0].RowNo, Material = outboundOrder.Details[0].MaterielCode, Qty = (outboundOrder.Details[0].OrderQuantity.ObjToInt()).ToString(), Dataitem = eRPOutPick }; ERPIssueItemModel issueItemModel = new ERPIssueItemModel() { Pickcode = outboundOrder.UpperOrderNo, PickList = new List<ERPPickModel>() { pickModel } PickList = eRPPicks }; issueModel = new ERPIssueModel() { @@ -316,7 +321,7 @@ issueModel = new ERPIssueModel() { UniqueTag = id.ToString(), Code = outboundOrder.OrderNo,//æµè¯ Code = outboundOrder.OrderNo, WarehouseCode = warehouse.WarehouseCode, Docremark = "", Deptno = outboundOrder.DepartmentCode, @@ -350,15 +355,15 @@ /// <param name="warehouse"></param> /// <param name="model"></param> /// <returns></returns> public WebResponseContent TestOutStocksUpdate(Dt_Warehouse warehouse) public WebResponseContent TestOutStocksUpdate(Dt_Warehouse warehouse,Dt_OutboundOrderDetail outboundOrderDetails) { try { //è·ååºåºååºå List<Dt_StockInfo> stockInfos = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).ToList(); List<Dt_StockInfo> stockInfos = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).Where(x=>x.Details.Any(j=>j.MaterielCode== outboundOrderDetails.MaterielCode)).Take((int)outboundOrderDetails.OrderQuantity).ToList(); if (stockInfos.Count <= 0) { return WebResponseContent.Instance.Error($"åºåä¸è¶³"); return WebResponseContent.Instance.OK(); } //æ´æ¹ç¶æ stockInfos.ForEach(x => ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs
@@ -233,5 +233,38 @@ } return content; } public WebResponseContent ModifyUserPwd(string password,string userName) { WebResponseContent content = new WebResponseContent(); string message = ""; password = password?.Trim(); try { if (string.IsNullOrEmpty(password)) return WebResponseContent.Instance.Error("å¯ç ä¸è½ä¸ºç©º"); //è·åç¨æ· Sys_User user = BaseDal.QueryFirst(x=>x.UserName==userName); if (user == null) return WebResponseContent.Instance.Error("ç¨æ·ä¸åå¨"); user.UserPwd = password.EncryptDES(AppSecret.User); BaseDal.UpdateData(user); if (App.User.UserId== user.UserId) { string token = JwtHelper.IssueJwt(new TokenModelJwt() { UserId = user.UserId, RoleId = user.RoleId, UserName = user.UserName, TenantId = user.TenantId, }); _cacheService.AddOrUpdate(user.UserId.ToString(), token); } return content.OK("æ´æ¹æå"); } catch (Exception ex) { message = ex.Message; content.Error("æå¡å¨äºç¹é®é¢,请ç¨ååè¯"); } return content; } } } ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs
@@ -53,7 +53,7 @@ { return WebResponseContent.Instance.Error($"æªæ¾å°ç»çä¿¡æ¯"); } if (stockInfo.StockStatus != StockStatusEmun.ç»çæå.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.æå¨ç»çæå.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.åºåºå®æ.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.æ£é宿.ObjToInt()) if (stockInfo.StockStatus != StockStatusEmun.ç»çæå.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.æå¨ç»çæå.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.æ£é宿.ObjToInt()) { return WebResponseContent.Instance.Error($"该æçç¶æä¸æ£ç¡®,ä¸å¯ç³è¯·å ¥åº"); } ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs
@@ -123,6 +123,17 @@ } } /// <summary> /// æ´æ°å¯ç /// </summary> /// <param name="password">å¯ç </param> /// <param name="userName">ç¨æ·å</param> /// <returns></returns> [HttpPost,Route("ModifyUserPwd")] public WebResponseContent ModifyUserPwd(string password, string userName) { return Service.ModifyUserPwd(password,userName); } } public class SwaggerLoginRequest