From 8fed0ba13bfe085d0ba0bcd05f325a085b6b15c8 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 14 一月 2025 10:32:15 +0800
Subject: [PATCH] 生产汇报、直接调拨上传生成单据调用方法修改，金蝶云报错提示内容优化，增加根据参数判断生成单据时是否直接提交单据功能

---
 CLOUDWEB/WebService1.asmx.cs |  907 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 806 insertions(+), 101 deletions(-)

diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 75638f0..0c4cacd 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -4499,7 +4499,7 @@
                 int sYear = 0;
                 int sPeriod = 0;
 
-                if (oSystemParameterMain.Sc_ICMOReportBill_BillDateMode == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                if (oSystemParameterMain.Sc_ICMOReportBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                 {
                     oMain.HDate = DateTime.Today;
                 }
@@ -4550,7 +4550,7 @@
 
                 //鏍规嵁TMP琛� 杩斿洖 淇℃伅
                 DataSet Ds;
-                if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+                if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
                     Ds = oCn.RunProcReturn("exec h_p_Kf_GetICMOReportBill_ICMO_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetICMOReportBill_ICMO_PUBCLD_New");
                     sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -4573,7 +4573,7 @@
                     string sJson_Date = "";         //鍗曟嵁鏃ユ湡
                     sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
 
-                    if (oSystemParameterMain.Sc_ICMOReportBill_BillDateMode == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                    if (oSystemParameterMain.Sc_ICMOReportBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                     {
                         sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
                     }
@@ -4785,8 +4785,16 @@
 
                         if (HReturn.Contains("\"IsSuccess\":false") == true)
                         {
-                            sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曞け璐ワ紒" + HReturn;
-                            //sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曞け璐ワ紒" + HReturn + sJson;
+                            //鍙嶅簭鍒楀寲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;
@@ -4794,7 +4802,7 @@
                         else
                         {
                             //闊╃數鎵爜鐢熸垚鐢熶骇姹囨姤鍗曟椂锛屽洖濉搴旀潯鐮佹。妗堟簮鍗曚俊鎭�
-                            if (oSystemParameterMain.Sc_ICMOReportBill_UpdateSourceInterID == "Y")
+                            if (oSystemParameterMain.Sc_ICMOReportBill_UpdateSourceInterID.ToUpper() == "Y")
                             {
                                 oCn.RunProc("exec h_p_WMS_UpdateSourceByBarCodeBill_ICMOReportBill '" + oMain.HBillNo + "'");
                             }
@@ -4812,19 +4820,19 @@
             }
             catch (Exception e)
             {
-                LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+                LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
                 sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曞け璐ワ紒" + e.Message;
                 oCn.RollBack();
                 return false;
             }
 
-            if (oSystemParameterMain.Sc_ICMOReportBill_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
+            if (oSystemParameterMain.Sc_ICMOReportBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
             {
                 try
                 {
                     oCn.BeginTran();
                     //瀹℃牳WMS鍗曟嵁
-                    oCn.RunProc("Update Sc_ICMOReportBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate() where HInterID= " + oMain.HInterID.ToString());
+                    oCn.RunProc("Update Sc_ICMOReportBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
 
                     //鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
                     HReturn = "";
@@ -4832,16 +4840,29 @@
                     var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
                     new object[] { "PRD_MORPT", 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_MORPT", 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;
                     }
@@ -4855,8 +4876,55 @@
                 }
                 catch (Exception e)
                 {
-                    LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+                    LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
                     sErrMsg = "瀹℃牳鐢熶骇姹囨姤鍗曞け璐ワ紒" + e.Message;
+                    oCn.RollBack();
+                    return false;
+                }
+            }
+            else if (oSystemParameterMain.Sc_ICMOReportBill_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_MORPT", 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;
                 }
@@ -6418,6 +6486,7 @@
         //鍙戣揣璋冩嫧
         private bool SaveMoveSellOut_CLD(Model.ClsKf_MoveStockBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
         {
+            string sRemark = "";
             //浠庨厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
             if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
             {
@@ -6443,6 +6512,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
             {
@@ -6472,7 +6543,9 @@
                 //鏇存柊鍏宠仈鏁伴噺
                 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 = "3814";
                     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");
@@ -6510,7 +6583,7 @@
                         sJson_StockStyle = "";
                     }
 
-                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                     {
                         sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
                     }
@@ -6656,20 +6729,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[] { "STK_TransferDirect", sJson });
 
+                        sRemark = sRemark + " 锛涚敓鎴怌LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
                         //鐢熸垚鍗曟嵁鍚庢洿鏂拌嚜瀹氫箟瀛楁
                         oCn.RunProc("exec h_p_Sc_UpDateSelfFildMove '" + 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;
@@ -6692,7 +6780,7 @@
                                     oCn.RunProc("EXEC h_p_ToCLD_BackDataDELIVERYNOTICE_Move_Close '" + oMain.HBillNo + "'");
                                 }
                             }
-                            LogService.Write("鐢熸垚鐩存帴璋冩嫧鍗曪紙婧愬崟锛氬彂璐ч�氱煡鍗曪級鎴愬姛-鏃ф柟娉曪紒" + sJson);
+                            sRemark = sRemark + sJson;
                             oCn.Commit();
                         }
                     }
@@ -6706,12 +6794,13 @@
             }
             catch (Exception e)
             {
+                LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
                 sErrMsg = "鐢熸垚鍙戣揣璋冩嫧鍗曞け璐ワ紒" + e.Message;
                 oCn.RollBack();
                 return false;
             }
 
-            if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
+            if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
             {
                 try
                 {
@@ -6725,20 +6814,35 @@
                     var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
                     new object[] { "STK_TransferDirect", 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_TransferDirect", 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;
@@ -6746,13 +6850,62 @@
                 }
                 catch (Exception e)
                 {
+                    LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
                     sErrMsg = "瀹℃牳鍙戣揣璋冩嫧鍗曞け璐ワ紒" + e.Message;
+                    oCn.RollBack();
+                    return false;
+                }
+            }
+            else if (oSystemParameterMain.Kf_MoveStockBill_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_TransferDirect", 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;
             }
@@ -8653,7 +8806,7 @@
                 int sYear = 0;
                 int sPeriod = 0;
 
-                if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                 {
                     oMain.HDate = DateTime.Today;
                 }
@@ -8692,7 +8845,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 = "3814";
                     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");
@@ -8702,7 +8855,7 @@
 
                 //鏍规嵁TMP琛� 杩斿洖 淇℃伅
                 DataSet Ds;
-                if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+                if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
                     Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_PPBom_PUBCLD_New");
                     sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -8724,7 +8877,7 @@
                     string sJson_Date = "";             //鍗曟嵁鏃ユ湡
                     sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
 
-                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                     {
                         sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
                     }
@@ -8939,7 +9092,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;
@@ -8960,19 +9122,19 @@
             }
             catch (Exception e)
             {
-                LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+                LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
                 sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
                 oCn.RollBack();
                 return false;
             }
 
-            if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
+            if (oSystemParameterMain.Kf_MoveStockBill_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 = "";
@@ -8980,16 +9142,29 @@
                     var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
                     new object[] { "STK_TransferDirect", 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_TransferDirect", 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;
                     }
@@ -9003,8 +9178,55 @@
                 }
                 catch (Exception e)
                 {
-                    LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+                    LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
                     sErrMsg = "瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
+                    oCn.RollBack();
+                    return false;
+                }
+            }
+            else if (oSystemParameterMain.Kf_MoveStockBill_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_TransferDirect", 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;
                 }
@@ -9061,7 +9283,7 @@
                 int sYear = 0;
                 int sPeriod = 0;
 
-                if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                 {
                     oMain.HDate = DateTime.Today;
                 }
@@ -9101,7 +9323,7 @@
 
                 //鏍规嵁TMP琛� 杩斿洖 淇℃伅
                 DataSet Ds;
-                if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+                if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
                     Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_WWPPBom_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_WWPPBom_PUBCLD_New");
                     sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -9123,7 +9345,7 @@
                     string sJson_Date = "";             //鍗曟嵁鏃ユ湡
                     sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
 
-                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                     {
                         sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
                     }
@@ -9333,7 +9555,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;
@@ -9354,19 +9585,19 @@
             }
             catch (Exception e)
             {
-                LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+                LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
                 sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
                 oCn.RollBack();
                 return false;
             }
 
-            if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
+            if (oSystemParameterMain.Kf_MoveStockBill_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 = "";
@@ -9374,16 +9605,29 @@
                     var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
                     new object[] { "STK_TransferDirect", 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_TransferDirect", 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;
                     }
@@ -9397,8 +9641,55 @@
                 }
                 catch (Exception e)
                 {
-                    LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+                    LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
                     sErrMsg = "瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
+                    oCn.RollBack();
+                    return false;
+                }
+            }
+            else if (oSystemParameterMain.Kf_MoveStockBill_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_TransferDirect", 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;
                 }
@@ -9455,7 +9746,7 @@
                 int sYear = 0;
                 int sPeriod = 0;
 
-                if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                 {
                     oMain.HDate = DateTime.Today;
                 }
@@ -9495,7 +9786,7 @@
 
                 //鏍规嵁TMP琛� 杩斿洖 淇℃伅
                 DataSet Ds;
-                if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+                if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
                     Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_SeOutStock_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_SeOutStock_PUBCLD_New");
                     sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -9517,7 +9808,7 @@
                     string sJson_Date = "";             //鍗曟嵁鏃ユ湡
                     sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
 
-                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                     {
                         sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
                     }
@@ -9753,7 +10044,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;
@@ -9774,19 +10074,19 @@
             }
             catch (Exception e)
             {
-                LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+                LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
                 sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
                 oCn.RollBack();
                 return false;
             }
 
-            if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
+            if (oSystemParameterMain.Kf_MoveStockBill_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 = "";
@@ -9794,16 +10094,29 @@
                     var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
                     new object[] { "STK_TransferDirect", 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_TransferDirect", 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;
                     }
@@ -9817,8 +10130,55 @@
                 }
                 catch (Exception e)
                 {
-                    LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+                    LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
                     sErrMsg = "瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
+                    oCn.RollBack();
+                    return false;
+                }
+            }
+            else if (oSystemParameterMain.Kf_MoveStockBill_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_TransferDirect", 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;
                 }
@@ -9875,7 +10235,7 @@
                 int sYear = 0;
                 int sPeriod = 0;
 
-                if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                 {
                     oMain.HDate = DateTime.Today;
                 }
@@ -9914,7 +10274,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 = "3814";
                     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");
@@ -9924,7 +10284,7 @@
 
                 //鏍规嵁TMP琛� 杩斿洖 淇℃伅
                 DataSet Ds;
-                if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+                if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
                     Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MoveStockRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MoveStockRequest_PUBCLD_New");
                     sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -9946,7 +10306,7 @@
                     string sJson_Date = "";             //鍗曟嵁鏃ユ湡
                     sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
 
-                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                     {
                         sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
                     }
@@ -10167,7 +10527,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;
@@ -10188,19 +10557,19 @@
             }
             catch (Exception e)
             {
-                LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+                LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
                 sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
                 oCn.RollBack();
                 return false;
             }
 
