From b8f0938c46299b821eb73b3b4aec9fc807178354 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期二, 10 六月 2025 17:33:09 +0800
Subject: [PATCH] 11
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs | 74 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
index 810c399..aa98c83 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
@@ -500,10 +500,10 @@
{
// 鍏堟牴鎹换鍔℃壒娆″彿瀛楁鑾峰彇鏃堕棿鎴充腑闂磋〃-TimeCuoInfoCom 鏁版嵁锛屽苟杩涜鍚庣画璋冪敤锛屽鐞嗘垚鍔熷垹闄ゆ椂闂存埑涓棿琛�TimeCuoInfoCom 鏁版嵁
- //int n = 0; //琛屽彿
+ int n = 0; //琛屽彿
sendERPTaskInfoList.ForEach(a =>
{
- //n = n + 1;
+ n = n + 1;
#region 璁＄畻鍗曟嵁缂栧彿
string FBillNO = "";
int num = 0;
@@ -538,43 +538,57 @@
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))
+ if(!string.IsNullOrEmpty(a.orderCode) && a.orderCode.Length >= 2 && a.orderCode.Substring(0,2) == "MO")
{
- #region 鍙嶉淇℃伅缁檓es 瀵规帴鏂囨。 https://365.kdocs.cn/l/cltzoEaznLco
- bool result = sendMes(a, true);
-
- if (!result)
+ 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))
{
- //灏嗘暟鎹瓨鍏ヤ腑闂磋〃锛岄噸鏂板彂閫�- MongoDBSingleton.Instance.Insert<SendMESTaskInfoTable>(new SendMESTaskInfoTable
+ #region 鍙嶉淇℃伅缁檓es 瀵规帴鏂囨。 https://365.kdocs.cn/l/cltzoEaznLco
+ bool result = sendMes(a, true);
+
+ if (!result)
{
- taskNo = a.taskNo,
- Bit = a.Bit,
- packingMachineNumber = a.packingMachineNumber,
- materiCode = a.materiCode,
- materiName = a.materiName,
- materialSpec = a.materialSpec,
- totalWeight = a.totalWeight,
- lotCode = a.lotCode,
- timeStamp = a.timeStamp,
- productTime = a.productTime,
- invalidationTime = a.invalidationTime,
- isFinish = a.isFinish,
- dateTime = a.dateTime,
- orderCode = a.orderCode,
- totalNeedWeight = a.totalNeedWeight,
- netWeight = a.netWeight,
- FEntryID = a.FEntryID
- });
+ //灏嗘暟鎹瓨鍏ヤ腑闂磋〃锛岄噸鏂板彂閫�+ MongoDBSingleton.Instance.Insert<SendMESTaskInfoTable>(new SendMESTaskInfoTable
+ {
+ taskNo = a.taskNo,
+ Bit = a.Bit,
+ packingMachineNumber = a.packingMachineNumber,
+ materiCode = a.materiCode,
+ materiName = a.materiName,
+ materialSpec = a.materialSpec,
+ totalWeight = a.totalWeight,
+ lotCode = a.lotCode,
+ timeStamp = a.timeStamp,
+ productTime = a.productTime,
+ invalidationTime = a.invalidationTime,
+ isFinish = a.isFinish,
+ dateTime = a.dateTime,
+ orderCode = a.orderCode,
+ totalNeedWeight = a.totalNeedWeight,
+ netWeight = a.netWeight,
+ FEntryID = a.FEntryID
+ });
+ }
+ #endregion
+
+ //鎻掑叆鎴愬姛 娓呴櫎涓棿琛�+ MongoDBSingleton.Instance.Remove<SendErpTaskInfoTable>(Query.EQ("_id", a._id), "SendErpTaskInfoTable", RemoveFlags.None);
+ MongoDBSingleton.Instance.Remove<TimeCuoInfoCom>(Query.EQ("timeStamp", int.Parse(a.timeStamp)), "TimeCuoInfoCom", RemoveFlags.None);
}
- #endregion
+ }
+ 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')";
+ new SqlHelper<object>().ExecuteSql(sql, false);
//鎻掑叆鎴愬姛 娓呴櫎涓棿琛� MongoDBSingleton.Instance.Remove<SendErpTaskInfoTable>(Query.EQ("_id", a._id), "SendErpTaskInfoTable", RemoveFlags.None);
MongoDBSingleton.Instance.Remove<TimeCuoInfoCom>(Query.EQ("timeStamp", int.Parse(a.timeStamp)), "TimeCuoInfoCom", RemoveFlags.None);
}
+
});
}
}
--
Gitblit v1.9.1