From e46aa927d231af83724683c7286d9db503e24cf7 Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期二, 10 六月 2025 11:46:20 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BasicInfo/ContainerController.cs | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BasicInfo/ContainerController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BasicInfo/ContainerController.cs"
index b238470..67bcf61 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BasicInfo/ContainerController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BasicInfo/ContainerController.cs"
@@ -68,22 +68,25 @@
{
object obj = new
{
- orderCode = orderrows.Orderrows_orderid,
- cusName = orderrows.Orderrows_customer,
- orderName = orderrows.Orderrows_name,
- batch = orderrows.Orderrows_batchid,
- productName = ""
+ name = item.Orderdetails_name,
+ baseName = item.Orderdetails_productName,
+ size = $"{item.Orderdetails_length}*{item.Orderdetails_width}*{item.Orderdetails_thickness}",
+ process = "",
};
orderData.Add(obj);
}
object data = new
{
+ orderCode = orderrows.Orderrows_orderid,
+ orderName = orderrows.Orderrows_name,
+ cusName = orderrows.Orderrows_customer,
stationCode = container.ContainerCode,
orderTotalNum = totalDetails.Count,
sortedNum = sortedNum,
unsortedNum = totalDetails.Count - sortedNum,
stationSortedNum = details.Count,
- orderData = orderData
+ orderData = orderData,
+ orderId = orderrows.id
};
list.Add(data);
}
@@ -131,7 +134,7 @@
[HttpPost, HttpGet, Route("ReleaseContainer"), AllowAnonymous]
public WebResponseContent ReleaseContainer([FromBody] int[] keys)
{
- return Service.ReleaseContainer(keys);
+ return Service.AutoReleaseContainer(keys);
}
}
}
--
Gitblit v1.9.3