From 19c66ba052a7fb26c4d27deaa75ae46479eee342 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 01 四月 2024 10:36:44 +0800
Subject: [PATCH] 优化堆垛逻辑和入库逻辑
---
代码管理/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs"
index b7932b0..cf72c64 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs"
@@ -11,6 +11,7 @@
using WIDESEA_Entity.DomainModels;
using WIDESEA_WMS.IRepositories;
using WIDESEA_WMS.Repositories;
+using static FreeSql.Internal.GlobalFilter;
namespace WIDESEA_WMS.Common
{
@@ -66,10 +67,6 @@
/// <param name="task"></param>
public static void Updateinventory(dt_agvtask task)
{
- //string[] bindSNs = task.bindSN.Split(",");
- //int count = 0;
- //if (bindSNs.Length > 0)
- //{
if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString() || task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString())
{
string[] bindSNs = task.bindSN.Split(",");
@@ -83,7 +80,6 @@
if (count < 1)
throw new Exception("搴撳瓨娓呴櫎澶辫触锛丼N鍙�:" + bindSN);
}
-
}
else if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString())
{
@@ -92,26 +88,24 @@
List<dt_inventory> inventorys = new List<dt_inventory>();
foreach (string bindSN in bindSNs)
{
- var mes_detail = freeDB.Select<dt_mes_detail>().Where(x => x.SN == bindSN).First();
- if (mes_detail == null)
- throw new Exception("鏈壘鍒板伐鍗曚俊鎭紒");
- var mes_head = freeDB.Select<dt_mes_head>().Where(x => x.jobID == mes_detail.jobID).First();
- if (mes_head == null)
+ var mes_Work = freeDB.Select<VV_Mes_Workinfo>().Where(x => x.SN == bindSN && x.processCode == "17").First();
+ if (mes_Work == null)
throw new Exception("鏈壘鍒板伐鍗曚俊鎭紒");
var station = freeDB.Select<dt_stationinfo>().Where(x => x.stationCode == task.agv_toaddress).First();
dt_inventory inventory = new dt_inventory()
{
SN = bindSN,
- Name = mes_head.productName,
- FigureNumber = mes_head.drawingNo,
+ Name = mes_Work.productName,
+ FigureNumber = mes_Work.drawingNo,
materialCode = task.agv_materbarcode,
- HeatNumber = mes_detail.heatID,
- BilletNumber = mes_detail.billetID,
+ HeatNumber = mes_Work.heatID,
+ drawingNoVer = mes_Work.drawingNoVer,
+ BilletNumber = mes_Work.billetID,
OnlineTime = task.agv_finishedtime,
Operator = "admin",
stationCode = task.agv_toaddress,
area = station.area,
- jobID = mes_detail.jobID,
+ jobID = mes_Work.workOrder,
ID = Guid.NewGuid()
};
inventorys.Add(inventory);
@@ -210,8 +204,8 @@
station1.stationType = string.Empty;
station1.tray_status = string.Empty;
station1.remark = string.Empty;
- if (!station1.stationCode.Contains("X") && !station1.stationCode.Contains("S") && !station1.stationCode.Contains("W01001004") && !station1.stationCode.Contains("W01001005"))
- station1.tray_type = string.Empty;
+ //if (!station1.stationCode.Contains("X") && !station1.stationCode.Contains("S") && !station1.stationCode.Contains("W01001004") && !station1.stationCode.Contains("W01001005"))
+ // station1.tray_type = string.Empty;
}
stationinfoRepository.Update(station1, true);
}
--
Gitblit v1.9.3