-            if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
+            if (oSystemParameterMain.Kf_MoveStockBill_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 = "";
@@ -10208,16 +10577,29 @@
                     var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
                     new object[] { "STK_TransferDirect", 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_TransferDirect", 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;
                     }
@@ -10231,8 +10613,55 @@
                 }
                 catch (Exception e)
                 {
-                    LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+                    LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
                     sErrMsg = "瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
+                    oCn.RollBack();
+                    return false;
+                }
+            }
+            else if (oSystemParameterMain.Kf_MoveStockBill_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_TransferDirect", 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;
                 }
@@ -10289,7 +10718,7 @@
                 int sYear = 0;
                 int sPeriod = 0;
 
-                if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                 {
                     oMain.HDate = DateTime.Today;
                 }
@@ -10329,7 +10758,7 @@
 
                 //鏍规嵁TMP琛� 杩斿洖 淇℃伅
                 DataSet Ds;
-                if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+                if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
                     Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_StockOutRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_StockOutRequest_PUBCLD_New");
                     sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -10351,7 +10780,7 @@
                     string sJson_Date = "";             //鍗曟嵁鏃ユ湡
                     sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
 
-                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                     {
                         sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
                     }
@@ -10564,7 +10993,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;
@@ -10585,19 +11023,19 @@
             }
             catch (Exception e)
             {
-                LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+                LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
                 sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
                 oCn.RollBack();
                 return false;
             }
 
