From 84c580cccb118f5ec4a039d0009255935c3c2490 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期二, 17 六月 2025 17:31:40 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/MESHelper.cs | 205 +++++++++-----------------------------------------
1 files changed, 39 insertions(+), 166 deletions(-)
diff --git a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/MESHelper.cs b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/MESHelper.cs
index db55fe0..0e5f1a7 100644
--- a/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/MESHelper.cs
+++ b/ams/Hanhe.iWCS.TaizhouGEMTwoProtocol/MESHelper.cs
@@ -249,10 +249,6 @@
int productTime = Convert.ToInt32(Completion(result[(i - 1) * 24 + 20]) + Completion(result[(i - 1) * 24 + 21]), 2);//鐢熶骇鏃ユ湡
string timeCuoTwo = Convert.ToInt32(Completion(result[(i - 1) * 24 + 22]) + Completion(result[(i - 1) * 24 + 23]), 2).ToString(); //鏃堕棿鎴�
- //娉ㄦ剰锛氳繖閲岃祴鍊间腑闂磋〃鍙傛暟璇峰鐓т俊鎭氦浜掕〃鍏蜂綋閫氶亾鍊煎搴�- //UpdateBuilder update = Update.Set("employeeId" + i.ToString(), empCode).Set("trayCode" + i.ToString(), trayCode).Set("packingMachineNumber" + i.ToString(), machineCode).Set("needWeight" + i.ToString(), needWeight)
- // .Set("oneWeight" + i.ToString(), oneWeight).Set("realWeight" + i.ToString(), readWeight).Set("FCWeight" + i.ToString(), fcWeight).Set("trayType" + i.ToString(), trayType)
- // .Set("isFold" + i.ToString(), addState).Set("bagNumber" + i.ToString(), bagNumber).Set("productData" + i.ToString(), productTime).Set("timeCuo" + i.ToString(), timeCuoTwo);
UpdateBuilder updateBuilder = Update.Set("employeeId" + i.ToString(), empCode).Set("trayCode" + i.ToString(), trayCode).Set("packingMachineNumber" + i.ToString(), machineCode).Set("needWeight" + i.ToString(), needWeight)
.Set("oneWeight" + i.ToString(), oneWeight).Set("realWeight" + i.ToString(), readWeight).Set("FCWeight" + i.ToString(), fcWeight).Set("trayType" + i.ToString(), trayType)
.Set("isFold" + i.ToString(), addState).Set("bagNumber" + i.ToString(), bagNumber).Set("productData" + i.ToString(), productTime).Set("timeCuo" + i.ToString(), timeCuoTwo);
@@ -620,6 +616,10 @@
/// 璁惧閫氶亾鏁版嵁2鈥斺�鍗曟墭瀹為檯閲嶉噺锛�2浣嶆暣鏁� /// </summary>
public string oneTrayWeight { get; set; } = "0";
+ /// <summary>
+ /// 璁惧閫氶亾鏁版嵁2鈥斺�澶嶇О姣涢噸锛�2浣嶆暣鏁�+ /// </summary>
+ public string oneTrayWeightFC { get; set; } = "0,0";
/// <summary>
/// 璁惧閫氶亾鏁版嵁2鈥斺�鎵樼洏绫诲瀷锛�2浣嶆暣鏁� /// </summary>
@@ -1131,201 +1131,51 @@
/// <summary>
/// 鍛樺伐缂栧彿1
/// </summary>
- public string employeeId1 { get; set; }
+ public string employeeId { get; set; }
/// <summary>
/// 鎵樼洏鐮�
/// </summary>
- public string trayCode1 { get; set; }
+ public string trayCode { get; set; }
/// <summary>
/// 鍖呰鏈哄彿1
/// </summary>
- public string packingMachineNumber1 { get; set; }
+ public string packingMachineNumber { get; set; }
/// <summary>
/// 浜у搧闇�眰閲嶉噺1锛�2浣嶆暣鏁� /// </summary>
- public int needWeight1 { get; set; }
+ public int needWeight { get; set; }
/// <summary>
/// 鍗曟墭姣涢噸1锛�2浣嶆暣鏁� /// </summary>
- public int oneWeight1 { get; set; }
+ public int oneWeight { get; set; }
/// <summary>
/// 鍗曟墭瀹為檯閲嶉噺1锛�2浣嶆暣鏁� /// </summary>
- public int realWeight1 { get; set; }
+ public int realWeight { get; set; }
/// <summary>
/// 鍗曟墭澶嶇О閲嶉噺1锛�2浣嶆暣鏁� /// </summary>
- public int FCWeight1 { get; set; }
+ public int FCWeight { get; set; }
/// <summary>
/// 鎵樼洏绫诲瀷1
/// </summary>
- public string trayType1 { get; set; }
+ public string trayType { get; set; }
/// <summary>
/// 鍙犲寘灞傛暟1
/// </summary>
- public int isFold1 { get; set; }
+ public int isFold { get; set; }
/// <summary>
/// 鏈壒娆″唴琚嬪彿锛氾紙1锛�锛�鈥︹�10) 鏁存暟1
/// </summary>
- public int bagNumber1 { get; set; }
+ public int bagNumber { get; set; }
/// <summary>
/// 鐢熶骇鏃ユ湡锛�2浣嶆暣鏁帮級1
/// </summary>
- public string productData1 { get; set; }
+ public string productData { get; set; }
/// <summary>
/// 鍗曞寘涓嬫枡鏃堕棿鎴� /// </summary>
- public string timeCuo1 { get; set; }
-
-
- /// <summary>
- /// 鍛樺伐缂栧彿2
- /// </summary>
- public string employeeId2 { get; set; }
- /// <summary>
- /// 鎵樼洏鐮�
- /// </summary>
- public string trayCode2 { get; set; }
- /// <summary>
- /// 鍖呰鏈哄彿2
- /// </summary>
- public string packingMachineNumber2 { get; set; }
- /// <summary>
- /// 浜у搧闇�眰閲嶉噺2锛�2浣嶆暣鏁�- /// </summary>
- public int needWeight2 { get; set; }
- /// <summary>
- /// 鍗曟墭姣涢噸2锛�2浣嶆暣鏁�- /// </summary>
- public int oneWeight2 { get; set; }
- /// <summary>
- /// 鍗曟墭瀹為檯閲嶉噺2锛�2浣嶆暣鏁�- /// </summary>
- public int realWeight2 { get; set; }
- /// <summary>
- /// 鍗曟墭澶嶇О閲嶉噺2锛�2浣嶆暣鏁�- /// </summary>
- public int FCWeight2 { get; set; }
- /// <summary>
- /// 鎵樼洏绫诲瀷2
- /// </summary>
- public string trayType2 { get; set; }
- /// <summary>
- /// 鍙犲寘灞傛暟2
- /// </summary>
- public int isFold2 { get; set; }
- /// <summary>
- /// 鏈壒娆″唴琚嬪彿锛氾紙1锛�锛�鈥︹�20) 鏁存暟2
- /// </summary>
- public int bagNumber2 { get; set; }
- /// <summary>
- /// 鐢熶骇鏃ユ湡锛�2浣嶆暣鏁帮級2
- /// </summary>
- public string productData2 { get; set; }
- /// <summary>
- /// 鍗曞寘涓嬫枡鏃堕棿鎴�- /// </summary>
- public string timeCuo2 { get; set; }
-
-
- /// <summary>
- /// 鍛樺伐缂栧彿3
- /// </summary>
- public string employeeId3 { get; set; }
- /// <summary>
- /// 鎵樼洏鐮�
- /// </summary>
- public string trayCode3 { get; set; }
- /// <summary>
- /// 鍖呰鏈哄彿3
- /// </summary>
- public string packingMachineNumber3 { get; set; }
- /// <summary>
- /// 浜у搧闇�眰閲嶉噺3锛�3浣嶆暣鏁�- /// </summary>
- public int needWeight3 { get; set; }
- /// <summary>
- /// 鍗曟墭姣涢噸3锛�2浣嶆暣鏁�- /// </summary>
- public int oneWeight3 { get; set; }
- /// <summary>
- /// 鍗曟墭瀹為檯閲嶉噺3锛�2浣嶆暣鏁�- /// </summary>
- public int realWeight3 { get; set; }
- /// <summary>
- /// 鍗曟墭澶嶇О閲嶉噺3锛�2浣嶆暣鏁�- /// </summary>
- public int FCWeight3 { get; set; }
- /// <summary>
- /// 鎵樼洏绫诲瀷3
- /// </summary>
- public string trayType3 { get; set; }
- /// <summary>
- /// 鍙犲寘灞傛暟3
- /// </summary>
- public int isFold3 { get; set; }
- /// <summary>
- /// 鏈壒娆″唴琚嬪彿锛氾紙1锛�锛�鈥︹�30) 鏁存暟3
- /// </summary>
- public int bagNumber3 { get; set; }
- /// <summary>
- /// 鐢熶骇鏃ユ湡锛�2浣嶆暣鏁帮級3
- /// </summary>
- public string productData3 { get; set; }
- /// <summary>
- /// 鍗曞寘涓嬫枡鏃堕棿鎴�- /// </summary>
- public string timeCuo3 { get; set; }
-
-
- /// <summary>
- /// 鍛樺伐缂栧彿4
- /// </summary>
- public string employeeId4 { get; set; }
- /// <summary>
- /// 鎵樼洏鐮�
- /// </summary>
- public string trayCode4 { get; set; }
- /// <summary>
- /// 鍖呰鏈哄彿4
- /// </summary>
- public string packingMachineNumber4 { get; set; }
- /// <summary>
- /// 浜у搧闇�眰閲嶉噺4锛�2浣嶆暣鏁�- /// </summary>
- public int needWeight4 { get; set; }
- /// <summary>
- /// 鍗曟墭姣涢噸4锛�2浣嶆暣鏁�- /// </summary>
- public int oneWeight4 { get; set; }
- /// <summary>
- /// 鍗曟墭瀹為檯閲嶉噺4锛�2浣嶆暣鏁�- /// </summary>
- public int realWeight4 { get; set; }
- /// <summary>
- /// 鍗曟墭澶嶇О閲嶉噺4锛�2浣嶆暣鏁�- /// </summary>
- public int FCWeight4 { get; set; }
- /// <summary>
- /// 鎵樼洏绫诲瀷4
- /// </summary>
- public string trayType4 { get; set; }
- /// <summary>
- /// 鍙犲寘灞傛暟4
- /// </summary>
- public int isFold4 { get; set; }
- /// <summary>
- /// 鏈壒娆″唴琚嬪彿锛氾紙1锛�锛�鈥︹�40) 鏁存暟4
- /// </summary>
- public int bagNumber4 { get; set; }
- /// <summary>
- /// 鐢熶骇鏃ユ湡锛�2浣嶆暣鏁帮級4
- /// </summary>
- public string productData4 { get; set; }
- /// <summary>
- /// 鍗曞寘涓嬫枡鏃堕棿鎴�- /// </summary>
- public string timeCuo4 { get; set; }
+ public string timeCuo { get; set; }
/// <summary>
/// 澶嶇О鎬婚噸閲�@@ -1355,6 +1205,7 @@
/// 璁￠噺鍗曚綅
/// </summary>
public string measurementUnit { get; set; }
+ public DateTime createTime { get; set; }
}
/// <summary>
@@ -1431,5 +1282,27 @@
public string FStaffNumber { get; set; }
}
+ public class trayTypeTable
+ {
+
+ public ObjectId _id { get; set; }
+ /// <summary>
+ /// 璐т綅缂栫爜
+ /// </summary>
+ public string locCode { get; set; }
+ /// <summary>
+ /// 鎵樼洏绫诲瀷
+ /// </summary>
+ public string trayType { get; set; }
+ }
+
+ public class STOCK_LOCATION_Two
+ {
+ public ObjectId _id { get; set; }
+ public string CN_S_LOCATION_CODE { get; set; }
+ public int CN_N_AGV_LOCATION { get; set; }
+ }
+
+
}
}
--
Gitblit v1.9.1