From e0471620ed16295a330ce18bcfe1654c91138996 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期五, 18 七月 2025 17:24:42 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs | 181 +++++++++++++++++++++++++++++++--------------
1 files changed, 125 insertions(+), 56 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
index 0613efb..dbecd46 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
@@ -1,4 +1,5 @@
锘縰sing Hanhe.iWCS.Common;
+using Hanhe.iWCS.DeviceDriver;
using Hanhe.iWCS.MData;
using Hanhe.iWCS.Model;
using MongoDB.Bson;
@@ -14,10 +15,13 @@
using System.Net.NetworkInformation;
using System.Net.Sockets;
using System.Security.Cryptography;
+using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
using static Hanhe.iWCS.JingmenGEMTwoProtocol.ApiHelper;
using static Hanhe.iWCS.JingmenGEMTwoProtocol.MESHelper;
+using static Hanhe.iWCS.JingmenGEMTwoProtocol.PLCControl;
+using static Hanhe.iWCS.JingmenGEMTwoProtocol.ProtocolAnalysis;
namespace Hanhe.iWCS.JingmenGEMTwoProtocol
{
@@ -35,6 +39,7 @@
static WebApiHelper api = new WebApiHelper();
public const string ERPSwitch01 = "1";// ERP鍙樻洿娴佺▼寮�叧
+ public static HardwareAccessObject hao = HardwareAccessHelper.Instance.GetEquipmentsHAO(Constants.WMS_DEVICE_TYPE_WMS);
public static List<string> SendERPTaskType = Settings.SendERPTaskType.Split(',').ToList();//鍥炴姤浠诲姟绫诲瀷
public static List<string> LoginInfo = Settings.LoginInfo.Split(',').ToList();// ERP鐧诲綍鎺ュ彛浼犺緭淇℃伅
@@ -676,49 +681,73 @@
if (sendERPTaskInfoList.Count == 5 || timeInfo.dateTime.AddHours(1) < DateTime.Now)
{
// 鍏堟牴鎹换鍔℃壒娆″彿瀛楁鑾峰彇鏃堕棿鎴充腑闂磋〃-TimeCuoInfoCom 鏁版嵁锛屽苟杩涜鍚庣画璋冪敤锛屽鐞嗘垚鍔熷垹闄ゆ椂闂存埑涓棿琛�TimeCuoInfoCom 鏁版嵁
+ int count = sendERPTaskInfoList.Where(a => string.IsNullOrEmpty(a.orderCode) || a.orderCode.Length < 2 || a.orderCode.Substring(0, 2) != "MO").ToList().Count();
+ #region 璁＄畻鍗曟嵁缂栧彿
+ string FBillNO = "";
+ int num = 0;
+ string S_NUM = "";
+ string time = DateTime.Now.ToString("yyMMdd");
+ CMMLog.Info($"SendERPTaskCompleteFunc time锛歿time}");
+ var midInfo = db.Queryable<ADDMid>().Where(b => b.time == time).First();
+ if (midInfo != null)
+ {
+ midInfo.num = midInfo.num + 1;
+ num = midInfo.num;
+ db.Updateable(midInfo).UpdateColumns(b => new { b.num }).ExecuteCommand();
+ }
+ else
+ {
+ num = 1;
+ midInfo = new ADDMid
+ {
+ time = DateTime.Now.ToString("yyMMdd"),
+ num = 1
+ };
+ db.Insertable(midInfo).ExecuteCommand();
+ }
+
+ CMMLog.Info($"SendERPTaskCompleteFunc num: {num}");
+ for (int i = num.ToString().Length + 1; i <= 4; i++)
+ {
+ S_NUM = S_NUM + "0";
+ }
+
+ FBillNO = "ARKD" + DateTime.Now.ToString("yyMMdd") + S_NUM + num.ToString();
+ CMMLog.Info($"SendERPTaskCompleteFunc: {FBillNO}");
+ #endregion
int n = 0; //琛屽彿
+ int m = 0;
sendERPTaskInfoList.ForEach(a =>
{
- n = n + 1;
- #region 璁＄畻鍗曟嵁缂栧彿
- string FBillNO = "";
- int num = 0;
- string S_NUM = "";
- string time = DateTime.Now.ToString("yyMMdd");
- CMMLog.Info($"SendERPTaskCompleteFunc time锛歿time}");
- var midInfo = db.Queryable<ADDMid>().Where(b => b.time == time).First();
- if (midInfo != null)
- {
- midInfo.num = midInfo.num + 1;
- num = midInfo.num;
- db.Updateable(midInfo).UpdateColumns(b => new { b.num }).ExecuteCommand();
- }
- else
- {
- num = 1;
- midInfo = new ADDMid
- {
- time = DateTime.Now.ToString("yyMMdd"),
- num = 1
- };
- db.Insertable(midInfo).ExecuteCommand();
- }
-
- CMMLog.Info($"SendERPTaskCompleteFunc num: {num}");
- for (int i = num.ToString().Length + 1; i <= 4; i++)
- {
- S_NUM = S_NUM + "0";
- }
-
- FBillNO = "ARKD" + DateTime.Now.ToString("yyMMdd") + S_NUM + num.ToString();
- CMMLog.Info($"SendERPTaskCompleteFunc: {FBillNO}");
- #endregion
-
if(!string.IsNullOrEmpty(a.orderCode) && a.orderCode.Length >= 2 && a.orderCode.Substring(0,2) == "MO")
{
- CMMLog.Info($"SendERPTaskCompleteFunc:INSERT INTO T_JY_PRDINSTOCKOP (FBillNO,FSourceBillNo,FEntryID,FSEQ,FQTY,FStockNumber,FLot,FProduceDate ,FExpiryDate,FTaskNumber,FCountEntry,FOpStatus) VALUES ('{FBillNO}','{a.orderCode}','{a.FEntryID}','1','{a.totalNeedWeight}','CK020','{a.lotCode}','{a.productTime}','{a.invalidationTime}','{a.taskNo}','1','0')");
- string sql = $"INSERT INTO T_JY_PRDINSTOCKOP (FBillNO,FSourceBillNo,FEntryID,FSEQ,FQTY,FStockNumber,FLot,FProduceDate ,FExpiryDate,FTaskNumber,FCountEntry,FOpStatus) VALUES ('{FBillNO}','{a.orderCode}','{a.FEntryID}','1','{a.totalNeedWeight}','CK020','{a.lotCode}','{a.productTime}','{a.invalidationTime}','{a.taskNo}','1','0')";
+ m = m + 1;
+ if(m > 1)
+ {
+ //2025-07-14 鎻掑叆鏂拌〃鐨勫崟鎹紪鍙凤紝涓�潯涓�釜鍗曟嵁缂栧彿
+ #region 璁＄畻鍗曟嵁缂栧彿
+ S_NUM = "";
+ midInfo = db.Queryable<ADDMid>().Where(b => b.time == time).First();
+ if (midInfo != null)
+ {
+ midInfo.num = midInfo.num + 1;
+ num = midInfo.num;
+ db.Updateable(midInfo).UpdateColumns(b => new { b.num }).ExecuteCommand();
+ }
+
+ CMMLog.Info($"SendERPTaskCompleteFunc num: {num}");
+ for (int i = num.ToString().Length + 1; i <= 4; i++)
+ {
+ S_NUM = S_NUM + "0";
+ }
+
+ FBillNO = "ARKD" + DateTime.Now.ToString("yyMMdd") + S_NUM + num.ToString();
+ CMMLog.Info($"SendERPTaskCompleteFunc: {FBillNO}");
+ #endregion
+ }
+ CMMLog.Info($"SendERPTaskCompleteFunc:INSERT INTO T_JY_PRDINSTOCKOP (FBillNO,FSourceBillNo,FEntryID,FSEQ,FQTY,FStockNumber,FLot,FProduceDate ,FExpiryDate,FTaskNumber,FCountEntry,FOpStatus) VALUES ('{FBillNO}','{a.orderCode}','{a.FEntryID}','{1}','{a.totalNeedWeight}','CK020','{a.lotCode}','{a.productTime}','{a.invalidationTime}','{a.taskNo}','{1}','0')");
+ string sql = $"INSERT INTO T_JY_PRDINSTOCKOP (FBillNO,FSourceBillNo,FEntryID,FSEQ,FQTY,FStockNumber,FLot,FProduceDate ,FExpiryDate,FTaskNumber,FCountEntry,FOpStatus) VALUES ('{FBillNO}','{a.orderCode}','{a.FEntryID}','{1}','{a.totalNeedWeight}','CK020','{a.lotCode}','{a.productTime}','{a.invalidationTime}','{a.taskNo}','{1}','0')";
if (new SqlHelper<object>().ExecuteSql(sql, false))
{
#region 鍙嶉淇℃伅缁檓es 瀵规帴鏂囨。 https://365.kdocs.cn/l/cltzoEaznLco
@@ -753,7 +782,7 @@
else
{
//鎻掑叆澶辫触锛屽皢鏁版嵁鎻掑叆鏂拌〃锛屼汉宸ユ墜鍔ㄥ鐞嗭紝閲嶆柊鎻掑叆
- MongoDBSingleton.Instance.Insert<SendErpTaskInfoTableBak>(new SendErpTaskInfoTableBak
+ MongoDBSingleton.Instance.Insert<SendErpTaskInfoTableBak>(new SendErpTaskInfoTableBak
{
orderCode = a.orderCode,
FEntryID = a.FEntryID,
@@ -767,8 +796,9 @@
}
else
{
- CMMLog.Info($"SendERPTaskCompleteFunc:INSERT INTO T_JY_SPInStockADD (FBillNO,FStockOrgNumber,FPrdOrgNumber,FSeq,FMaterialNumber,Flot,FInStockType,FMustQty,FStockNumber,FWorkShopNumber,FStockStatus,FProduceDate ,FExpiryDate,FTaskNumber,FCountEntry,FOpStatus) VALUES ('{FBillNO}','02','02','{n}','{a.materiCode}','{a.lotCode}','1','{a.totalWeight}','CK020','BM000161','1','{a.productTime}','{a.invalidationTime}','{a.taskNo}',{sendERPTaskInfoList.Count},'0')");
- string sql = $"INSERT INTO T_JY_SPInStockADD (FBillNO,FStockOrgNumber,FPrdOrgNumber,FSeq,FMaterialNumber,Flot,FInStockType,FMustQty,FStockNumber,FWorkShopNumber,FStockStatus,FProduceDate ,FExpiryDate,FTaskNumber,FCountEntry,FOpStatus) VALUES ('{FBillNO}','02','02','{n}','{a.materiCode}','{a.lotCode}','1','{a.totalWeight}','CK020','BM000161','1','{a.productTime}','{a.invalidationTime}','{a.taskNo}',{sendERPTaskInfoList.Count},'0')";
+ n = n + 1;
+ CMMLog.Info($"SendERPTaskCompleteFunc:INSERT INTO T_JY_SPInStockADD (FBillNO,FStockOrgNumber,FPrdOrgNumber,FSeq,FMaterialNumber,Flot,FInStockType,FMustQty,FStockNumber,FWorkShopNumber,FStockStatus,FProduceDate ,FExpiryDate,FTaskNumber,FCountEntry,FOpStatus) VALUES ('{FBillNO}','02','02','{n}','{a.materiCode}','{a.lotCode}','1','{a.totalWeight}','CK020','BM000161','1','{a.productTime}','{a.invalidationTime}','{a.taskNo}','{count}','0')");
+ string sql = $"INSERT INTO T_JY_SPInStockADD (FBillNO,FStockOrgNumber,FPrdOrgNumber,FSeq,FMaterialNumber,Flot,FInStockType,FMustQty,FStockNumber,FWorkShopNumber,FStockStatus,FProduceDate ,FExpiryDate,FTaskNumber,FCountEntry,FOpStatus) VALUES ('{FBillNO}','02','02','{n}','{a.materiCode}','{a.lotCode}','1','{a.totalWeight}','CK020','BM000161','1','{a.productTime}','{a.invalidationTime}','{a.taskNo}','{count}','0')";
if(new SqlHelper<object>().ExecuteSql(sql, false))
{
}
@@ -2035,39 +2065,78 @@
}
- internal static void senderpTaskDG(string startBit)
+ internal static bool senderpTaskDG(string startBit, string trayCode)
{
try
{
//閫氳繃鎵樼洏鍙疯皟鐢╳ms鎺ュ彛鑾峰彇鐗╂枡淇℃伅
- CMMLog.Info("鎻掑叆SendErpTaskInfoTable 琛�寮�:" + startBit);
- var erpInfo = MongoDBSingleton.Instance.FindOne<SendErpTaskInfoTable>(Query.EQ("Bit", startBit), "SendErpTaskInfoTable");
+ CMMLog.Info("SendErpTaskInfoTableDG 琛ㄦ煡璇�寮�:" + startBit);
+ var url = hao.WebUrl + "GlmTrayItemSet";
+ var erpInfo = MongoDBSingleton.Instance.FindOne<SendErpTaskInfoTableDG>(Query.EQ("Bit", startBit), "SendErpTaskInfoTableDG");
if (erpInfo == null)
{
//string fEntryId = time.FEntryID_1.ToString() + (time.FEntryID_2 == 0 ? "" : ";" + time.FEntryID_2.ToString()) + (time.FEntryID_3 == 0 ? "" : ";" + time.FEntryID_3.ToString()) + (time.FEntryID_4 == 0 ? "" : ";" + time.FEntryID_4.ToString());
+ string materiCode = "";
+ string lotCode = "";
+ int totalWeight = 0;
+ string productTime = "";
- CMMLog.Info("鎻掑叆SendErpTaskInfoTable 琛�1");
- MongoDBSingleton.Instance.Insert<SendErpTaskInfoTable>(new SendErpTaskInfoTable
+ //鏍规嵁鎵樼洏鍙疯幏鍙栧叆搴撶墿鏂欎俊鎭�+ CJWareNum model = new CJWareNum
{
- Bit = startBit,
- //materiCode = time.materialCode,
- //lotCode = time.batchNumber,
- //productTime = Convert.ToDateTime(time.ProductionDate).AddHours(8),
- //invalidationTime = Convert.ToDateTime(time.ProductionDate).AddHours(8).AddDays(365),
- dateTime = DateTime.Now.AddHours(8),
- //鍙樻洿娉ㄩ噴
- mesSucess = "0"
- }, "SendErpTaskInfoTable");
+ TrayCode = trayCode
+ };
+
+ string msgData = JsonConvert.SerializeObject(model);
+
+ var feedback = helper.WebPost(url, msgData).Replace(@"\", "").Trim();
+ CMMLog.Info($"SendErpTaskInfoTableDG:銆愯皟鐢╳ms鑾峰彇鐗╂枡淇℃伅銆�鎺ユ敹鏁版嵁锛� + feedback);
+ if (!string.IsNullOrEmpty(feedback))
+ {
+ var wmsResponse = JsonConvert.DeserializeObject<LKInfoResModel>(feedback);
+ if (wmsResponse.Success == true)
+ {
+ materiCode = wmsResponse.Data.CN_S_ITEM_CODE;
+ lotCode = wmsResponse.Data.CN_S_LOT_NO;
+ totalWeight = (int)wmsResponse.Data.CN_F_QUANTITY * wmsResponse.Data.CN_N_CONUT;
+ productTime = wmsResponse.Data.CN_T_PRODUCTION_S;
+ }
+ }
+
+ CMMLog.Info("SendErpTaskInfoTableDG琛�1");
+ if (!string.IsNullOrEmpty(materiCode) && !string.IsNullOrEmpty(lotCode) && totalWeight != 0 && !string.IsNullOrEmpty(productTime))
+ {
+ MongoDBSingleton.Instance.Insert<SendErpTaskInfoTableDG>(new SendErpTaskInfoTableDG
+ {
+ Bit = startBit,
+ materiCode = materiCode,
+ lotCode = lotCode,
+ totalWeight = totalWeight,
+ productTime = Convert.ToDateTime(productTime).AddHours(8),
+ invalidationTime = Convert.ToDateTime(productTime).AddHours(8).AddDays(365),
+ dateTime = DateTime.Now.AddHours(8),
+ //鍙樻洿娉ㄩ噴
+ mesSucess = "0"
+ }, "SendErpTaskInfoTableDG");
+ return true;
+ }
+ else
+ {
+ CMMLog.Info($"SendErpTaskInfoTableDG:鑾峰彇鏁版嵁閿欒锛宮ateriCode锛歿materiCode},lotCode:{lotCode},totalWeight:{totalWeight},productTime:{productTime}");
+ }
+
}
- CMMLog.Info("鎻掑叆SendErpTaskInfoTable 琛�缁撴潫");
+ CMMLog.Info("鎻掑叆SendErpTaskInfoTableDG琛�缁撴潫");
}
catch (Exception ex)
{
- CMMLog.Info("鎻掑叆SendErpTaskInfoTable 琛�err:" + ex.Message);
+ CMMLog.Info("鎻掑叆SendErpTaskInfoTableDG琛�err:" + ex.Message);
}
+
+ return false;
}
internal static void SendERPTaskCompleteFuncDG()
--
Gitblit v1.9.1