From e8ba3626a4452ad0419c80146bac357a6a5276ba Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 15 七月 2025 10:39:53 +0800
Subject: [PATCH] 华远：检验信息中正反面改成varchar类型
---
WebAPI/Controllers/华远datamapping/HY_DataMappingController.cs | 51 ++++++++++++++++++++++-----------------------------
1 files changed, 22 insertions(+), 29 deletions(-)
diff --git "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs" "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
index 2b3bf08..c039090 100644
--- "a/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
+++ "b/WebAPI/Controllers/\345\215\216\350\277\234datamapping/HY_DataMappingController.cs"
@@ -64,7 +64,7 @@
public string HPCSNo; //PCS鍙�
public int HPosition_x; //PCS鎵�鍦ㄨ鐨勭储寮�
public int HPosition_y; //PCS鎵�鍦ㄥ垪鐨勭储寮�
- public int HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
+ public string HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
public string HBadReason; //涓嶈壇鍘熷洜
}
@@ -146,7 +146,7 @@
public string HPCSNo; //PCS鍙�
public int HPosition_x; //PCS鎵�鍦ㄨ鐨勭储寮�
public int HPosition_y; //PCS鎵�鍦ㄥ垪鐨勭储寮�
- public int HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
+ public string HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
public string HBadReason; //涓嶈壇鍘熷洜
}
@@ -192,7 +192,7 @@
public string HPCSNo; //PCS鍙�
public int HPosition_x; //PCS鎵�鍦ㄨ鐨勭储寮�
public int HPosition_y; //PCS鎵�鍦ㄥ垪鐨勭储寮�
- public int HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
+ public string HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
public string HBadReason; //涓嶈壇鍘熷洜
}
@@ -238,7 +238,7 @@
public string HPCSNo; //PCS鍙�
public int HPosition_x; //PCS鎵�鍦ㄨ鐨勭储寮�
public int HPosition_y; //PCS鎵�鍦ㄥ垪鐨勭储寮�
- public int HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
+ public string HPageIndex; //姝ｅ弽闈�(0:姝ｉ潰,1:鍙嶉潰)
public string HBadReason; //涓嶈壇鍘熷洜
}
@@ -400,7 +400,7 @@
int HPosition_x = vRSInner_SaveCheckNote_RequestParams[i].param[j].HPosition_x;
int HPosition_y = vRSInner_SaveCheckNote_RequestParams[i].param[j].HPosition_y;
string HCheckProc = "鐐．VRS鍐呭眰";
- int HPageIndex = vRSInner_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
+ string HPageIndex = vRSInner_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
string HBadReason = vRSInner_SaveCheckNote_RequestParams[i].param[j].HBadReason;
//鏍规嵁PNL鏉＄爜鎵惧埌PNL瀵逛簬鐨凱NL甯冨眬淇℃伅銆傜劧鍚庢牴鎹甈CS鍙峰湪PNL甯冨眬淇℃伅涓壘鍒癙CS瀵瑰簲鐨剆et鍙�
@@ -430,7 +430,7 @@
"," + HPosition_x + "" +
"," + HPosition_y + "" +
",'" + HCheckProc + "'" +
- "," + HPageIndex + "" +
+ ",'" + HPageIndex + "'" +
",'" + HBadReason + "'" +
",'" + HMaker + "'" +
",getdate() " +
@@ -685,7 +685,7 @@
int HPosition_x = vRSOuter_SaveCheckNote_RequestParams[i].param[j].HPosition_x;
int HPosition_y = vRSOuter_SaveCheckNote_RequestParams[i].param[j].HPosition_y;
string HCheckProc = "鐐．VRS澶栧眰";
- int HPageIndex = vRSOuter_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
+ string HPageIndex = vRSOuter_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
string HBadReason = vRSOuter_SaveCheckNote_RequestParams[i].param[j].HBadReason;
//鏍规嵁PNL鏉＄爜鎵惧埌PNL瀵逛簬鐨凱NL甯冨眬淇℃伅銆傜劧鍚庢牴鎹甈CS鍙峰湪PNL甯冨眬淇℃伅涓壘鍒癙CS瀵瑰簲鐨剆et鍙�
@@ -715,7 +715,7 @@
"," + HPosition_x + "" +
"," + HPosition_y + "" +
",'" + HCheckProc + "'" +
- "," + HPageIndex + "" +
+ ",'" + HPageIndex + "'" +
",'" + HBadReason + "'" +
",'" + HMaker + "'" +
",getdate() " +
@@ -884,42 +884,35 @@
for (int j = 0; j < aVI_SaveCheckNote_RequestParams[i].param.Count; j++)
{
string HBarCode = aVI_SaveCheckNote_RequestParams[i].param[j].HBarCode;
- string HSetNo = "";
+ string HBarCode_PNL = "";
+ string HSetNo = HBarCode.Substring(HBarCode.Length - 2, 2);
string HPCSNo = aVI_SaveCheckNote_RequestParams[i].param[j].HPCSNo;
int HPosition_x = aVI_SaveCheckNote_RequestParams[i].param[j].HPosition_x;
int HPosition_y = aVI_SaveCheckNote_RequestParams[i].param[j].HPosition_y;
string HCheckProc = "AVI";
- int HPageIndex = aVI_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
+ string HPageIndex = aVI_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
string HBadReason = aVI_SaveCheckNote_RequestParams[i].param[j].HBadReason;
- //鏍规嵁PNL鏉＄爜鎵惧埌PNL瀵逛簬鐨凱NL甯冨眬淇℃伅銆傜劧鍚庢牴鎹甈CS鍙峰湪PNL甯冨眬淇℃伅涓壘鍒癙CS瀵瑰簲鐨剆et鍙�
- string sql_set = "" +
- "select distinct " +
- " b.HSetNo " +
- "from Gy_PNLInfo as a " +
- "inner join Gy_PNLInfoSub as b on a.HInterID = b.HInterID " +
- "where a.HLayOutName in " +
- " ( " +
- " select HLayOutName from Gy_BarCodeBill_PNL_Temp where HBarCode = '" + HBarCode + "' " +
- //" union " +
- //" select HLayOutName from Gy_BarCodeBill_PNL_His where HBarCode = '" + HBarCode + "' " +
- " ) " +
- "and b.HPCSNo = '" + HPCSNo + "' ";
- ds = oCN.RunProcReturn(sql_set, "Gy_PNLInfo");
+ //鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鎵�灞炵殑PNL鏉＄爜缂栧彿
+ string sql_PNLBarCode = "" +
+ //"select * from Gy_BarCodeBill_Set_His where HBarCode = '" + HBarCode + "' " +
+ //"union " +
+ "select * from Gy_BarCodeBill_Set_Temp where HBarCode = '" + HBarCode + "' ";
+ ds = oCN.RunProcReturn(sql_PNLBarCode, "Gy_BarCodeBill_Set_Temp");
if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
{
- HSetNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSetNo"]);
+ HBarCode_PNL = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_PNL"]);
}
string sql = "insert into QC_CheckNote_PNL_Temp(HBarCode,HSetNo,HPCSNo,HPosition_x,HPosition_y,HCheckProc,HPageIndex,HBadReason,HMaker,HMakeDate) " +
"values(" +
- "'" + HBarCode + "'" +
+ "'" + HBarCode_PNL + "'" +
",'" + HSetNo + "'" +
",'" + HPCSNo + "'" +
"," + HPosition_x + "" +
"," + HPosition_y + "" +
",'" + HCheckProc + "'" +
- "," + HPageIndex + "" +
+ ",'" + HPageIndex + "'" +
",'" + HBadReason + "'" +
",'" + HMaker + "'" +
",getdate() " +
@@ -1038,7 +1031,7 @@
int HPosition_x = dC_SaveCheckNote_RequestParams[i].param[j].HPosition_x;
int HPosition_y = dC_SaveCheckNote_RequestParams[i].param[j].HPosition_y;
string HCheckProc = "鐢垫祴";
- int HPageIndex = dC_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
+ string HPageIndex = dC_SaveCheckNote_RequestParams[i].param[j].HPageIndex;
string HBadReason = dC_SaveCheckNote_RequestParams[i].param[j].HBadReason;
//鏍规嵁set鏉＄爜缂栧彿锛岃幏鍙杝et鎵�灞炵殑PNL鏉＄爜缂栧彿
@@ -1060,7 +1053,7 @@
"," + HPosition_x + "" +
"," + HPosition_y + "" +
",'" + HCheckProc + "'" +
- "," + HPageIndex + "" +
+ ",'" + HPageIndex + "'" +
",'" + HBadReason + "'" +
",'" + HMaker + "'" +
",getdate() " +
--
Gitblit v1.9.1