-            if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
+            if (oSystemParameterMain.Kf_MoveStockBill_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 = "";
@@ -10605,16 +11043,29 @@
                     var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
                     new object[] { "STK_TransferDirect", 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_TransferDirect", 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;
                     }
@@ -10628,8 +11079,55 @@
                 }
                 catch (Exception e)
                 {
-                    LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+                    LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
                     sErrMsg = "瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
+                    oCn.RollBack();
+                    return false;
+                }
+            }
+            else if (oSystemParameterMain.Kf_MoveStockBill_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_TransferDirect", 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;
                 }
@@ -10686,7 +11184,7 @@
                 int sYear = 0;
                 int sPeriod = 0;
 
-                if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                 {
                     oMain.HDate = DateTime.Today;
                 }
@@ -10726,7 +11224,7 @@
 
                 //鏍规嵁TMP琛� 杩斿洖 淇℃伅
                 DataSet Ds;
-                if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+                if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
                     Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MateOutRequest_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MateOutRequest_PUBCLD_New");
                     sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -10748,7 +11246,7 @@
                     string sJson_Date = "";             //鍗曟嵁鏃ユ湡
                     sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
 
-                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                     {
                         sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
                     }
@@ -10961,7 +11459,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;
@@ -10982,19 +11489,19 @@
             }
             catch (Exception e)
             {
-                LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+                LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
                 sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
                 oCn.RollBack();
                 return false;
             }
 
