From 9fbd3f28a6f86dce27cfa305fd631d5eabae5aa4 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期三, 12 十一月 2025 14:10:16 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/WarehouseController.cs | 6 +++---
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue | 2 +-
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_DTO/Basic/SupplierDTO.cs | 13 ++++++++++---
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
index e995b74..252d54b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
@@ -354,7 +354,7 @@
render(null, mountNode);
document.body.removeChild(mountNode);
}
- },
+ },
style: {
padding: '20px 0',
borderRadius: '8px'
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_DTO/Basic/SupplierDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_DTO/Basic/SupplierDTO.cs"
index 721e3fe..17c6c4d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_DTO/Basic/SupplierDTO.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_DTO/Basic/SupplierDTO.cs"
@@ -75,13 +75,20 @@
/// <summary>
/// 鎿嶄綔绫诲瀷
/// </summary>
- [PropertyValidate("鎿嶄綔绫诲瀷", NotNullAndEmpty = true,Check = new object[] { 0, 1, 2 })]
+ [PropertyValidate("鎿嶄綔绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 0, 1, 2 })]
public string OperateType { get; set; }
}
+ public class WarehouseRequest
+ {
+ public List<WarehouseAreaDto> warehouses { get; set; }
- public class WarehouseAreaDto
- {
+ public List<string> delWarehouseCodes { get; set; }
+
+ }
+
+ public class WarehouseAreaDto
+ {
public string Code { get; set; }
public string Name { get; set; }
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/WarehouseController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/WarehouseController.cs"
index 9bad1ca..d604ca4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/WarehouseController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/WarehouseController.cs"
@@ -33,16 +33,16 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost, Route("ReceiveWarehouse"), AllowAnonymous, MethodParamsValidate]
- public async Task<WebResponseContent> ReceiveWarehouse([FromBody] List<WarehouseAreaDto> model)
+ public async Task<WebResponseContent> ReceiveWarehouse([FromBody] WarehouseRequest model)
{
- if (model == null || !model.Any())
+ if (model == null || !model.warehouses.Any())
{
return WebResponseContent.Instance.Error("浠撳簱鏁版嵁涓嶈兘涓虹┖");
}
_logger.LogInformation("WarehouseController ReceiveWarehouse: " + JsonConvert.SerializeObject(model));
- var content = await Service.ReceiveWarehouseArea(model);
+ var content = await Service.ReceiveWarehouseArea(model.warehouses);
if (content.Status) return WebResponseContent.Instance.OK(200);
else return WebResponseContent.Instance.Error(content.Message);
--
Gitblit v1.9.3