From 22a0e18fcd802281f75e74c33ca62ddf7facc40f Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期四, 29 九月 2022 15:57:18 +0800
Subject: [PATCH] 生产汇报单扫码方法完善，上传方法中写入日志内容修改
---
CLOUDWEB/WebService1.asmx.cs | 64 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 10 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 06c7630..157623e 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -4403,6 +4403,7 @@
/// <returns></returns>
public bool SaveICMOReportBill_ICMO_CLD(Model.ClsSc_ICMOReportBillMain oMain, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
+ string sRemark = "";
//浠庨厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
{
@@ -4428,6 +4429,8 @@
string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+ sRemark = sRemark + " 锛涜幏鍙栭獙璇丆LOUD璐﹀彿瀵嗙爜" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
try
{
@@ -4476,6 +4479,8 @@
") ");
//鏇存柊鍏宠仈鏁伴噺
oCn.RunProc("exec h_p_Sc_UpDateRelation_ICMOToICMOReport_Add " + oMain.HInterID.ToString());
+
+ sRemark = sRemark + " 锛涚敓鎴愬嚭鍏ュ簱鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
@@ -4671,14 +4676,20 @@
string sJson_End = " ] }}";
string sJson = sJson_Main + sJson_Entry + sJson_End;
+ sRemark = sRemark + " 锛涜幏鍙朇LOUD鍗曟嵁API閫掑叆鍊�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
//鐢熸垚閲戣澏浜戝崟鎹�
if (bLogin)
{
var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save",
new object[] { "PRD_MORPT", sJson });
+ sRemark = sRemark + " 锛涚敓鎴怌LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
//鐢熸垚鍗曟嵁鍚庢洿鏂拌嚜瀹氫箟瀛楁
oCn.RunProc("exec h_p_Sc_UpDateSelfFildICMOReport '" + oMain.HBillNo + "','" + sHSourceType + "'");
+
+ sRemark = sRemark + " 锛涚敓鎴愬崟鎹悗鍥炲～瀛楁淇℃伅" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result.ToString();
@@ -4697,7 +4708,7 @@
{
oCn.RunProc("exec h_p_WMS_UpdateSourceByBarCodeBill_ICMOReportBill '" + oMain.HBillNo + "'");
}
- LogService.Write("鐢熸垚鐢熶骇姹囨姤鍗曪紙婧愬崟锛氱敓浜ц鍗曪級鎴愬姛锛�" + sJson);
+ sRemark = sRemark + sJson;
oCn.Commit();
}
}
@@ -4711,6 +4722,7 @@
}
catch (Exception e)
{
+ LogService.Write("鐢熸垚鍥炴粴" + sRemark);
sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
@@ -4738,12 +4750,14 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
oCn.RollBack();
return true;
}
else
{
+ LogService.Write("鐢熸垚骞跺鏍哥敓浜ф眹鎶ュ崟锛堟簮鍗曪細鐢熶骇璁㈠崟锛夋垚鍔燂紒" + sRemark);
sErrMsg = "鐢熸垚骞跺鏍哥敓浜ф眹鎶ュ崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
oCn.Commit();
return true;
@@ -4751,6 +4765,7 @@
}
catch (Exception e)
{
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark);
sErrMsg = "瀹℃牳鐢熶骇姹囨姤鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
@@ -4758,6 +4773,7 @@
}
else
{
+ LogService.Write("鐢熸垚鐢熶骇姹囨姤鍗曪紙婧愬崟锛氱敓浜ц鍗曪級鎴愬姛锛�" + sRemark);
sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + oMain.HBillNo;
return true;
}
@@ -39492,7 +39508,7 @@
Model.ClsKf_ICStockBill_WMS oBar = new Model.ClsKf_ICStockBill_WMS();
Int64 sMulSourceFlag = 0; //澶氭簮鍗曟爣蹇楋紙0涓洪潪澶氭簮鍗曟ā寮忥紝1涓哄婧愬崟妯″紡锛�
- if (oSystemParameterMain.Kf_OtherInBill_MulSourceBill.ToUpper() == "Y") //绯荤粺鍙傛暟 鍏朵粬鍏ュ簱鍗�-澶氭簮鍗曟ā寮�
+ if (oSystemParameterMain.Sc_ICMOReportBill_MulSourceBill.ToUpper() == "Y") //绯荤粺鍙傛暟 鐢熶骇姹囨姤鍗�-澶氭簮鍗曟ā寮�
{
sMulSourceFlag = 1;
}
@@ -41537,6 +41553,7 @@
string sOneScanCtl = "N"; //涓�娆℃壂鐮佹帶鍒讹紙'Y'涓烘帶鍒讹級
string sFIFOCtl = "N"; //鍏堣繘鍏堝嚭鎺у埗锛�'Y'涓烘帶鍒讹級
string sMulSourceCtl = "N"; //鏄惁鍚敤澶氭簮鍗曟壂鐮佹ā寮忥紙'Y'涓哄惎鐢級
+ int sWHSPCtl = 0; //鐣岄潰浠撳簱涓虹┖鏃讹紝鍊煎彉涓�1
//鏍规嵁鍗曟嵁绫诲瀷锛岃幏鍙栧搴斿崟鎹郴缁熷弬鏁板��
if (get_SystemParameter_BarCode(HBillType, oSystemParameterMain, ref sSourceBillCtl, ref sBatchNoCtl, ref sMultilineCtl, ref sMustQtyCtl, ref sMaterWHSPCtl, ref sSourceWHSPCtl, ref sOneScanCtl, ref sFIFOCtl, ref sMulSourceCtl, ref sErrMsg))
@@ -41554,6 +41571,10 @@
if (oBar == null)
{
return null;
+ }
+ else
+ {
+ SourceFlag = true;
}
}
else
@@ -41585,8 +41606,13 @@
omodel_View.HMaterID = DBUtility.ClsPub.isLong(dsSource.Tables[0].Rows[0]["HMaterID"]);
omodel_View.HSourceInterID = DBUtility.ClsPub.isLong(dsSource.Tables[0].Rows[0]["HSourceInterID"]);
omodel_View.HSourceQty = DBUtility.ClsPub.isDoule(dsSource.Tables[0].Rows[0]["HSumQtyMust"]); //HSumQtyMust涓烘簮鍗曠浉鍚岀墿鏂欏墿浣欏彲鎵暟閲�
- omodel_View.HWHID = DBUtility.ClsPub.isLong(dsSource.Tables[0].Rows[0]["HWhID"]);
- omodel_View.HSPID = DBUtility.ClsPub.isLong(dsSource.Tables[0].Rows[0]["HSPID"]);
+ //鑾峰彇浠撳簱浠撲綅淇℃伅
+ if (HWhID == 0)
+ {
+ HWhID = DBUtility.ClsPub.isLong(dsSource.Tables[0].Rows[0]["HWhID"]);
+ HSPID = DBUtility.ClsPub.isLong(dsSource.Tables[0].Rows[0]["HSPID"]);
+ sWHSPCtl = 1;
+ }
HMaterNumber = DBUtility.ClsPub.isStrNull(dsSource.Tables[0].Rows[0]["HMaterNumber"]);
}
else
@@ -41820,15 +41846,32 @@
{
//鏍规嵁浠撳簱ID锛屽垽鏂槸鍚﹀惎鐢ㄤ粨浣�
DataSet dsInWH = oCn.RunProcReturn(" select HSPFlag from Gy_Warehouse with(nolock) where HItemID= " + HWhID.ToString() + " and HUSEORGID= " + HStockOrgID.ToString(), "Gy_Warehouse");
- if (dsInWH == null || dsInWH.Tables[0].Rows.Count == 0)
+
+ if (sWHSPCtl == 1)
{
- sErrMsg = "鎵�閫変粨搴撲笉灞炰簬褰撳墠鐧诲叆缁勭粐锛�";
- return null;
+ if (dsInWH == null || dsInWH.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "婧愬崟鎴栫墿鏂欓粯璁や粨搴撶淮鎶や俊鎭敊璇紝璇烽噸鏂扮淮鎶ゆ纭粨搴撲俊鎭紒";
+ return null;
+ }
+ else if (HSPID == 0 && DBUtility.ClsPub.isBool(dsInWH.Tables[0].Rows[0]["HSPFlag"]) == true)
+ {
+ sErrMsg = "婧愬崟鎴栫墿鏂欎腑鎵�缁存姢鐨勪粨搴撳惎鐢ㄤ簡浠撲綅锛屼絾娌℃湁缁存姢浠撲綅淇℃伅锛岃鍏堢淮鎶ゅソ浠撲綅淇℃伅锛�";
+ return null;
+ }
}
- else if (HSPID == 0 && DBUtility.ClsPub.isBool(dsInWH.Tables[0].Rows[0]["HSPFlag"]) == true)
+ else
{
- sErrMsg = "鎵�閫変粨搴撳惎鐢ㄤ簡浠撲綅锛屼粨浣嶄笉鍏佽涓虹┖锛岃閫夋嫨瀵瑰簲浠撲綅锛�";
- return null;
+ if (dsInWH == null || dsInWH.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "鎵�閫変粨搴撲笉灞炰簬褰撳墠鐧诲叆缁勭粐锛�";
+ return null;
+ }
+ else if (HSPID == 0 && DBUtility.ClsPub.isBool(dsInWH.Tables[0].Rows[0]["HSPFlag"]) == true)
+ {
+ sErrMsg = "鎵�閫変粨搴撳惎鐢ㄤ簡浠撲綅锛屼粨浣嶄笉鍏佽涓虹┖锛岃閫夋嫨瀵瑰簲浠撲綅锛�";
+ return null;
+ }
}
}
@@ -41980,6 +42023,7 @@
break;
}
}
+ oBar.HBarType = "鐗╂枡鏉＄爜";
return oBar;
}
--
Gitblit v1.9.1