From 401d64167d96f911b394da3031a1f04f1803e175 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 29 六月 2023 15:22:15 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/POStockInBillController.cs | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index d5acaaa..ec68edf 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,7 +1261,7 @@
"-",
num27.ToString()
}));
- string text20 = sBarCodeNew.Remove(0, 16); //SAE1300100230309 2303704250308010
+ 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");
@@ -1298,7 +1298,7 @@
"-",
num23.ToString()
}));
- DataSet dataSet16 = clsCN3.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + text1 + "'", "Gy_BarCodeBill");
+ DataSet dataSet16 = clsCN3.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + text1 + "'", "Gy_BarCodeBill");
bool flag10 = dataSet16.Tables[0].Rows.Count > 0;
if (flag10)
{
@@ -1323,6 +1323,7 @@
}
else
{
+ //鍙兘鍜屼粬浠殑鐧诲綍缁勭粐鏈夊叧绯�
string billCode3 = "85";
long num32 = ClsPub.CreateBillID_Prod(billCode3, ref ClsPub.sExeReturnInfo);
long num33 = 0L;
@@ -3950,7 +3951,8 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鎴愬姛锛佸崟鎹彿涓猴細";
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ //objJsonResult.Message = "鎴愬姛锛佸崟鎹彿涓猴細";
objJsonResult.data = null;
return objJsonResult;
}
@@ -3958,7 +3960,8 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ //objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -4307,6 +4310,14 @@
{
DataSet dataSet = this.oCn.RunProcReturn("exec h_p_ReceiveBill_Fast " + hinterID, "h_p_ReceiveBill_Fast");
DataRow dataRow = dataSet.Tables[0].Rows[0];
+ if (dataSet.Tables[0].Rows.Count == 1 && dataSet.Tables[0].Rows[0]["FRECEIVENumber"].ToString() == "0")
+ {
+ this.objJsonResult.code = "0";
+ this.objJsonResult.count = 0;
+ this.objJsonResult.Message = "瀛樺湪澶氫釜閲囪喘璁㈠崟鍗曟嵁绫诲瀷锛屼笉鍏佽鎻愪氦锛�";
+ this.objJsonResult.data = null;
+ return this.objJsonResult;
+ }
bool flag4 = dataSet.Tables[0].Rows.Count <= 0;
bool flag5 = flag4;
bool flag6 = flag5;
--
Gitblit v1.9.1