From 4b50d62ea690e5c323c6d331a675617a320a7345 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 12 二月 2025 17:28:02 +0800
Subject: [PATCH] 前端更新
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
index ad48b3d..359c855 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
@@ -1,7 +1,9 @@
锘縰sing Masuit.Tools;
+using SqlSugar;
using WIDESEA_Core.Const;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
+using WIDESEAWCS_Model.Models;
namespace WIDESEA_StorageTaskServices;
@@ -54,21 +56,38 @@
//content = JsonConvert.DeserializeObject<WebResponseContent>(abc);
//var num = content.Data.ObjToInt();
+ //濡傛灉褰撳墠搴撳唴瀛樺湪姣斿綋鍓嶆椂闂寸殑瀵瑰簲浜х嚎鐨勬枡 鍒欏叆搴撹嚦甯告俯3
+ DtStockInfo stockInfo = _stockInfoRepository.QueryFirst(x => x.AreaCode == "CWSC3" && x.IsFull == true && x.ProductionLine == input.ProductionLine && x.OutboundTime < DateTime.Now);
+ if (stockInfo != null)
+ {
+ var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
+ var strings = config.ConfigValue.Split(',').ToList();
+ // 鍏ュ簱閫佽嚦甯告俯3
+ var resultContent = await CreateNewTask(input, input.ProductionLine, boxing.ProcessCode,strings);
+ if (resultContent.Status)
+ {
+ await _boxingInfoRepository.AddDataNavAsync(boxing);
+ }
+ return resultContent;
+ }
// TODO 鍒ゆ柇鍦ㄩ�旀暟閲�
- var count = BaseDal.QueryData(x => x.TargetAddress == stationManagers[0].Roadway).Count;
- if (count <= 10)
+
+ var needBarcode = await SqlSugarHelper.DbWCS.Queryable<dt_needBarcode>().FirstAsync(x => x.productLine == input.ProductionLine);
+ var needCount = needBarcode.inLineNum;
+ //var count = BaseDal.QueryData(x => x.TargetAddress == stationManagers[0].Roadway).Count;
+ if (needCount < 2)
{
// 閫佽嚦鍖呰
List<string> strings = stationManagers.Where(x => x.stationType == 0).Select(x => x.Roadway).ToList();
- return await CreateNewTask(input, strings, 3);
+ return await CreateNewTask(input, input.ProductionLine, boxing.ProcessCode, strings, 3);
}
else
{
var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
var strings = config.ConfigValue.Split(',').ToList();
// 鍏ュ簱閫佽嚦甯告俯3
- var resultContent = await CreateNewTask(input, strings);
+ var resultContent = await CreateNewTask(input, input.ProductionLine, boxing.ProcessCode, strings);
if (resultContent.Status)
{
await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -124,7 +143,7 @@
}
List<string> strings = stationManagers.Roadway.Split(',').ToList();
- var resultContent = await CreateNewTask(input, strings);
+ var resultContent = await CreateNewTask(input, result.ProductionLine,boxing.ProcessCode, strings);
if (resultContent.Status)
{
var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -186,7 +205,7 @@
// NGStation = stationManagers.stationNGChildCode.Split(',').ToList();
//}
List<string> NGStation = stationManagers.stationNGChildCode.Split(',').ToList();
- content = await CreateNewTask(input, NGStation, 2);
+ content = await CreateNewTask(input, input.ProductionLine,"", NGStation, 2);
return content.Error("瀛樺湪寮傚父鐢佃姱");
}
@@ -216,7 +235,8 @@
TargetAddress = task.Roadway,
TaskState = task.TaskState.Value,
Id = 0,
- TaskType = task.TaskType
+ TaskType = task.TaskType,
+ ProductionLine = task.ProductionLine,
};
return new WebResponseContent().OK(data: taskDTO);
}
--
Gitblit v1.9.3