From 2737388a420566ce7b2e1ac2f9df02724dca5590 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 23 一月 2025 09:58:16 +0800
Subject: [PATCH] 全部扫码上传生成单据调用方法修改，金蝶云报错提示内容优化，增加根据参数判断生成单据时是否直接提交单据功能
---
CLOUDWEB/WebService1.asmx.cs | 2717 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 2,369 insertions(+), 348 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index bf8adab..dfde572 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -4794,7 +4794,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐢熶骇姹囨姤鍗曪紙婧愬崟锛氱敓浜ц鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -4861,7 +4861,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -4908,7 +4908,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -6757,7 +6757,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鍙戣揣璋冩嫧鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鐢熸垚鍙戣揣璋冩嫧鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐩存帴璋冩嫧鍗曪紙婧愬崟锛氬彂璐ч�氱煡鍗曪級澶辫触-鏃ф柟娉曪紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -6835,7 +6835,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鍙戣揣璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鍙戣揣璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -6882,7 +6882,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鍙戣揣璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鍙戣揣璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -9101,7 +9101,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐩存帴璋冩嫧鍗曪紙婧愬崟锛氱敓浜х敤鏂欐竻鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -9163,7 +9163,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -9210,7 +9210,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -9564,7 +9564,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐩存帴璋冩嫧鍗曪紙婧愬崟锛氬澶栫敤鏂欐竻鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -9626,7 +9626,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -9673,7 +9673,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -10053,7 +10053,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐩存帴璋冩嫧鍗曪紙婧愬崟锛氬彂璐ч�氱煡鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -10115,7 +10115,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -10162,7 +10162,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -10536,7 +10536,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐩存帴璋冩嫧鍗曪紙婧愬崟锛氳皟鎷ㄧ敵璇峰崟锛夊け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -10598,7 +10598,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -10645,7 +10645,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -11002,7 +11002,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐩存帴璋冩嫧鍗曪紙婧愬崟锛氬嚭搴撶敵璇峰崟锛夊け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -11064,7 +11064,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -11111,7 +11111,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -11468,7 +11468,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐩存帴璋冩嫧鍗曪紙婧愬崟锛氱敓浜у彂鏂欓�氱煡鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -11530,7 +11530,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -11577,7 +11577,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -11939,7 +11939,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐩存帴璋冩嫧鍗曪紙婧愬崟锛氱敓浜у鏂欏崟锛夊け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -12001,7 +12001,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -12048,7 +12048,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -12408,7 +12408,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐩存帴璋冩嫧鍗曪紙婧愬崟锛氭棤婧愬崟锛夊け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -12470,7 +12470,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -12517,7 +12517,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
@@ -12804,7 +12804,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + HReturn); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -12882,7 +12882,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙淇敼鐩存帴璋冩嫧鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙淇敼鐩存帴璋冩嫧鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙淇敼鐩存帴璋冩嫧鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -12912,7 +12912,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -13134,7 +13134,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_MoveStockStepOutBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MoveStockStepOutBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -13173,7 +13173,7 @@
sRemark = sRemark + " 锛涚敓鎴愬嚭鍏ュ簱鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
//鍒ゆ柇鏄惁鍚敤鍣ㄥ叿绠＄悊锛岀郴缁熷弬鏁� 鍚敤鍣ㄥ叿绠＄悊
- if (oSystemParameterMain.WMS_MouldManagerCtl == "Y")
+ if (oSystemParameterMain.WMS_MouldManagerCtl.ToUpper() == "Y")
{
string HMouldBillType = "3840";
oCn.RunProc("EXEC h_p_Sc_MouldStockBill_Insert_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillType + "','" + HMouldBillType + "'," + oMain.HSupID.ToString() + "," + oMain.HKeeperID.ToString() + "," + oMain.HSecManagerID.ToString() + "," + oMain.HDeptID.ToString() + ",3");
@@ -13183,7 +13183,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_MoveStockRequest_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -13205,7 +13205,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_MoveStockStepOutBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MoveStockStepOutBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -13395,7 +13395,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鐢熸垚鍒嗘寮忚皟鍑哄崟锛堟簮鍗曪細璋冩嫧鐢宠鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -13416,19 +13425,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_MoveStockStepOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_MoveStockStepOutBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -13436,16 +13445,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "STK_TRANSFEROUT", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "STK_TRANSFEROUT", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -13459,8 +13481,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鍒嗘寮忚皟鍑哄崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_MoveStockStepOutBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "STK_TRANSFEROUT", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟鎴愬姛锛屾彁浜ゅ崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ゅ垎姝ュ紡璋冨嚭鍗曪紙婧愬崟锛氳皟鎷ㄧ敵璇峰崟锛夋垚鍔燂紒" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ゅ垎姝ュ紡璋冨嚭鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鍒嗘寮忚皟鍑哄崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
@@ -13517,7 +13586,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_MoveStockStepOutBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MoveStockStepOutBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -13556,7 +13625,7 @@
sRemark = sRemark + " 锛涚敓鎴愬嚭鍏ュ簱鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
//鍒ゆ柇鏄惁鍚敤鍣ㄥ叿绠＄悊锛岀郴缁熷弬鏁� 鍚敤鍣ㄥ叿绠＄悊
- if (oSystemParameterMain.WMS_MouldManagerCtl == "Y")
+ if (oSystemParameterMain.WMS_MouldManagerCtl.ToUpper() == "Y")
{
string HMouldBillType = "3840";
oCn.RunProc("EXEC h_p_Sc_MouldStockBill_Insert_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillType + "','" + HMouldBillType + "'," + oMain.HSupID.ToString() + "," + oMain.HKeeperID.ToString() + "," + oMain.HSecManagerID.ToString() + "," + oMain.HDeptID.ToString() + ",3");
@@ -13566,7 +13635,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_SeOutStock_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_SeOutStock_PUBCLD");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -13589,7 +13658,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_MoveStockStepOutBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MoveStockStepOutBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -13811,7 +13880,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鐢熸垚鍒嗘寮忚皟鍑哄崟锛堟簮鍗曪細鍙戣揣閫氱煡鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -13832,19 +13910,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_MoveStockStepOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_MoveStockStepOutBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -13852,16 +13930,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "STK_TRANSFEROUT", sJson2 }); //鎻愪氦鍗曟嵁
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "STK_TRANSFEROUT", sJson3 }); //瀹℃牳鍗曟嵁
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -13875,8 +13966,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鍒嗘寮忚皟鍑哄崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_MoveStockStepOutBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "STK_TRANSFEROUT", sJson2 }); //鎻愪氦鍗曟嵁
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟鎴愬姛锛屾彁浜ゅ崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ゅ垎姝ュ紡璋冨嚭鍗曪紙婧愬崟锛氬彂璐ч�氱煡鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ゅ垎姝ュ紡璋冨嚭鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鍒嗘寮忚皟鍑哄崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
@@ -13933,7 +14071,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_MoveStockStepOutBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MoveStockStepOutBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -13971,7 +14109,7 @@
sRemark = sRemark + " 锛涚敓鎴愬嚭鍏ュ簱鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
//鍒ゆ柇鏄惁鍚敤鍣ㄥ叿绠＄悊锛岀郴缁熷弬鏁� 鍚敤鍣ㄥ叿绠＄悊
- if (oSystemParameterMain.WMS_MouldManagerCtl == "Y")
+ if (oSystemParameterMain.WMS_MouldManagerCtl.ToUpper() == "Y")
{
string HMouldBillType = "3840";
oCn.RunProc("EXEC h_p_Sc_MouldStockBill_Insert_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillType + "','" + HMouldBillType + "'," + oMain.HSupID.ToString() + "," + oMain.HKeeperID.ToString() + "," + oMain.HSecManagerID.ToString() + "," + oMain.HDeptID.ToString() + ",3");
@@ -13981,7 +14119,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepOutBill_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepOutBill_PUBCLD");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -14003,7 +14141,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_MoveStockStepOutBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MoveStockStepOutBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -14201,7 +14339,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鐢熸垚鍒嗘寮忚皟鍑哄崟锛堟簮鍗曪細鏃犳簮鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -14222,19 +14369,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_MoveStockStepOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_MoveStockStepOutBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -14242,16 +14389,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "STK_TRANSFEROUT", sJson2 }); //鎻愪氦鍗曟嵁
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "STK_TRANSFEROUT", sJson3 }); //瀹℃牳鍗曟嵁
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -14265,8 +14425,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鍒嗘寮忚皟鍑哄崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_MoveStockStepOutBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "STK_TRANSFEROUT", sJson2 }); //鎻愪氦鍗曟嵁
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍒嗘寮忚皟鍑哄崟鎴愬姛锛屾彁浜ゅ崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ゅ垎姝ュ紡璋冨嚭鍗曪紙婧愬崟锛氭棤婧愬崟锛夋垚鍔燂紒" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ゅ垎姝ュ紡璋冨嚭鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鍒嗘寮忚皟鍑哄崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
@@ -14400,7 +14607,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_MoveStockStepInBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MoveStockStepInBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -14439,7 +14646,7 @@
sRemark = sRemark + " 锛涚敓鎴愬嚭鍏ュ簱鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
//鍒ゆ柇鏄惁鍚敤鍣ㄥ叿绠＄悊锛岀郴缁熷弬鏁� 鍚敤鍣ㄥ叿绠＄悊
- if (oSystemParameterMain.WMS_MouldManagerCtl == "Y")
+ if (oSystemParameterMain.WMS_MouldManagerCtl.ToUpper() == "Y")
{
string HMouldBillType = "3841";
oCn.RunProc("EXEC h_p_Sc_MouldStockBill_Insert_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillType + "','" + HMouldBillType + "'," + oMain.HSupID.ToString() + "," + oMain.HKeeperID.ToString() + "," + oMain.HSecManagerID.ToString() + "," + oMain.HDeptID.ToString() + ",3");
@@ -14449,7 +14656,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockStepInBill_MoveStockStepOut_PUBCLD");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -14472,7 +14679,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_MoveStockStepInBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MoveStockStepInBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -14693,7 +14900,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鍒嗘寮忚皟鍏ュ崟澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍒嗘寮忚皟鍏ュ崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鐢熸垚鍒嗘寮忚皟鍏ュ崟锛堟簮鍗曪細鍒嗘寮忚皟鍑哄崟锛夊け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -14714,19 +14930,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鍒嗘寮忚皟鍏ュ崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_MoveStockStepInBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_MoveStockStepInBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -14734,16 +14950,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "STK_TRANSFERIN", sJson2 }); //鎻愪氦鍗曟嵁
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "STK_TRANSFERIN", sJson3 }); //瀹℃牳鍗曟嵁
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚鍒嗘寮忚皟鍏ュ崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍒嗘寮忚皟鍏ュ崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -14757,8 +14986,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鍒嗘寮忚皟鍏ュ崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_MoveStockStepInBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "STK_TRANSFERIN", sJson2 }); //鎻愪氦鍗曟嵁
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍒嗘寮忚皟鍏ュ崟鎴愬姛锛屾彁浜ゅ崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ゅ垎姝ュ紡璋冨叆鍗曪紙婧愬崟锛氬垎姝ュ紡璋冨嚭鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ゅ垎姝ュ紡璋冨叆鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鍒嗘寮忚皟鍏ュ崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
@@ -15880,7 +16156,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_SellOutBackBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_SellOutBackBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -15918,7 +16194,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOutStockBack_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOutStockBack_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -15940,7 +16216,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_SellOutBackBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_SellOutBackBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -16181,7 +16457,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚閿�鍞��璐у崟澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閿�鍞��璐у崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鐢熸垚閿�鍞��璐у崟锛堟簮鍗曪細閫�璐ч�氱煡鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -16202,19 +16487,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚閿�鍞��璐у崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_SellOutBackBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_SellOutBackBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -16222,16 +16507,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "SAL_RETURNSTOCK", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "SAL_RETURNSTOCK", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚閿�鍞��璐у崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閿�鍞��璐у崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -16245,8 +16543,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳閿�鍞��璐у崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_SellOutBackBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "SAL_RETURNSTOCK", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閿�鍞��璐у崟鎴愬姛锛屾彁浜ゅ崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ら攢鍞��璐у崟锛堟簮鍗曪細閫�璐ч�氱煡鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ら攢鍞��璐у崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦閿�鍞��璐у崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
@@ -16304,7 +16649,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_SellOutBackBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_SellOutBackBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -16342,7 +16687,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBackBill_SeOrder_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBackBill_SeOrder_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -16364,7 +16709,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_SellOutBackBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_SellOutBackBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -16607,7 +16952,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚閿�鍞��璐у崟澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閿�鍞��璐у崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鐢熸垚閿�鍞��璐у崟锛堟簮鍗曪細閿�鍞鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -16628,19 +16982,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚閿�鍞��璐у崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_SellOutBackBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_SellOutBackBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -16648,16 +17002,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "SAL_RETURNSTOCK", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "SAL_RETURNSTOCK", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚閿�鍞��璐у崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閿�鍞��璐у崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -16671,8 +17038,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳閿�鍞��璐у崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_SellOutBackBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "SAL_RETURNSTOCK", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閿�鍞��璐у崟鎴愬姛锛屾彁浜ゅ崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ら攢鍞��璐у崟锛堟簮鍗曪細閿�鍞鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ら攢鍞��璐у崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦閿�鍞��璐у崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
@@ -17993,7 +18407,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_SellOutBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_SellOutBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -18031,7 +18445,7 @@
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOrder_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOrder_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -18053,7 +18467,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_SellOutBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_SellOutBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -18309,7 +18723,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鐢熸垚閿�鍞嚭搴撳崟锛堟簮鍗曪細閿�鍞鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -18330,19 +18753,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_SellOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_SellOutBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -18350,16 +18773,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "SAL_OUTSTOCK", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "SAL_OUTSTOCK", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -18373,8 +18809,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳閿�鍞嚭搴撳崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_SellOutBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "SAL_OUTSTOCK", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛屾彁浜ゅ崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ら攢鍞嚭搴撳崟锛堟簮鍗曪細閿�鍞鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ら攢鍞嚭搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦閿�鍞嚭搴撳崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
@@ -18431,7 +18914,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_SellOutBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_SellOutBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -18469,7 +18952,7 @@
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_SeOutStock_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_SeOutStock_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -18497,7 +18980,7 @@
sIsEntryBatchFill = "false";
}
- if (oSystemParameterMain.Kf_SellOutBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_SellOutBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -18754,7 +19237,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鐢熸垚閿�鍞嚭搴撳崟锛堟簮鍗曪細鍙戣揣閫氱煡鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -18775,19 +19267,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_SellOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_SellOutBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -18795,16 +19287,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "SAL_OUTSTOCK", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "SAL_OUTSTOCK", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -18818,8 +19323,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳閿�鍞嚭搴撳崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_SellOutBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "SAL_OUTSTOCK", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛屾彁浜ゅ崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ら攢鍞嚭搴撳崟锛堟簮鍗曪細鍙戣揣閫氱煡鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ら攢鍞嚭搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦閿�鍞嚭搴撳崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
@@ -18969,6 +19521,7 @@
private bool SaveSellOutBill_CLD(Model.ClsKf_SellOutBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
+ string sRemark = "";
//浠庨厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
{
@@ -18994,6 +19547,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
{
@@ -19021,7 +19576,10 @@
//鏇存柊鍏宠仈鏁伴噺
oCn.RunProc("exec h_p_Xs_UpDateSeOutStockRelation_Add " + oMain.HInterID.ToString());
- if (oSystemParameterMain.WMS_MouldManagerCtl == "Y") //绯荤粺鍙傛暟 鍚敤鍣ㄥ叿绠＄悊
+ sRemark = sRemark + " 锛涚敓鎴愬嚭鍏ュ簱鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+
+ if (oSystemParameterMain.WMS_MouldManagerCtl.ToUpper() == "Y") //绯荤粺鍙傛暟 鍚敤鍣ㄥ叿绠＄悊
{
string HMouldBillType = "3802";
oCn.RunProc("EXEC h_p_Sc_MouldStockBill_Insert_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillType + "','" + HMouldBillType + "'," + oMain.HSupID.ToString() + "," + oMain.HKeeperID.ToString() + "," + oMain.HSecManagerID.ToString() + "," + oMain.HDeptID.ToString() + ",2");
@@ -19066,7 +19624,7 @@
sJson_Custom = "";
}
- if (oSystemParameterMain.Kf_SellOutBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_SellOutBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -19223,20 +19781,35 @@
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[] { "SAL_OUTSTOCK", sJson });
+ sRemark = sRemark + " 锛涚敓鎴怌LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
//鐢熸垚鍗曟嵁鍚庢洿鏂拌嚜瀹氫箟瀛楁
oCn.RunProc("exec h_p_Sc_UpDateSelfFildSellOut '" + oMain.HBillNo + "','1402'");
+
+ sRemark = sRemark + " 锛涚敓鎴愬崟鎹悗鍥炲～瀛楁淇℃伅" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鐢熸垚閿�鍞嚭搴撳崟锛堟簮鍗曪細鍙戣揣閫氱煡鍗曪級澶辫触-鏃ф柟娉曪紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -19259,7 +19832,7 @@
oCn.RunProc("EXEC h_p_ToCLD_BackDataDELIVERYNOTICE_Close '" + oMain.HBillNo + "'");
}
}
- LogService.Write("鐢熸垚閿�鍞嚭搴撳崟锛堟簮鍗曪細鍙戣揣閫氱煡鍗曪級鎴愬姛-鏃ф柟娉曪紒" + sJson);
+ sRemark = sRemark + sJson;
oCn.Commit();
}
}
@@ -19273,12 +19846,13 @@
}
catch (Exception e)
{
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_SellOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_SellOutBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
@@ -19292,20 +19866,35 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "SAL_OUTSTOCK", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "SAL_OUTSTOCK", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
else
{
+ LogService.Write("鐢熸垚骞跺鏍搁攢鍞嚭搴撳崟锛堟簮鍗曪細鍙戣揣閫氱煡鍗曪級鎴愬姛-鏃ф柟娉曪紒" + sRemark);
sErrMsg = "鐢熸垚骞跺鏍搁攢鍞嚭搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
oCn.Commit();
return true;
@@ -19313,13 +19902,62 @@
}
catch (Exception e)
{
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳閿�鍞嚭搴撳崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_SellOutBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "SAL_OUTSTOCK", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛屾彁浜ゅ崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ら攢鍞嚭搴撳崟锛堟簮鍗曪細鍙戣揣閫氱煡鍗曪級鎴愬姛-鏃ф柟娉曪紒" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ら攢鍞嚭搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦閿�鍞嚭搴撳崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
}
else
{
+ LogService.Write("鐢熸垚閿�鍞嚭搴撳崟锛堟簮鍗曪細鍙戣揣閫氱煡鍗曪級鎴愬姛-鏃ф柟娉曪紒" + sRemark);
sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
return true;
}
@@ -19488,7 +20126,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳閿�鍞嚭搴撳崟澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳閿�鍞嚭搴撳崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳閿�鍞嚭搴撳崟澶辫触锛�" + HReturn); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -19566,7 +20204,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙淇敼閿�鍞嚭搴撳崟澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鏍￠獙淇敼閿�鍞嚭搴撳崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鏍￠獙淇敼閿�鍞嚭搴撳崟澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -19596,7 +20234,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳閿�鍞嚭搴撳崟澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳閿�鍞嚭搴撳崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳閿�鍞嚭搴撳崟澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -19704,7 +20342,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳閿�鍞嚭搴撳崟澶辫触锛�" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳閿�鍞嚭搴撳崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鏍稿鏍￠獙瀹℃牳閿�鍞嚭搴撳崟澶辫触锛�" + HReturn); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -20427,7 +21065,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_MateOutBackBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MateOutBackBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -20465,7 +21103,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBackBill_PPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBackBill_PPBom_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -20487,7 +21125,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_MateOutBackBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MateOutBackBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -20688,7 +21326,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鐢熶骇閫�鏂欏崟澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇閫�鏂欏崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鐢熸垚鐢熶骇閫�鏂欏崟锛堟簮鍗曪細鐢熶骇鐢ㄦ枡娓呭崟锛夊け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -20709,19 +21356,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鐢熶骇閫�鏂欏崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_MateOutBackBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_MateOutBackBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -20729,16 +21376,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "PRD_ReturnMtrl", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "PRD_ReturnMtrl", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚鐢熶骇閫�鏂欏崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇閫�鏂欏崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -20752,8 +21412,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鐢熶骇閫�鏂欏崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_MateOutBackBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "PRD_ReturnMtrl", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇閫�鏂欏崟鎴愬姛锛屾彁浜ゅ崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ょ敓浜ч��鏂欏崟锛堟簮鍗曪細鐢熶骇鐢ㄦ枡娓呭崟锛夋垚鍔燂紒" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ょ敓浜ч��鏂欏崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鐢熶骇閫�鏂欏崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
@@ -21349,7 +22056,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_MateOutBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MateOutBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -21387,7 +22094,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PPBom_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -21409,7 +22116,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_MateOutBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MateOutBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -21615,7 +22322,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曞け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐢熶骇棰嗘枡鍗曪紙婧愬崟锛氱敓浜х敤鏂欐竻鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -21636,19 +22352,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_MateOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_MateOutBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -21656,16 +22372,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "PRD_PickMtrl", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "PRD_PickMtrl", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -21679,8 +22408,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鐢熶骇棰嗘枡鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_MateOutBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "PRD_PickMtrl", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ょ敓浜ч鏂欏崟锛堟簮鍗曪細鐢熶骇鐢ㄦ枡娓呭崟锛夋垚鍔燂紒" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ょ敓浜ч鏂欏崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鐢熶骇棰嗘枡鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -21737,7 +22513,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_MateOutBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MateOutBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -21775,7 +22551,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_MateOutRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_MateOutRequest_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -21797,7 +22573,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_MateOutBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MateOutBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -21998,7 +22774,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曞け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐢熶骇棰嗘枡鍗曪紙婧愬崟锛氱敓浜у彂鏂欓�氱煡鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -22019,19 +22804,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_MateOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_MateOutBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -22039,16 +22824,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "PRD_PickMtrl", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "PRD_PickMtrl", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -22062,8 +22860,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鐢熶骇棰嗘枡鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_MateOutBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "PRD_PickMtrl", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ょ敓浜ч鏂欏崟锛堟簮鍗曪細鐢熶骇鍙戞枡閫氱煡鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ょ敓浜ч鏂欏崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鐢熶骇棰嗘枡鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -22120,7 +22965,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_MateOutBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MateOutBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -22158,7 +23003,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateOutBill_PrepareMTRL_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateOutBill_PrepareMTRL_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -22180,7 +23025,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_MateOutBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MateOutBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -22379,7 +23224,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曞け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐢熶骇棰嗘枡鍗曪紙婧愬崟锛氱敓浜у鏂欏崟锛夊け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -22400,19 +23254,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_MateOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_MateOutBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -22420,16 +23274,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "PRD_PickMtrl", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "PRD_PickMtrl", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -22443,8 +23310,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鐢熶骇棰嗘枡鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_MateOutBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "PRD_PickMtrl", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇棰嗘枡鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ょ敓浜ч鏂欏崟锛堟簮鍗曪細鐢熶骇澶囨枡鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ょ敓浜ч鏂欏崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鐢熶骇棰嗘枡鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -22865,7 +23779,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳鐢熶骇棰嗘枡鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳鐢熶骇棰嗘枡鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳鐢熶骇棰嗘枡鍗曞け璐ワ紒" + HReturn); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -22943,7 +23857,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙淇敼鐢熶骇棰嗘枡鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙淇敼鐢熶骇棰嗘枡鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙淇敼鐢熶骇棰嗘枡鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -22973,7 +23887,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳鐢熶骇棰嗘枡鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳鐢熶骇棰嗘枡鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳鐢熶骇棰嗘枡鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -23166,7 +24080,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_MateReplenishOutBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MateReplenishOutBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -23205,7 +24119,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetMateReplenishOutBill_PPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMateReplenishOutBill_PPBom_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -23227,7 +24141,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_MateReplenishOutBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_MateReplenishOutBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -23431,7 +24345,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鐢熶骇琛ユ枡鍗曞け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇琛ユ枡鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐢熶骇琛ユ枡鍗曪紙婧愬崟锛氱敓浜х敤鏂欐竻鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -23452,19 +24375,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鐢熶骇琛ユ枡鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_MateReplenishOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_MateReplenishOutBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -23472,16 +24395,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "PRD_FeedMtrl", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "PRD_FeedMtrl", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚鐢熶骇琛ユ枡鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇琛ユ枡鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -23495,8 +24431,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鐢熶骇琛ユ枡鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_MateReplenishOutBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "PRD_FeedMtrl", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇琛ユ枡鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ょ敓浜цˉ鏂欏崟锛堟簮鍗曪細鐢熶骇鐢ㄦ枡娓呭崟锛夋垚鍔燂紒" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ょ敓浜цˉ鏂欏崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鐢熶骇琛ユ枡鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -23662,7 +24645,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳鐢熶骇琛ユ枡鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳鐢熶骇琛ユ枡鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳鐢熶骇琛ユ枡鍗曞け璐ワ紒" + HReturn); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -23740,7 +24723,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙淇敼鐢熶骇琛ユ枡鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙淇敼鐢熶骇琛ユ枡鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙淇敼鐢熶骇琛ユ枡鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -23770,7 +24753,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳鐢熶骇琛ユ枡鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳鐢熶骇琛ユ枡鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳鐢熶骇琛ユ枡鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -23996,7 +24979,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳濮斿琛ユ枡鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳濮斿琛ユ枡鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳濮斿琛ユ枡鍗曞け璐ワ紒" + HReturn); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -24060,7 +25043,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙淇敼濮斿琛ユ枡鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙淇敼濮斿琛ユ枡鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙淇敼濮斿琛ユ枡鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -24090,7 +25073,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳濮斿琛ユ枡鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳濮斿琛ユ枡鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳濮斿琛ユ枡鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -24792,7 +25775,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_EntrustOutBackBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_EntrustOutBackBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -24830,7 +25813,7 @@
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBackBill_WWPPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBackBill_WWPPBom_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -24852,7 +25835,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_EntrustOutBackBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_EntrustOutBackBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -25055,7 +26038,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚濮斿閫�鏂欏崟澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚濮斿閫�鏂欏崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鐢熸垚濮斿閫�鏂欏崟锛堟簮鍗曪細濮斿鐢ㄦ枡娓呭崟锛夊け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -25076,19 +26068,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚濮斿閫�鏂欏崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_EntrustOutBackBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_EntrustOutBackBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -25096,16 +26088,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "SUB_RETURNMTRL", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "SUB_RETURNMTRL", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚濮斿閫�鏂欏崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚濮斿閫�鏂欏崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -25119,8 +26124,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳濮斿閫�鏂欏崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_EntrustOutBackBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "SUB_RETURNMTRL", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚濮斿閫�鏂欏崟鎴愬姛锛屾彁浜ゅ崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ゅ澶栭��鏂欏崟锛堟簮鍗曪細濮斿鐢ㄦ枡娓呭崟锛夋垚鍔燂紒" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ゅ澶栭��鏂欏崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦濮斿閫�鏂欏崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
@@ -25645,7 +26697,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_EntrustOutBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_EntrustOutBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -25683,7 +26735,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetEntrustOutBill_WWPPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetEntrustOutBill_WWPPBom_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -25705,7 +26757,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_EntrustOutBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_EntrustOutBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -25910,7 +26962,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚濮斿鍑哄簱鍗曞け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚濮斿鍑哄簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚濮斿鍑哄簱鍗曪紙婧愬崟锛氬澶栫敤鏂欐竻鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -25931,19 +26992,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚濮斿鍑哄簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_EntrustOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_EntrustOutBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -25951,16 +27012,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "SUB_PickMtrl", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "SUB_PickMtrl", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚濮斿鍑哄簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚濮斿鍑哄簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -25974,8 +27048,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳濮斿鍑哄簱鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_EntrustOutBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "SUB_PickMtrl", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚濮斿鍑哄簱鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ゅ澶栧嚭搴撳崟锛堟簮鍗曪細濮斿鐢ㄦ枡娓呭崟锛夋垚鍔燂紒" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ゅ澶栧嚭搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦濮斿鍑哄簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -26411,7 +27532,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳濮斿棰嗘枡鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳濮斿棰嗘枡鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳濮斿棰嗘枡鍗曞け璐ワ紒" + HReturn); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -26475,7 +27596,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙淇敼濮斿棰嗘枡鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙淇敼濮斿棰嗘枡鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙淇敼濮斿棰嗘枡鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -26505,7 +27626,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳濮斿棰嗘枡鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳濮斿棰嗘枡鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳濮斿棰嗘枡鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -27413,7 +28534,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_OtherOutBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_OtherOutBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -27453,7 +28574,7 @@
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_StockOutRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_StockOutRequest_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -27475,7 +28596,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_OtherOutBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_OtherOutBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -27626,7 +28747,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曞け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鍏朵粬鍑哄簱鍗曪紙婧愬崟锛氬嚭搴撶敵璇峰崟锛夊け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -27647,19 +28777,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_OtherOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_OtherOutBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -27667,16 +28797,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "STK_MisDelivery", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "STK_MisDelivery", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -27690,8 +28833,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鍏朵粬鍑哄簱鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_OtherOutBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "STK_MisDelivery", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ゅ叾浠栧嚭搴撳崟锛堟簮鍗曪細鍑哄簱鐢宠鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ゅ叾浠栧嚭搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鍏朵粬鍑哄簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -27749,7 +28939,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_OtherOutBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_OtherOutBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -27789,7 +28979,7 @@
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_PUBCLD");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -27822,7 +29012,7 @@
sJson_BillTypeID = "\"FBillTypeID\":{ \"FNumber\":\"" + oMain.HBillSubType + "\" },";
}
- if (oSystemParameterMain.Kf_OtherOutBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_OtherOutBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -27988,7 +29178,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曞け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鍏朵粬鍑哄簱鍗曪紙婧愬崟锛氭棤婧愬崟锛夊け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -28009,19 +29208,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_OtherOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_OtherOutBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -28029,16 +29228,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "STK_MisDelivery", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "STK_MisDelivery", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -28052,8 +29264,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鍏朵粬鍑哄簱鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_OtherOutBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "STK_MisDelivery", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ゅ叾浠栧嚭搴撳崟锛堟簮鍗曪細鏃犳簮鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ゅ叾浠栧嚭搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鍏朵粬鍑哄簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -28201,6 +29460,7 @@
/// <returns></returns>
public bool SaveOtherOutBill_CLD(Model.ClsKf_OtherOutBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
+ string sRemark = "";
//浠庨厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
{
@@ -28226,6 +29486,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
{
@@ -28253,6 +29515,7 @@
") ");
//鏇存柊鍏宠仈鏁伴噺
+ sRemark = sRemark + " 锛涚敓鎴愬嚭鍏ュ簱鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherOutBill_CLD");
@@ -28280,7 +29543,7 @@
sJson_StockStyle = "";
}
- if (oSystemParameterMain.Kf_OtherOutBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_OtherOutBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -28388,24 +29651,37 @@
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[] { "STK_MisDelivery", sJson });
+ sRemark = sRemark + " 锛涚敓鎴怌LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
HReturn = result.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曞け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鍏朵粬鍑哄簱鍗曪紙婧愬崟锛氭棤婧愬崟锛夊け璐�-鏃ф柟娉曪紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
}
else
{
- LogService.Write("鐢熸垚鍏朵粬鍑哄簱鍗曪紙婧愬崟锛氭棤婧愬崟锛夋垚鍔�-鏃ф柟娉曪紒" + sJson);
+ sRemark = sRemark + sJson;
oCn.Commit();
}
}
@@ -28419,12 +29695,13 @@
}
catch (Exception e)
{
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_OtherOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_OtherOutBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
@@ -28438,20 +29715,35 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "STK_MisDelivery", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "STK_MisDelivery", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
else
{
+ LogService.Write("鐢熸垚骞跺鏍稿叾浠栧嚭搴撳崟锛堟簮鍗曪細鏃犳簮鍗曪級鎴愬姛-鏃ф柟娉曪紒" + sRemark);
sErrMsg = "鐢熸垚骞跺鏍稿叾浠栧嚭搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
oCn.Commit();
return true;
@@ -28459,7 +29751,55 @@
}
catch (Exception e)
{
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鍏朵粬鍑哄簱鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_OtherOutBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "STK_MisDelivery", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍏朵粬鍑哄簱鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ゅ叾浠栧嚭搴撳崟锛堟簮鍗曪細鏃犳簮鍗曪級鎴愬姛-鏃ф柟娉曪紒" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ゅ叾浠栧嚭搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鍏朵粬鍑哄簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -28624,7 +29964,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳鍏朵粬鍑哄簱鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳鍏朵粬鍑哄簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳鍏朵粬鍑哄簱鍗曞け璐ワ紒" + HReturn); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -28702,7 +30042,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙淇敼鍏朵粬鍑哄簱鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙淇敼鍏朵粬鍑哄簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙淇敼鍏朵粬鍑哄簱鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -28732,7 +30072,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳鍏朵粬鍑哄簱鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳鍏朵粬鍑哄簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳鍏朵粬鍑哄簱鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -29235,7 +30575,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_POStockInBackBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_POStockInBackBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -29273,7 +30613,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POOrder_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POOrder_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -29295,7 +30635,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_POStockInBackBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_POStockInBackBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -29537,7 +30877,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚澶栬喘閫�鏂欏崟澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚澶栬喘閫�鏂欏崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鐢熸垚澶栬喘閫�鏂欏崟锛堟簮鍗曪細閲囪喘璁㈠崟锛夊け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -29558,19 +30907,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚澶栬喘閫�鏂欏崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_POStockInBackBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_POStockInBackBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -29578,16 +30927,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "PUR_MRB", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "PUR_MRB", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚澶栬喘閫�鏂欏崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚澶栬喘閫�鏂欏崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -29601,8 +30963,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳澶栬喘閫�鏂欏崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_POStockInBackBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "PUR_MRB", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚澶栬喘閫�鏂欏崟鎴愬姛锛屾彁浜ゅ崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ゅ璐��鏂欏崟锛堟簮鍗曪細閲囪喘璁㈠崟锛夋垚鍔燂紒" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ゅ璐��鏂欏崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦澶栬喘閫�鏂欏崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
@@ -29660,7 +31069,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_POStockInBackBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_POStockInBackBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -29698,7 +31107,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBackBill_POInStockBack_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBackBill_POInStockBack_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -29720,7 +31129,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_POStockInBackBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_POStockInBackBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -29950,7 +31359,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚澶栬喘閫�鏂欏崟澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚澶栬喘閫�鏂欏崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
LogService.Write("鐢熸垚澶栬喘閫�鏂欏崟锛堟簮鍗曪細閫�鏂欓�氱煡鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -29971,19 +31389,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚澶栬喘閫�鏂欏崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_POStockInBackBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_POStockInBackBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -29991,16 +31409,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "PUR_MRB", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "PUR_MRB", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚澶栬喘閫�鏂欏崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚澶栬喘閫�鏂欏崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -30014,8 +31445,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳澶栬喘閫�鏂欏崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_POStockInBackBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "PUR_MRB", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚澶栬喘閫�鏂欏崟鎴愬姛锛屾彁浜ゅ崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ゅ璐��鏂欏崟锛堟簮鍗曪細閫�鏂欓�氱煡鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ゅ璐��鏂欏崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦澶栬喘閫�鏂欏崟澶辫触锛�" + e.Message;
oCn.RollBack();
return false;
}
@@ -31115,7 +32593,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_POStockInBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_POStockInBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -31152,7 +32630,7 @@
sRemark = sRemark + " 锛涚敓鎴愬嚭鍏ュ簱鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
//鍒ゆ柇鏄惁鍚敤鍣ㄥ叿绠＄悊锛岀郴缁熷弬鏁� 鍚敤鍣ㄥ叿绠＄悊
- if (oSystemParameterMain.WMS_MouldManagerCtl == "Y")
+ if (oSystemParameterMain.WMS_MouldManagerCtl.ToUpper() == "Y")
{
string HMouldBillType = "3803";
oCn.RunProc("EXEC h_p_Sc_MouldStockBill_Insert_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillType + "','" + HMouldBillType + "'," + oMain.HSupID.ToString() + "," + oMain.HKeeperID.ToString() + "," + oMain.HSecManagerID.ToString() + "," + oMain.HDeptID.ToString() + ",1");
@@ -31162,7 +32640,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -31185,7 +32663,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_POStockInBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_POStockInBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -31439,7 +32917,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚閲囪喘鍏ュ簱鍗曞け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閲囪喘鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚閲囪喘鍏ュ簱鍗曪紙婧愬崟锛氭敹鏂欓�氱煡鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -31460,19 +32947,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚閲囪喘鍏ュ簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_POStockInBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_POStockInBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -31480,16 +32967,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "STK_InStock", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "STK_InStock", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚閲囪喘鍏ュ簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閲囪喘鍏ュ簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -31503,8 +33003,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳閲囪喘鍏ュ簱鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_POStockInBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "STK_InStock", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閲囪喘鍏ュ簱鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ら噰璐叆搴撳崟锛堟簮鍗曪細鏀舵枡閫氱煡鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ら噰璐叆搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦閲囪喘鍏ュ簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -31561,7 +33108,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_POStockInBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_POStockInBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -31599,7 +33146,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POOrder_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POOrder_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -31621,7 +33168,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_POStockInBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_POStockInBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -31861,7 +33408,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚閲囪喘鍏ュ簱鍗曞け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閲囪喘鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚閲囪喘鍏ュ簱鍗曪紙婧愬崟锛氶噰璐鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -31882,19 +33438,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚閲囪喘鍏ュ簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_POStockInBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_POStockInBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -31902,16 +33458,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "STK_InStock", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "STK_InStock", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚閲囪喘鍏ュ簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閲囪喘鍏ュ簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -31925,8 +33494,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳閲囪喘鍏ュ簱鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_POStockInBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "STK_InStock", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚閲囪喘鍏ュ簱鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ら噰璐叆搴撳崟锛堟簮鍗曪細閲囪喘璁㈠崟锛夋垚鍔燂紒" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ら噰璐叆搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦閲囪喘鍏ュ簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -33109,7 +34725,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳閲囪喘鍏ュ簱鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳閲囪喘鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳閲囪喘鍏ュ簱鍗曞け璐ワ紒" + HReturn); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -33187,7 +34803,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙淇敼閲囪喘鍏ュ簱鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙淇敼閲囪喘鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙淇敼閲囪喘鍏ュ簱鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -33217,7 +34833,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳閲囪喘鍏ュ簱鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳閲囪喘鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳閲囪喘鍏ュ簱鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -34689,7 +36305,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_ProductInBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_ProductInBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -34727,7 +36343,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMO_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMO_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -34749,7 +36365,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_ProductInBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_ProductInBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -34930,7 +36546,7 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
//鍙嶅簭鍒楀寲json鏁版嵁
- var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result);
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
//鎺ユ敹閲戣澏鎶ラ敊淇℃伅
var strErrorMsg = string.Empty;
//閬嶅巻鑾峰彇鎶ラ敊淇℃伅
@@ -34939,7 +36555,7 @@
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐢熶骇鍏ュ簱鍗曪紙婧愬崟锛氱敓浜т换鍔″崟锛夊け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -34960,19 +36576,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_ProductInBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_ProductInBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -34980,16 +36596,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "PRD_INSTOCK", sJson2 }); //鎻愪氦鍗曟嵁
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "PRD_INSTOCK", sJson3 }); //瀹℃牳鍗曟嵁
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -35003,8 +36632,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_ProductInBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "PRD_INSTOCK", sJson2 }); //鎻愪氦鍗曟嵁
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ょ敓浜у叆搴撳崟锛堟簮鍗曪細鐢熶骇浠诲姟鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ょ敓浜у叆搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -35061,7 +36737,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_ProductInBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_ProductInBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -35099,7 +36775,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ICMOReport_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ICMOReport_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -35121,7 +36797,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_ProductInBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_ProductInBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -35315,7 +36991,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐢熶骇鍏ュ簱鍗曪紙婧愬崟锛氱敓浜ф眹鎶ュ崟锛夊け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -35336,19 +37021,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_ProductInBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_ProductInBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -35356,16 +37041,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "PRD_INSTOCK", sJson2 }); //鎻愪氦鍗曟嵁
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "PRD_INSTOCK", sJson3 }); //瀹℃牳鍗曟嵁
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -35379,8 +37077,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_ProductInBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "PRD_INSTOCK", sJson2 }); //鎻愪氦鍗曟嵁
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ょ敓浜у叆搴撳崟锛堟簮鍗曪細鐢熶骇姹囨姤鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ょ敓浜у叆搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -35437,7 +37182,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_ProductInBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_ProductInBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -35475,7 +37220,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBill_ProcessReport_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetProductInBill_ProcessReport_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -35497,7 +37242,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_ProductInBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_ProductInBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -35678,7 +37423,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鐢熶骇鍏ュ簱鍗曪紙婧愬崟锛氬伐搴忔眹鎶ュ崟锛夊け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -35699,19 +37453,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_ProductInBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_ProductInBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -35719,16 +37473,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "PRD_INSTOCK", sJson2 }); //鎻愪氦鍗曟嵁
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "PRD_INSTOCK", sJson3 }); //瀹℃牳鍗曟嵁
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -35742,8 +37509,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_ProductInBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "PRD_INSTOCK", sJson2 }); //鎻愪氦鍗曟嵁
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鐢熶骇鍏ュ簱鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ょ敓浜у叆搴撳崟锛堟簮鍗曪細宸ュ簭姹囨姤鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ょ敓浜у叆搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -36184,7 +37998,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳鐢熶骇鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + HReturn); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -36262,7 +38076,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙淇敼鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙淇敼鐢熶骇鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙淇敼鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -36292,7 +38106,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳鐢熶骇鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -37220,7 +39034,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_EntrustInBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_EntrustInBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -37258,7 +39072,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetPOStockInBill_POInStock_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetPOStockInBill_POInStock_PUBCLD_New");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -37280,7 +39094,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_EntrustInBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_EntrustInBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -37524,7 +39338,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚濮斿鍏ュ簱鍗曞け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚濮斿鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚濮斿鍏ュ簱鍗曪紙婧愬崟锛氭敹鏂欓�氱煡鍗曪級澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -37545,19 +39368,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚濮斿鍏ュ簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_EntrustInBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_EntrustInBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -37565,16 +39388,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "STK_InStock", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "STK_InStock", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚濮斿鍏ュ簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚濮斿鍏ュ簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -37588,8 +39424,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳濮斿鍏ュ簱鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_EntrustInBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "STK_InStock", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚濮斿鍏ュ簱鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ゅ澶栧叆搴撳崟锛堟簮鍗曪細鏀舵枡閫氱煡鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ゅ澶栧叆搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦濮斿鍏ュ簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -38705,7 +40588,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_OtherInBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_OtherInBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -38745,7 +40628,7 @@
//鏍规嵁TMP琛� 杩斿洖 淇℃伅
DataSet Ds;
- if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
{
Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherInBill_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherInBill_PUBCLD");
sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -38778,7 +40661,7 @@
sJson_BillTypeID = "\"FBillTypeID\":{ \"FNumber\":\"" + oMain.HBillSubType + "\" },";
}
- if (oSystemParameterMain.Kf_OtherInBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_OtherInBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -38940,7 +40823,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍏朵粬鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鍏朵粬鍏ュ簱鍗曪紙婧愬崟锛氭棤婧愬崟锛夊け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -38961,19 +40853,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_OtherInBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_OtherInBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -38981,16 +40873,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "STK_MISCELLANEOUS", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "STK_MISCELLANEOUS", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚鍏朵粬鍏ュ簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍏朵粬鍏ュ簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -39004,8 +40909,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_OtherInBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "STK_MISCELLANEOUS", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍏朵粬鍏ュ簱鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ゅ叾浠栧叆搴撳崟锛堟簮鍗曪細鏃犳簮鍗曪級鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ゅ叾浠栧叆搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -39400,7 +41352,7 @@
int sYear = 0;
int sPeriod = 0;
- if (oSystemParameterMain.Kf_OtherInBill_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_OtherInBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
oMain.HDate = DateTime.Today;
}
@@ -39453,7 +41405,7 @@
string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
- if (oSystemParameterMain.Kf_OtherInBill_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ if (oSystemParameterMain.Kf_OtherInBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
{
sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
}
@@ -39633,7 +41585,16 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鐢熸垚鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍏朵粬鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鐢熸垚鍏朵粬鍏ュ簱鍗曪紙婧愬崟锛氬叆搴撶敵璇峰崟锛�,澶氳鏁版嵁鍚堝苟涓嬫帹鐢熷崟澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -39654,19 +41615,19 @@
}
catch (Exception e)
{
- LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
sErrMsg = "鐢熸垚鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
- if (oSystemParameterMain.Kf_OtherInBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameterMain.Kf_OtherInBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
try
{
oCn.BeginTran();
//瀹℃牳WMS鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
//鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
HReturn = "";
@@ -39674,16 +41635,29 @@
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
new object[] { "STK_MISCELLANEOUS", sJson2 });
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
new object[] { "STK_MISCELLANEOUS", sJson3 });
+
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result2.ToString() + "," + result3.ToString();
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
- sErrMsg = "鐢熸垚鍏朵粬鍏ュ簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍏朵粬鍏ュ簱鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
oCn.RollBack();
return true;
}
@@ -39697,8 +41671,55 @@
}
catch (Exception e)
{
- LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
sErrMsg = "瀹℃牳鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else if (oSystemParameterMain.Kf_OtherInBill_AutoSubmit.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩鎻愪氦
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鎻愪氦閲戣澏浜戝崟鎹�
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "STK_MISCELLANEOUS", sJson2 });
+
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚鍏朵粬鍏ュ簱鍗曟垚鍔燂紝鎻愪氦鍗曟嵁澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鎻愪氦鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞舵彁浜ゅ叾浠栧叆搴撳崟锛堟簮鍗曪細鍏ュ簱鐢宠鍗曪級,澶氳鏁版嵁鍚堝苟涓嬫帹鐢熷崟鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞舵彁浜ゅ叾浠栧叆搴撳崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鎻愪氦鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "鎻愪氦鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -39957,7 +41978,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳鍏朵粬鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + HReturn); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -40035,7 +42056,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙淇敼鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙淇敼鍏朵粬鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙淇敼鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -40065,7 +42086,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳鍏朵粬鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍￠獙瀹℃牳鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
@@ -40173,7 +42194,7 @@
{
strErrorMsg += item.Message + "\r\n";
};
- sErrMsg = "鏍￠獙瀹℃牳鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + strErrorMsg;
+ sErrMsg = "鏍￠獙瀹℃牳鍏朵粬鍏ュ簱鍗曞け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
LogService.Write("鏍稿鏍￠獙瀹℃牳鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + HReturn); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
--
Gitblit v1.9.1