From 696edbff3c8812e4b820f624d66a02ae6ddb1a06 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 16 四月 2026 13:40:18 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
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/Inbound/InboundOrderController.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/Inbound/InboundOrderController.cs"
index 67a1cdf..0ca67c8 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/Inbound/InboundOrderController.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/Inbound/InboundOrderController.cs"
@@ -5,6 +5,7 @@
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using SqlSugar;
+using SqlSugar.Extensions;
using System.Net;
using System.Threading.Tasks;
using WIDESEA_BasicService;
@@ -167,7 +168,9 @@
OutBoxbarcodes = barcode.outBoxbarcodes,
BarcodeUnit = barcode.unit,
BarcodeQty = barcode.qty,
- OrderQuantity = barcode.qty
+ OrderQuantity = barcode.qty,
+ Remark = detailitem.remark??"",
+
};
dt_InboundOrder.Details.Add(inboundOrderDetail);
@@ -187,7 +190,8 @@
OrderQuantity = detailitem.qty,
BarcodeUnit = detailitem.unit,
BarcodeQty = detailitem.qty,
- MaterielName = materialName
+ MaterielName = materialName,
+ Remark = detailitem.remark??""
};
dt_InboundOrder.Details.Add(inboundOrderDetail);
}
@@ -197,7 +201,8 @@
dt_InboundOrder.BusinessType = item.business_type;
dt_InboundOrder.IsBatch = item.isBatch;
dt_InboundOrder.FactoryArea = item.factoryArea;
-
+ dt_InboundOrder.CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt();
+ dt_InboundOrder.IsTestMaterials = item.isTestMaterials;
inboundOrders.Add(dt_InboundOrder);
}
@@ -228,9 +233,9 @@
}
[HttpPost, Route("UndoPalletGroup"), AllowAnonymous, MethodParamsValidate]
- public WebResponseContent UndoPalletGroup(string palletCode,string barcode="")
+ public WebResponseContent UndoPalletGroup(string code)
{
- return Service.UndoPalletGroup(palletCode,barcode);
+ return Service.UndoPalletGroup(code);
}
/// <summary>
///
@@ -258,5 +263,17 @@
return await _invokeMESService.BatchOrderFeedbackToMes(request.orderNos, request.inout);
}
+
+ [HttpPost, Route("HandCloseOrder"), AllowAnonymous, MethodParamsValidate]
+ public WebResponseContent HandCloseOrder(List<string> orderIds)
+ {
+ return Service.HandCloseOrder(orderIds);
+ }
+
+ [HttpPost, Route("GetLocationType"), AllowAnonymous, MethodParamsValidate]
+ public WebResponseContent GetLocationType(string code)
+ {
+ return Service.GetLocationType(code);
+ }
}
}
--
Gitblit v1.9.3