From c184121b9038aee1d8c9e3e49e45764521e58007 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期一, 14 七月 2025 17:29:12 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/3b99beef-0d7e-4c62-ae25-05da05e2692f.vsidx | 0
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/v17/DocumentLayout.backup.json | 22 ++++++
/dev/null | 0
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs | 105 +++++++++++++++++++++-------------
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/08560017-6f17-4f76-9c84-853aeef77776.vsidx | 0
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/Hanhe.iWCS.JingmenGEMTwoProtocol.csproj | 15 ++--
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/MESHelper.cs | 2
7 files changed, 93 insertions(+), 51 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/08560017-6f17-4f76-9c84-853aeef77776.vsidx b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/08560017-6f17-4f76-9c84-853aeef77776.vsidx
new file mode 100644
index 0000000..826ad34
--- /dev/null
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/08560017-6f17-4f76-9c84-853aeef77776.vsidx
Binary files differ
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/3b99beef-0d7e-4c62-ae25-05da05e2692f.vsidx b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/3b99beef-0d7e-4c62-ae25-05da05e2692f.vsidx
new file mode 100644
index 0000000..1ad2cd0
--- /dev/null
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/3b99beef-0d7e-4c62-ae25-05da05e2692f.vsidx
Binary files differ
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/56b45850-7c70-4012-b361-03c118a1f4b5.vsidx b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/56b45850-7c70-4012-b361-03c118a1f4b5.vsidx
deleted file mode 100644
index c9022f6..0000000
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/FileContentIndex/56b45850-7c70-4012-b361-03c118a1f4b5.vsidx
+++ /dev/null
Binary files differ
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/v17/DocumentLayout.backup.json b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/v17/DocumentLayout.backup.json
index 3042840..b353696 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/v17/DocumentLayout.backup.json
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/.vs/Hanhe.iWCS.JingmenGEMTwoProtocol/v17/DocumentLayout.backup.json
@@ -1,7 +1,12 @@
{
"Version": 1,
"WorkspaceRootPath": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u8346\u95E8\u683C\u6797\u7F8E\u5357\u533A\\ams\\Hanhe.iWCS.JingmenGEMTwoProtocol\\",
- "Documents": [],
+ "Documents": [
+ {
+ "AbsoluteMoniker": "D:0:0:{BCE5B4FC-C2CD-459E-AAD0-34D4900B4528}|Hanhe.iWCS.JingmenGEMTwoProtocol.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\git\\\u8346\u95E8\u683C\u6797\u7F8E\u5357\u533A\\ams\\hanhe.iwcs.jingmengemtwoprotocol\\enentlisten.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{BCE5B4FC-C2CD-459E-AAD0-34D4900B4528}|Hanhe.iWCS.JingmenGEMTwoProtocol.csproj|solutionrelative:enentlisten.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ }
+ ],
"DocumentGroupContainers": [
{
"Orientation": 0,
@@ -9,7 +14,7 @@
"DocumentGroups": [
{
"DockedWidth": 16,
- "SelectedChildIndex": -1,
+ "SelectedChildIndex": 7,
"Children": [
{
"$type": "Bookmark",
@@ -38,6 +43,19 @@
{
"$type": "Bookmark",
"Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 0,
+ "Title": "EnentListen.cs",
+ "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u8346\u95E8\u683C\u6797\u7F8E\u5357\u533A\\ams\\Hanhe.iWCS.JingmenGEMTwoProtocol\\EnentListen.cs",
+ "RelativeDocumentMoniker": "EnentListen.cs",
+ "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u8346\u95E8\u683C\u6797\u7F8E\u5357\u533A\\ams\\Hanhe.iWCS.JingmenGEMTwoProtocol\\EnentListen.cs",
+ "RelativeToolTip": "EnentListen.cs",
+ "ViewState": "AgIAACIAAAAAAAAAAAAcwE0BAAAMAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-14T00:36:42.299Z",
+ "EditorCaption": ""
}
]
},
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
index 0b21cea..dbecd46 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ERPService.cs
@@ -681,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
@@ -758,7 +782,7 @@
else
{
//鎻掑叆澶辫触锛屽皢鏁版嵁鎻掑叆鏂拌〃锛屼汉宸ユ墜鍔ㄥ鐞嗭紝閲嶆柊鎻掑叆
- MongoDBSingleton.Instance.Insert<SendErpTaskInfoTableBak>(new SendErpTaskInfoTableBak
+ MongoDBSingleton.Instance.Insert<SendErpTaskInfoTableBak>(new SendErpTaskInfoTableBak
{
orderCode = a.orderCode,
FEntryID = a.FEntryID,
@@ -772,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))
{
}
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/Hanhe.iWCS.JingmenGEMTwoProtocol.csproj b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/Hanhe.iWCS.JingmenGEMTwoProtocol.csproj
index 6553685..b6edc23 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/Hanhe.iWCS.JingmenGEMTwoProtocol.csproj
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/Hanhe.iWCS.JingmenGEMTwoProtocol.csproj
@@ -34,8 +34,9 @@
<Reference Include="Hanhe.iWCS.AGVWebService">
<HintPath>..\..\姹夊拰鏅鸿兘浜屾寮�彂鍖匼Hanhe.iWCS.AGVWebService.dll</HintPath>
</Reference>
- <Reference Include="Hanhe.iWCS.Business">
- <HintPath>..\..\Hanhe.iWCS.Business\bin\Debug\Hanhe.iWCS.Business.dll</HintPath>
+ <Reference Include="Hanhe.iWCS.Business, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\姹夊拰鏅鸿兘浜屾寮�彂鍖匼Hanhe.iWCS.Business.dll</HintPath>
</Reference>
<Reference Include="Hanhe.iWCS.Common">
<HintPath>..\..\姹夊拰鏅鸿兘浜屾寮�彂鍖匼Hanhe.iWCS.Common.dll</HintPath>
@@ -51,6 +52,10 @@
</Reference>
<Reference Include="Hanhe.iWCS.Interface">
<HintPath>..\..\姹夊拰鏅鸿兘浜屾寮�彂鍖匼Hanhe.iWCS.Interface.dll</HintPath>
+ </Reference>
+ <Reference Include="Hanhe.iWCS.JingmenGEMTwoTCP, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>bin\Debug\Hanhe.iWCS.JingmenGEMTwoTCP.dll</HintPath>
</Reference>
<Reference Include="Hanhe.iWCS.MData">
<HintPath>..\..\姹夊拰鏅鸿兘浜屾寮�彂鍖匼Hanhe.iWCS.MData.dll</HintPath>
@@ -136,12 +141,6 @@
<Content Include="settings.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Hanhe.iWCS.JingmenGEMTwoTCP\Hanhe.iWCS.JingmenGEMTwoTCP.csproj">
- <Project>{E58B2022-9333-4759-A012-6028008AC1B8}</Project>
- <Name>Hanhe.iWCS.JingmenGEMTwoTCP</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/MESHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/MESHelper.cs
index 2fdcd3b..5a5b2c6 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/MESHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/MESHelper.cs
@@ -129,7 +129,7 @@
//bagNumber = timeReq.bagNumber_1+","+timeReq.bagNumber_2,
needWeight = timeReq.needWeight_1 / 100,
realWeight = timeReq.realWeight_1 / 100,
- totalWeight = timeReq.totalWeight,
+ totalWeight = timeReq.totalWeight / 100,
batchNumber = timeReq.batchNumber,
productModel = timeReq.productModel,
bagNumber_1 = timeReq.bagNumber_1,
--
Gitblit v1.9.1