From 023358a9d414eb7215464948bffb5979ebb97386 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期一, 21 七月 2025 17:27:54 +0800
Subject: [PATCH] 123
---
ams/Hanhe.iWCS.JingmenGLMNorthProtocol/PLCControl.cs | 2 +-
ams/Hanhe.iWCS.JingmenGLMNorthTCP/WCSServer.cs | 4 ++++
ams/Hanhe.iWCS.JingmenGLMNorthProtocol/ERPService.cs | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGLMNorthProtocol/ERPService.cs b/ams/Hanhe.iWCS.JingmenGLMNorthProtocol/ERPService.cs
index 6ff6f1b..a3f8ffb 100644
--- a/ams/Hanhe.iWCS.JingmenGLMNorthProtocol/ERPService.cs
+++ b/ams/Hanhe.iWCS.JingmenGLMNorthProtocol/ERPService.cs
@@ -36,7 +36,7 @@
static WebApiHelper api = new WebApiHelper();
- public const string ERPSwitch01 = "0";// ERP鍙樻洿娴佺▼寮�叧
+ public const string ERPSwitch01 = "1";// ERP鍙樻洿娴佺▼寮�叧
public static List<string> SendERPTaskType = Settings.SendERPTaskType.Split(',').ToList();//鍥炴姤浠诲姟绫诲瀷
public static List<string> LoginInfo = Settings.LoginInfo.Split(',').ToList();// ERP鐧诲綍鎺ュ彛浼犺緭淇℃伅
private static WebApiHelper helper = new WebApiHelper();
diff --git a/ams/Hanhe.iWCS.JingmenGLMNorthProtocol/PLCControl.cs b/ams/Hanhe.iWCS.JingmenGLMNorthProtocol/PLCControl.cs
index 62c61ff..d86e8d8 100644
--- a/ams/Hanhe.iWCS.JingmenGLMNorthProtocol/PLCControl.cs
+++ b/ams/Hanhe.iWCS.JingmenGLMNorthProtocol/PLCControl.cs
@@ -3445,7 +3445,7 @@
public static int[] DiePanTwo(WMSInfo machine, MachineInfoTwo machineInfoTwo)
{
var ErpItemInfo = MongoDBSingleton.Instance.FindOne<ERPItemTable>(Query.EQ("item_code", machineInfoTwo.materialCode), "ERPItemTable");
- CMMLog.Info($"缂撳瓨鏋跺叆鍙犳墭:鏀跺埌淇″彿5锛屾煡璇achineInfoTwo琛ㄤ俊鎭細{JsonConvert.SerializeObject(ErpItemInfo)}銆�);
+ CMMLog.Info($"缂撳瓨鏋跺叆鍙犳墭:鏀跺埌淇″彿5锛屾煡璇RPItemTable琛ㄤ俊鎭細{JsonConvert.SerializeObject(ErpItemInfo)}銆�);
//鍋忕Щ閲�+11 閫氶亾鑼冨洿锛�40311 ~ 40390
CMMLog.Info($"鍙犵洏鏈烘暟鎹鐞�");
diff --git a/ams/Hanhe.iWCS.JingmenGLMNorthTCP/WCSServer.cs b/ams/Hanhe.iWCS.JingmenGLMNorthTCP/WCSServer.cs
index 222efdd..957a971 100644
--- a/ams/Hanhe.iWCS.JingmenGLMNorthTCP/WCSServer.cs
+++ b/ams/Hanhe.iWCS.JingmenGLMNorthTCP/WCSServer.cs
@@ -89,6 +89,10 @@
IEnentListen changeSignal = DataAccess.CreateEnentListen();
changeSignal.EnentSubscribe(new TN_I_TASK_DTL_ACTION() { CN_N_ACTION_CODE = 10010 });
+ //10011 - ERP鍙樻洿鍔熻兘
+ IEnentListen SendERPTaskCompleteFunc = DataAccess.CreateEnentListen();
+ SendERPTaskCompleteFunc.EnentSubscribe(new TN_I_TASK_DTL_ACTION() { CN_N_ACTION_CODE = 10011 });
+
//10012 - ERP鍙樻洿鍔熻兘 灏嗙墿鏂欒〃鏁版嵁鎻掑叆涓棿琛�鍖楀尯
IEnentListen insertMidTable = DataAccess.CreateEnentListen();
insertMidTable.EnentSubscribe(new TN_I_TASK_DTL_ACTION() { CN_N_ACTION_CODE = 10012 });
--
Gitblit v1.9.1