-            if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
+            if (oSystemParameterMain.Kf_MoveStockBill_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 = "";
@@ -11002,16 +11509,29 @@
                     var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
                     new object[] { "STK_TransferDirect", 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_TransferDirect", 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;
                     }
@@ -11025,8 +11545,55 @@
                 }
                 catch (Exception e)
                 {
-                    LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+                    LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
                     sErrMsg = "瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
+                    oCn.RollBack();
+                    return false;
+                }
+            }
+            else if (oSystemParameterMain.Kf_MoveStockBill_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_TransferDirect", 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;
                 }
@@ -11083,7 +11650,7 @@
                 int sYear = 0;
                 int sPeriod = 0;
 
-                if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                 {
                     oMain.HDate = DateTime.Today;
                 }
@@ -11122,7 +11689,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 = "3814";
                     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");
@@ -11132,7 +11699,7 @@
 
                 //鏍规嵁TMP琛� 杩斿洖 淇℃伅
                 DataSet Ds;
-                if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+                if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
                     Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_PrepareMTRL_PUBCLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_PrepareMTRL_PUBCLD_New");
                     sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -11154,7 +11721,7 @@
                     string sJson_Date = "";             //鍗曟嵁鏃ユ湡
                     sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
 
-                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                     {
                         sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
                     }
@@ -11363,7 +11930,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;
@@ -11384,19 +11960,19 @@
             }
             catch (Exception e)
             {
-                LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+                LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
                 sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
                 oCn.RollBack();
                 return false;
             }
 
-            if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
+            if (oSystemParameterMain.Kf_MoveStockBill_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 = "";
@@ -11404,16 +11980,29 @@
                     var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
                     new object[] { "STK_TransferDirect", 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_TransferDirect", 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;
                     }
@@ -11427,8 +12016,55 @@
                 }
                 catch (Exception e)
                 {
-                    LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+                    LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
                     sErrMsg = "瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
+                    oCn.RollBack();
+                    return false;
+                }
+            }
+            else if (oSystemParameterMain.Kf_MoveStockBill_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_TransferDirect", 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;
                 }
@@ -11485,7 +12121,7 @@
                 int sYear = 0;
                 int sPeriod = 0;
 
-                if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "N") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                 {
                     oMain.HDate = DateTime.Today;
                 }
@@ -11522,7 +12158,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 = "3814";
                     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");
@@ -11532,7 +12168,7 @@
 
                 //鏍规嵁TMP琛� 杩斿洖 淇℃伅
                 DataSet Ds;
-                if (oSystemParameterMain.WMS_CloudMode == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+                if (oSystemParameterMain.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟  鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
                 {
                     Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveOutBill_PUBCLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveOutBill_PUBCLD");
                     sRemark = sRemark + " 锛涘叕鏈変簯妯″紡";
@@ -11565,7 +12201,7 @@
                         sJson_BillTypeID = "\"FBillTypeID\":{ \"FNumber\":\"" + oMain.HBillSubType + "\" },";
                     }
 
-                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+                    if (oSystemParameterMain.Kf_MoveStockBill_BillDateMode.ToUpper() == "Y") //绯荤粺鍙傛暟  鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
                     {
                         sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
                     }
@@ -11763,7 +12399,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;
@@ -11784,13 +12429,13 @@
             }
             catch (Exception e)
             {
-                LogService.Write("鐢熸垚鍥炴粴" + sRemark);
+                LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
                 sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
                 oCn.RollBack();
                 return false;
             }
 
-            if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
+            if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
             {
                 try
                 {
@@ -11804,16 +12449,29 @@
                     var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
                     new object[] { "STK_TransferDirect", 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_TransferDirect", 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;
                     }
@@ -11827,12 +12485,59 @@
                 }
                 catch (Exception e)
                 {
-                    LogService.Write("瀹℃牳鍥炴粴" + sRemark);
+                    LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
                     sErrMsg = "瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
                     oCn.RollBack();
                     return false;
                 }
             }
+            else if (oSystemParameterMain.Kf_MoveStockBill_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_TransferDirect", 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);

--
Gitblit v1.9.1