From 18d1f45193e34e00fc1b6f65b8596ddb29c5267d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 24 十二月 2024 15:32:43 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
index 68946b4..97aa6e5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
@@ -4,6 +4,7 @@
using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic;
using WIDESEA_Common.CommonEnum;
+using WIDESEA_Common.LocationEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_Core.Enums;
@@ -24,16 +25,63 @@
_repository = repository;
}
+ /// <summary>
+ /// 鍒濆鍖栬揣浣�
+ /// </summary>
+ /// <param name="initializationLocationDTO"></param>
+ /// <returns></returns>
[HttpPost, Route("InitializationLocation"), AllowAnonymous]
public WebResponseContent InitializationLocation([FromBody] InitializationLocationDTO initializationLocationDTO)
{
return Service.InitializationLocation(initializationLocationDTO);
}
+ /// <summary>
+ /// 璐т綅鍒嗛厤
+ /// </summary>
+ /// <param name="roadwayNo"></param>
+ /// <param name="palletType"></param>
+ /// <returns></returns>
[HttpPost, HttpGet, Route("AssignLocation"), AllowAnonymous]
- public Dt_LocationInfo? AssignLocation(string roadwayNo, PalletTypeEnum palletType)
+ public Dt_LocationInfo? AssignLocation(string roadwayNo, PalletTypeEnum palletType, int warehouseId)
{
- return Service.AssignLocation(roadwayNo, palletType);
+ return Service.AssignLocation(roadwayNo, palletType, warehouseId);
+ }
+
+ /// <summary>
+ /// 鍚敤璐т綅
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ [HttpPost, Route("LocationEnableStatus")]
+ public WebResponseContent LocationEnableStatus([FromBody] int[] keys)
+ {
+ return Service.LocationEnableStatus(keys); ;
+ }
+
+ /// <summary>
+ /// 绂佺敤璐т綅
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ [HttpPost, Route("LocationDisableStatus")]
+ public WebResponseContent LocationDisableStatus([FromBody] int[] keys)
+ {
+ return Service.LocationDisableStatus(keys); ;
+ }
+
+ [HttpPost, Route("UpdateLocationStatus"), AllowAnonymous]
+ public WebResponseContent UpdateLocationStatus(string locationCode, PalletTypeEnum palletType, LocationStatusEnum locationStatus, int warehousId)
+ {
+ try
+ {
+ Service.UpdateLocationStatus(locationCode, palletType, locationStatus, warehousId);
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception e)
+ {
+ return WebResponseContent.Instance.Error(e.Message);
+ }
}
}
}
--
Gitblit v1.9.3