From e69f814f50fd59739dbedd88518dc8cb8d2ed3ee Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期二, 08 四月 2025 21:18:47 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/OrderDetailsService.cs | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/OrderDetailsService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/OrderDetailsService.cs"
index dbc29db..0fb3598 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/OrderDetailsService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/OrderDetailsService.cs"
@@ -40,8 +40,6 @@
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO.BasicInfo;
-using WIDESEAWCS_DTO.Enum;
-using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_IBasicInfoRepository;
using WIDESEAWCS_IBasicInfoService;
using WIDESEAWCS_Model.Models;
@@ -58,11 +56,18 @@
private static bool toggle = false;
private static int lastStaion = 0;
- public int GetOrderDetails(string barcode, List<int> useableStations)
+ public int GetOrderDetails(string barcode, List<int> useableStations, out ProductInfoDTO productInfo)
{
OrderDetails? orderDetails = BaseDal.QueryData(x => x.Orderdetails_outid == barcode).FirstOrDefault();
if (orderDetails != null)
{
+ productInfo = new ProductInfoDTO()
+ {
+ Code = barcode,
+ Height = Convert.ToInt32(orderDetails.Orderdetails_thickness),
+ Length = Convert.ToInt32(orderDetails.Orderdetails_length),
+ Width = Convert.ToInt32(orderDetails.Orderdetails_width),
+ };
useableStations = useableStations.OrderByDescending(x => x).ToList();
if (orderDetails.Orderdetails_width <= 800 && orderDetails.Orderdetails_width >= 50)//1,2,3
{
@@ -74,7 +79,7 @@
else
{
int index = useableStations.IndexOf(lastStaion);
- if(index + 1 < useableStations.Count)
+ if (index + 1 < useableStations.Count)
{
lastStaion = useableStations[index + 1];
return lastStaion;
@@ -121,6 +126,7 @@
}
else
{
+ productInfo = new ProductInfoDTO();
return -1;
}
}
--
Gitblit v1.9.3