From 9f6816fd0824aafc360bee29c9ec1eb76fa0aa16 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 25 五月 2023 16:51:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/POStockInBillController.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index 1569fde..467a4e4 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -936,7 +936,7 @@
{
'@'
});
- string str = array[0];
+ string str = array[0]; //鐗╂枡浠ｇ爜
long num = (long)ClsPub.isInt(array[4]);
string text2 = array[6];
DateTime dateTime = ClsPub.isDate(array[3]);
@@ -1079,12 +1079,12 @@
bool flag6 = text7.Contains("W") || text7.Contains("N");
if (flag6)
{
- string text8 = sBarCodeNew.Substring(0, 10);//鍟嗗搧鐮�
+ string text8 = sBarCodeNew.Substring(0, 10);//鍟嗗搧鐮� 鍟嗗搧鐮�+鐗╂枡浠ｇ爜+鐢熶骇鏃ユ湡+鎵规+澶辨晥鏃ユ湡+涓�浣嶅瓧姣�+涓変綅鏁板瓧
string str4 = sBarCodeNew.Substring(10, 10);//鐗╂枡浠ｇ爜
string text9 = "20" + sBarCodeNew.Substring(20, 6);
- long num8 = (long)ClsPub.isInt(text9.Substring(0, 4));
- long num9 = (long)ClsPub.isInt(text9.Substring(4, 2));
- long num10 = (long)ClsPub.isInt(text9.Substring(6, 2));
+ long num8 = (long)ClsPub.isInt(text9.Substring(0, 4)); //骞�
+ long num9 = (long)ClsPub.isInt(text9.Substring(4, 2)); //鏈�
+ long num10 = (long)ClsPub.isInt(text9.Substring(6, 2)); //鏃�
long num11 = (long)ClsPub.isInt(sBarCodeNew.Remove(0, sBarCodeNew.Length - 3));//鍚庝笁浣嶆案杩滈兘鏄暟瀛�
string text10 = sBarCodeNew.Remove(0, sBarCodeNew.Length - 10);//澶辨晥鏃ユ湡+涓�浣嶅瓧姣�+涓変綅鏁板瓧
string text11 = "20" + text10.Substring(0, 6);
@@ -1241,7 +1241,7 @@
}
else
{
- /*鍓嶅崄浣嶇墿鏂欎唬鐮侊紝鍚庡叚浣嶇敓鏁堟棩鏈燂紝鍊掓暟鍓嶄笁浣嶆槸鏁板瓧鍓嶅叚浣嶆槸澶辨晥鏃ユ湡 鎵瑰彿鏀逛负鍔ㄦ�佽幏鍙�*/
+ /*鍓嶅崄浣嶇墿鏂欎唬鐮侊紝鍚庡叚浣嶇敓鏁堟棩鏈燂紝鍊掓暟鍓嶄笁浣嶆槸鏁板瓧鍓嶅叚浣嶆槸澶辨晥鏃ユ湡 */
string str6 = sBarCodeNew.Substring(0, 10);//鐗╂枡浠ｇ爜
string text17 = "20" + sBarCodeNew.Substring(10, 6);
long num21 = (long)ClsPub.isInt(text17.Substring(0, 4));
@@ -1261,9 +1261,9 @@
"-",
num27.ToString()
}));
- string text20 = sBarCodeNew.Remove(0, 16);
- string text21 = text20.Remove(text20.Length - 9, 9);
- ClsCN clsCN3 = new ClsCN();
+ string text20 = sBarCodeNew.Remove(0, 16); //SAE1300100 230309 2303704 250308 010
+ string text21 = text20.Remove(text20.Length - 9 , 9); //SAE1300100230309 2303704 250308010
+ ClsCN clsCN3 = new ClsCN();
DataSet dataSet13 = clsCN3.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + str6 + "' and huseorgid = " + HOrgID.ToString(), "Gy_Material");
long num28 = ClsPub.isLong(dataSet13.Tables[0].Rows[0]["HItemID"]);
string text22 = ClsPub.isStrNull(dataSet13.Tables[0].Rows[0]["HName"]);
--
Gitblit v1.9.1