From 388c43ee7b741eebafa98cd8ef992005f1aa56f4 Mon Sep 17 00:00:00 2001
From: 陈勇 <chenyong@hnkhzn.com>
Date: 星期二, 12 三月 2024 14:52:40 +0800
Subject: [PATCH] PDA源程序
---
代码管理/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask_Mes.cs | 61 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 14 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask_Mes.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask_Mes.cs"
index 1d8a2e8..35b8dcb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask_Mes.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask_Mes.cs"
@@ -3,6 +3,7 @@
using WIDESEA_Comm.MES_Info;
using WIDESEA_Comm.MES_Info.Request;
using WIDESEA_Common;
+using WIDESEA_Core.FreeDB;
using WIDESEA_Entity.DomainModels;
using WIDESEA_Entity.ToAGV;
using static WIDESEA_Comm.MES_Info.BasicSN;
@@ -11,7 +12,13 @@
{
public class HandleTask_Mes
{
- public void UploadMESInfo(dt_agvtask task)
+ static FreeDB FreeDB = new FreeDB();
+ /// <summary>
+ /// 鍚慚ES鍙嶉鍑哄叆搴撲俊鎭�
+ /// </summary>
+ /// <param name="task"></param>
+ /// <exception cref="Exception"></exception>
+ public static void UploadMESInfo(dt_agvtask task)
{
try
{
@@ -31,13 +38,24 @@
if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString() || task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceOutbound.ToString())
{
- agvOutWarehousePara outWarehousePara = new agvOutWarehousePara()
+ //agvOutWarehousePara outWarehousePara = new agvOutWarehousePara()
+ //{
+ // JobID = task.jobID,
+ // processCode=task.agv_worktype.ToString(),
+ // details = list
+ //};
+ agvInWarehousePara outWarehousePara = new agvInWarehousePara()
{
+ details = list,
JobID = task.jobID,
- details = list
+ processCode = task.agv_worktype.ToString(),
+ layerNo = 1,
+ stackID = "1",
+ warehouseName = "Agv搴�",
+ zoneID = task.agv_fromaddress,
};
obj = outWarehousePara;
- ActionName = "agvOutWarehouse";
+ ActionName = "agvOutWarehouse";//AGV->MES杞﹁疆鍑哄簱
}
else if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString() || task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceInbound.ToString())
{
@@ -45,35 +63,50 @@
{
details = list,
JobID = task.jobID,
+ processCode = task.agv_worktype.ToString(),
layerNo = 1,
- stackID = task.agv_barcode,
+ stackID = "1",
warehouseName = "Agv搴�",
zoneID = task.agv_toaddress,
};
obj = inWarehousePara;
- ActionName = "agvInWarehouse";
+ ActionName = "agvInWarehouse";//AGV->MES杞﹁疆鍏ュ簱
}
- else if (task.agv_tasktype == "Transfer") //绉诲簱鍖哄垎 搴撳唴绉诲簱/澶栧崗绉诲簱
+ //else if (task.agv_tasktype == "Transfer") //绉诲簱鍖哄垎 搴撳唴绉诲簱
+ else if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_Carry.ToString()) //绉诲簱鍖哄垎 搴撳唴绉诲簱
{
agvMoveWarehousePara moveWarehousePara = new agvMoveWarehousePara()
{
details = list,
fromLayerNo = "1",
- fromStackID = "",
+ fromStackID = "1",
fromWarehouseName = "Agv搴�",
fromZoneID = task.agv_fromaddress,
toLayerNo = "1",
- toStackID = "",
+ toStackID = "1",
toWarehouseName = "Agv搴�",
toZoneID = task.agv_toaddress,
};
obj = moveWarehousePara;
- ActionName = "agvMoveWarehouse";
+ ActionName = "agvMoveWarehouse";//AGV->MES杞﹁疆绉诲簱
}
- //else if (task.agv_tasktype == "Transfer")
- //{
-
- //}
+ else if (task.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString())// 澶栧崗绉诲簱
+ {
+ var mes_head = FreeDB.Select<dt_mes_head>().Where(x => x.jobID == task.jobID).First();
+ agvTransferListPara agvTransferListPara = new agvTransferListPara()
+ {
+ details = list,
+ transferListID = task.agv_tasknum,
+ materialCode = mes_head.materialCode,
+ drawingNoVer = mes_head.drawingNoVer,
+ fromWarehouse = "AGV搴�",
+ toWarehouse = "姣涜疆搴�",
+ Operator = task.agv_userid,
+ updateTime = task.agv_createtime.ToString(),
+ };
+ obj = agvTransferListPara;
+ ActionName = "agvTransferList";
+ }
var postJson = JsonConvert.SerializeObject(obj);
string mesData = Request.RequestData(postJson, MESAPIAddress.IPAddress_MES + ActionName);
--
Gitblit v1.9.3