From bdda209f00d8f03ab50acf7e219f71d7f68a375f Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 28 七月 2025 10:50:27 +0800
Subject: [PATCH] PDA扫描模块退出功能调用方法修改，缓存列表删除功能调用方法修改；凯贝客户条码生成模块流水号字段类型修改
---
WebAPI/Controllers/华远datamapping/HY_DataMappingController.cs | 203 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 172 insertions(+), 31 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..30f6587 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; //涓嶈壇鍘熷洜
}
@@ -286,6 +286,10 @@
[HttpGet]
public VRSInner_savePNLBarCodePosition_RequestResult VRSInner_savePNLBarCodePosition(string HBarCode_PNL,double HPNLPosition_x,double HPNLPosition_y)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐐．VRS鍐呭眰鎻愬彇涓婁紶PNL浜岀淮鐮佷綅缃��" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode_PNL锛�" + HBarCode_PNL + "锛汬PNLPosition_x锛�" + HPNLPosition_x + "锛汬PNLPosition_y" + HPNLPosition_y + "銆�");
+
VRSInner_savePNLBarCodePosition_RequestResult result = new VRSInner_savePNLBarCodePosition_RequestResult();
try
{
@@ -301,6 +305,8 @@
{
result.code = "0";
result.msg = "涓婁紶澶辫触锛侊紒鏂欏彿淇℃伅涓嶅瓨鍦紒锛�";
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
else
@@ -314,12 +320,16 @@
result.code = "1";
result.msg = "涓婁紶鎴愬姛";
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
{
result.code = "0";
result.msg = "" + e.Message;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -330,6 +340,10 @@
[HttpGet]
public VRSInner_getPNLBarCodePosition_RequestResult VRSInner_getPNLBarCodePosition(string HBarCode_PNL)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐐．VRS鍐呭眰鑾峰彇PNL浜岀淮鐮佷綅缃俊鎭��" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode_PNL锛�" + HBarCode_PNL + "銆�");
+
VRSInner_getPNLBarCodePosition_RequestResult result = new VRSInner_getPNLBarCodePosition_RequestResult();
List<VRSInner_getPNLBarCodePosition_RequestResult_data> dataList = new List<VRSInner_getPNLBarCodePosition_RequestResult_data>();
try
@@ -346,6 +360,8 @@
result.code = "0";
result.msg = "PNL浜岀淮鐮佺儳铓�浣嶇疆淇℃伅鑾峰彇澶辫触锛侊紒褰撳墠PNL浜岀淮鐮佸搴旀枡鍙锋湭璁剧疆榛樿鐑ц殌浣嶇疆锛侊紒";
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
@@ -361,6 +377,8 @@
result.code = "1";
result.msg = "";
result.data = dataList;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -368,6 +386,8 @@
result.code = "0";
result.msg = "" + e.Message;
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -378,6 +398,10 @@
[HttpPost]
public VRSInner_saveCheckNote_RequestResult VRSInner_saveCheckNote([FromBody] JObject sMainSub)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐐．VRS鍐呭眰妫�楠岀粨鏋滀笂浼犮��" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆恠MainSub锛�" + sMainSub + "銆�");
+
VRSInner_saveCheckNote_RequestResult result = new VRSInner_saveCheckNote_RequestResult();
string msg_success = "";
try
@@ -400,7 +424,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 +454,7 @@
"," + HPosition_x + "" +
"," + HPosition_y + "" +
",'" + HCheckProc + "'" +
- "," + HPageIndex + "" +
+ ",'" + HPageIndex + "'" +
",'" + HBadReason + "'" +
",'" + HMaker + "'" +
",getdate() " +
@@ -444,6 +468,8 @@
oCN.Commit();
result.code = "1";
result.msg = "涓婁紶鎴愬姛锛侊紒" + msg_success;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -451,6 +477,8 @@
oCN.RollBack();
result.code = "0";
result.msg = "涓婁紶澶辫触锛侊紒" + e.Message;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -461,6 +489,10 @@
[HttpGet]
public VRSOuter_saveSetBarCodePosition_RequestResult VRSOuter_saveSetBarCodePosition(string HBarCode_Set, double HSetPosition_x, double HSetPosition_y)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐐．VRS澶栧眰鎻愬彇涓婁紶set浜岀淮鐮佷綅缃��" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode_Set锛�" + HBarCode_Set + "锛汬SetPosition_x锛�" + HSetPosition_x + "锛汬SetPosition_y" + HSetPosition_y + "銆�");
+
VRSOuter_saveSetBarCodePosition_RequestResult result = new VRSOuter_saveSetBarCodePosition_RequestResult();
try
{
@@ -482,6 +514,8 @@
{
result.code = "0";
result.msg = "涓婁紶澶辫触锛侊紒鏂欏彿淇℃伅涓嶅瓨鍦紒锛�";
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
else
@@ -502,12 +536,16 @@
result.code = "1";
result.msg = "涓婁紶鎴愬姛";
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
{
result.code = "0";
result.msg = "" + e.Message;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -518,6 +556,10 @@
[HttpGet]
public VRSOuter_getSetBarCodePosition_RequestResult VRSOuter_getSetBarCodePosition(string HBarCode_Set)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐐．VRS澶栧眰鑾峰彇Set浜岀淮鐮佷綅缃俊鎭��" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode_Set锛�" + HBarCode_Set + "銆�");
+
VRSOuter_getSetBarCodePosition_RequestResult result = new VRSOuter_getSetBarCodePosition_RequestResult();
List<VRSOuter_getSetBarCodePosition_RequestResult_data> dataList = new List<VRSOuter_getSetBarCodePosition_RequestResult_data>();
try
@@ -540,6 +582,8 @@
result.code = "0";
result.msg = "Set浜岀淮鐮佺儳铓�浣嶇疆淇℃伅鑾峰彇澶辫触锛侊紒褰撳墠Set浜岀淮鐮佸搴旀枡鍙锋湭璁剧疆榛樿鐑ц殌浣嶇疆锛侊紒";
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
@@ -555,6 +599,8 @@
result.code = "1";
result.msg = "";
result.data = dataList;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -562,6 +608,8 @@
result.code = "0";
result.msg = "" + e.Message;
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -575,17 +623,37 @@
/// <returns></returns>
[Route("VRSInner/VRSInner_getBarCodeBill_PNL")]
[HttpGet]
- public object VRSInner_getBarCodeBill_PNL(string HLayOutName, string HMaker)
+ public object VRSInner_getBarCodeBill_PNL(string HLayOutName, string HMaker, string HBatchNo)
{
try
{
- ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_PNL_Temp_Insert '" + HLayOutName + "','" + HMaker + "'", "h_p_Gy_BarCodeBill_PNL_Temp_Insert");
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐢宠PNL鏉＄爜銆�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘LayOutName锛�" + HLayOutName + "锛汬Maker:" + HMaker + "銆�");
+
+ string sql_checkPNLInfo = "select * from Gy_PNLInfo where HLayOutName = '" + HLayOutName + "'";
+ DataSet ds_checkPNLInfo = oCN.RunProcReturn(sql_checkPNLInfo, "Gy_PNLInfo");
+ if (ds_checkPNLInfo == null || ds_checkPNLInfo.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏂欏彿瀵瑰簲鐨凙OI鏈淮鎶わ紒锛�";
+ objJsonResult.data = null;
+
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_PNL_Temp_Insert '" + HLayOutName + "','" + HMaker + "','" + HBatchNo + "'" , "h_p_Gy_BarCodeBill_PNL_Temp_Insert");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍐欏叆鑾峰彇PNL鏉＄爜鏃跺彂鐢熼敊璇紒";
objJsonResult.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
return objJsonResult;
}
else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
@@ -594,6 +662,8 @@
objJsonResult.count = 0; //澶辫触锛�
objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
objJsonResult.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
return objJsonResult;
}
else
@@ -602,6 +672,8 @@
objJsonResult.count = 1; //鎴愬姛锛�
objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
objJsonResult.data = ds.Tables[0].Rows[0]["HBarCode"].ToString();
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
return objJsonResult;
}
}
@@ -611,6 +683,8 @@
objJsonResult.count = 0;
objJsonResult.Message = "鐢宠PNL鏉＄爜鎺ュ彛澶辫触锛�" + e.ToString();
objJsonResult.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
return objJsonResult;
}
}
@@ -622,6 +696,10 @@
[HttpGet]
public VRSOuter_getDataMapping_RequestResult VRSOuter_getDataMapping(string HBarCode)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐐．VRS鑾峰彇datamapping淇℃伅銆�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode锛�" + HBarCode + "銆�");
+
VRSOuter_getDataMapping_RequestResult result = new VRSOuter_getDataMapping_RequestResult();
List<VRSOuter_getDataMapping_RequestResult_data> dataList = new List<VRSOuter_getDataMapping_RequestResult_data>();
try
@@ -646,6 +724,8 @@
result.code = "1";
result.msg = "";
result.data = dataList;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -653,6 +733,8 @@
result.code = "0";
result.msg = "" + e.Message;
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -663,6 +745,10 @@
[HttpPost]
public VRSOuter_saveCheckNote_RequestResult VRSOuter_saveCheckNote([FromBody] JObject sMainSub)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐐．VRS澶栧眰妫�楠岀粨鏋滀笂浼犮��" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆恠MainSub锛�" + sMainSub + "銆�");
+
VRSOuter_saveCheckNote_RequestResult result = new VRSOuter_saveCheckNote_RequestResult();
string msg_success = "";
try
@@ -685,7 +771,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 +801,7 @@
"," + HPosition_x + "" +
"," + HPosition_y + "" +
",'" + HCheckProc + "'" +
- "," + HPageIndex + "" +
+ ",'" + HPageIndex + "'" +
",'" + HBadReason + "'" +
",'" + HMaker + "'" +
",getdate() " +
@@ -729,6 +815,8 @@
oCN.Commit();
result.code = "1";
result.msg = "涓婁紶鎴愬姛锛侊紒" + msg_success;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -736,6 +824,8 @@
oCN.RollBack();
result.code = "0";
result.msg = "涓婁紶澶辫触锛侊紒" + e.Message;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -751,6 +841,10 @@
[HttpGet]
public object VRSOuter_getBarCodeBill_SET(string HBarCode_PNL, string HMaker)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐐．VRS澶栧眰鐢宠set鏉＄爜銆�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode_PNL锛�" + HBarCode_PNL + "锛汬Maker:" + HMaker + "銆�");
+
try
{
ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_Set_Temp_Insert '" + HBarCode_PNL + "','" + HMaker + "'", "h_p_Gy_BarCodeBill_Set_Temp_Insert");
@@ -760,6 +854,8 @@
objJsonResult.count = 0;
objJsonResult.Message = "鍐欏叆鑾峰彇SET鏉＄爜鏃跺彂鐢熼敊璇紒";
objJsonResult.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
return objJsonResult;
}
else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
@@ -768,6 +864,8 @@
objJsonResult.count = 0; //澶辫触锛�
objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
objJsonResult.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
return objJsonResult;
}
else
@@ -782,6 +880,8 @@
objJsonResult.count = 1; //鎴愬姛锛�
objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
objJsonResult.data = HBarCodeList;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
return objJsonResult;
}
}
@@ -791,6 +891,8 @@
objJsonResult.count = 0;
objJsonResult.Message = "鐢宠SET鏉＄爜鎺ュ彛澶辫触锛�" + e.ToString();
objJsonResult.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(objJsonResult) + "銆�");
+ LogService.Write("==============================================================================================");
return objJsonResult;
}
}
@@ -802,6 +904,10 @@
[HttpGet]
public AVI_getDataMapping_RequestResult AVI_getDataMapping(string HBarCode)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("AVI鑾峰彇datamapping鏁版嵁銆�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode锛�" + HBarCode + "銆�");
+
AVI_getDataMapping_RequestResult result = new AVI_getDataMapping_RequestResult();
List<AVI_getDataMapping_RequestResult_data> dataList = new List<AVI_getDataMapping_RequestResult_data>();
try
@@ -822,6 +928,8 @@
result.code = "0";
result.msg = "mapping淇℃伅鑾峰彇澶辫触锛侊紒set鏉＄爜涓嶅瓨鍦紒锛�";
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
@@ -850,6 +958,8 @@
result.code = "1";
result.msg = "";
result.data = dataList;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -857,6 +967,8 @@
result.code = "0";
result.msg = "" + e.Message;
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -867,6 +979,10 @@
[HttpPost]
public AVI_saveCheckNote_RequestResult AVI_saveCheckNote([FromBody] JObject sMainSub)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("AVI妫�楠岀粨鏋滀笂浼犮��" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆恠MainSub锛�" + sMainSub + "銆�");
+
AVI_saveCheckNote_RequestResult result = new AVI_saveCheckNote_RequestResult();
string msg_success = "";
try
@@ -884,42 +1000,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() " +
@@ -933,6 +1042,8 @@
oCN.Commit();
result.code = "1";
result.msg = "涓婁紶鎴愬姛锛侊紒" + msg_success;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -940,6 +1051,8 @@
oCN.RollBack();
result.code = "0";
result.msg = "涓婁紶澶辫触锛侊紒" + e.Message;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -950,6 +1063,10 @@
[HttpGet]
public DC_getDataMapping_RequestResult DC_getDataMapping(string HBarCode)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐢垫祴鑾峰彇datamapping鏁版嵁銆�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode锛�" + HBarCode + "銆�");
+
DC_getDataMapping_RequestResult result = new DC_getDataMapping_RequestResult();
List<DC_getDataMapping_RequestResult_data> dataList = new List<DC_getDataMapping_RequestResult_data>();
try
@@ -970,6 +1087,8 @@
result.code = "0";
result.msg = "mapping淇℃伅鑾峰彇澶辫触锛侊紒set鏉＄爜涓嶅瓨鍦紒锛�";
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
@@ -998,6 +1117,8 @@
result.code = "1";
result.msg = "";
result.data = dataList;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -1005,6 +1126,8 @@
result.code = "0";
result.msg = "" + e.Message;
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -1015,6 +1138,10 @@
[HttpPost]
public DC_saveCheckNote_RequestResult DC_saveCheckNote([FromBody] JObject sMainSub)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("鐢垫祴妫�楠岀粨鏋滀笂浼犮��" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆恠MainSub锛�" + sMainSub + "銆�");
+
DC_saveCheckNote_RequestResult result = new DC_saveCheckNote_RequestResult();
string msg_success = "";
try
@@ -1038,7 +1165,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 +1187,7 @@
"," + HPosition_x + "" +
"," + HPosition_y + "" +
",'" + HCheckProc + "'" +
- "," + HPageIndex + "" +
+ ",'" + HPageIndex + "'" +
",'" + HBadReason + "'" +
",'" + HMaker + "'" +
",getdate() " +
@@ -1074,6 +1201,8 @@
oCN.Commit();
result.code = "1";
result.msg = "涓婁紶鎴愬姛锛侊紒" + msg_success;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -1081,6 +1210,8 @@
oCN.RollBack();
result.code = "0";
result.msg = "涓婁紶澶辫触锛侊紒" + e.Message;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
@@ -1091,6 +1222,10 @@
[HttpGet]
public JGG_getDataMapping_RequestResult JGG_getDataMapping(string HBarCode)
{
+ LogService.Write("==============================================================================================");
+ LogService.Write("婵�鍏夊壊鑾峰彇datamapping鏁版嵁銆�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "銆�");
+ LogService.Write("閫掑叆鍙傛暟銆怘BarCode锛�" + HBarCode + "銆�");
+
JGG_getDataMapping_RequestResult result = new JGG_getDataMapping_RequestResult();
List<JGG_getDataMapping_RequestResult_data> dataList = new List<JGG_getDataMapping_RequestResult_data>();
try
@@ -1111,6 +1246,8 @@
result.code = "0";
result.msg = "mapping淇℃伅鑾峰彇澶辫触锛侊紒set鏉＄爜涓嶅瓨鍦紒锛�";
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
@@ -1139,6 +1276,8 @@
result.code = "1";
result.msg = "";
result.data = dataList;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
catch (Exception e)
@@ -1146,6 +1285,8 @@
result.code = "0";
result.msg = "" + e.Message;
result.data = null;
+ LogService.Write("杩斿洖淇℃伅锛氥��" + JsonConvert.SerializeObject(result) + "銆�");
+ LogService.Write("==============================================================================================");
return result;
}
}
--
Gitblit v1.9.1