jingh
2021-04-06 ad36c7a7ddefbddbaa1c690e9747ab6b5e6f646f
CLOUDWEB/WebService1.asmx.cs
@@ -5242,9 +5242,9 @@
        private bool SaveMoveMaterOut_CLD(Model.ClsKf_MoveStockBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
        {
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            DataSet Ds;
            try
            {
                DataSet Ds;
                //
                oCn.BeginTran();
                //写入WMS调拨单
@@ -5278,13 +5278,22 @@
                {
                    oCn.RunProc("exec h_p_Kf_MoveMaterOut_UpdateSourceByBarCodeBill " + oMain.HInterID.ToString());
                }
                oCn.Commit();
            }
            catch(Exception e)
            {
                sErrMsg = "生成领料调拨单失败111!" + e.Message;
                oCn.RollBack();
                return false;
            }
            try
            {
                //根据TMP表 返回 子表信息
                Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveMaterOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveMaterOutBill_CLD");
                if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                {
                    sErrMsg = "获取子表信息失败!";
                    oCn.RollBack();
                    //oCn.RollBack();
                    return false;
                }
                else
@@ -5446,6 +5455,8 @@
                        var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save",
                        new object[] { "STK_TransferDirect", sJson });
                        if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //系统参数  自动审核 
                        {
                            string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
@@ -5465,19 +5476,19 @@
                        if (HReturn.Contains("\"IsSuccess\":false") == true)
                        {
                            sErrMsg = "生成领料调拨单失败!" + HReturn + sJson;
                            oCn.RollBack();
                            //oCn.RollBack();
                            return false;
                        }
                        else
                        {
                            oCn.Commit();
                            return true;
                        }
                    }
                    else
                    {
                        sErrMsg = "生成领料调拨单失败!登录失败!";
                        oCn.RollBack();
                        //oCn.RollBack();
                        return false;
                    }
                }
@@ -5485,7 +5496,7 @@
            catch (Exception e)
            {
                sErrMsg = "生成领料调拨单失败!" + e.Message;
                oCn.RollBack();
                //oCn.RollBack();
                return false;
            }
        }
@@ -5494,9 +5505,10 @@
        private bool SaveMoveSellOut_CLD(Model.ClsKf_MoveStockBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
        {
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            DataSet Ds;
            try
            {
                DataSet Ds;
                //
                oCn.BeginTran();
                //写入WMS调拨单
@@ -5525,13 +5537,23 @@
                    //审核单据
                    oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=convert(varchar(10),getdate(),120),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
                }
                oCn.Commit();
            }
            catch(Exception e)
            {
                sErrMsg = "生成发货调拨单失败111!" + e.Message;
                oCn.RollBack();
                return false;
            }
            try
            {
                //根据TMP表 返回 子表信息
                Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveSellOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveSellOutBill_CLD");
                if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                {
                    sErrMsg = "获取子表信息失败!";
                    oCn.RollBack();
                    //oCn.RollBack();
                    return false;
                }
                else
@@ -5719,6 +5741,9 @@
                        var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save",
                        new object[] { "STK_TransferDirect", sJson });
                        ////生成单据后更新自定义字段
                        oCn.RunProc("exec h_p_Sc_UpDateSelfFildMove '" + oMain.HBillNo + "'");
                        if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //系统参数  自动审核 
                        {
                            string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
@@ -5738,7 +5763,7 @@
                        if (HReturn.Contains("\"IsSuccess\":false") == true)
                        {
                            sErrMsg = "生成发货调拨单失败!" + HReturn + sJson;
                            oCn.RollBack();
                            //oCn.RollBack();
                            return false;
                        }
                        else
@@ -5760,25 +5785,24 @@
                                }
                            }
                            ////生成单据后更新自定义字段
                            oCn.RunProc("exec h_p_Sc_UpDateSelfFildMove '" + oMain.HBillNo + "'");
                            oCn.Commit();
                            return true;
                        }
                    }
                    else
                    {
                        sErrMsg = "生成发货调拨单失败!登录失败!";
                        oCn.RollBack();
                        sErrMsg = "生成金蝶云发货调拨单失败!登录失败!";
                        //oCn.RollBack();
                        return false;
                    }
                }
            }
            catch (Exception e)
            catch (Exception e1)
            {
                sErrMsg = "生成发货调拨单失败!" + e.Message;
                oCn.RollBack();
                sErrMsg = "生成金蝶云发货调拨单失败!" + e1.Message;
                //oCn.RollBack();
                return false;
            }
        }
@@ -10754,9 +10778,9 @@
        private bool SaveSellOutBill_CLD(Model.ClsKf_SellOutBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
        {
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            DataSet Ds;
            try
            {
                DataSet Ds;
            {
                //
                oCn.BeginTran();
                //写入WMS销售出库单
@@ -10783,13 +10807,22 @@
                    //审核单据
                    oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=convert(varchar(10),getdate(),120),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
                }
                oCn.Commit();
            }
            catch (Exception e)
            {
                sErrMsg = "生成销售出库单失败1!" + e.Message;
                oCn.RollBack();
                return false;
            }
            try
            {
                //根据TMP表 返回 子表信息
                Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_CLD");
                if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                {
                    sErrMsg = "获取子表信息失败!";
                    oCn.RollBack();
                    sErrMsg = "获取子表信息失败!";
                    return false;
                }
                else
@@ -10929,7 +10962,7 @@
                        "\"FEntryTaxRate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntryTaxRate"]) + "\"," +
                        "\"FStockID\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockID"]) + "\" }," +
                        sJson_StockPlace +
                            //"\"FStockLocId\":{\"FSTOCKLOCID__FF100002\":{\"FNUMBER\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) + "\"}}," +
                        //"\"FStockLocId\":{\"FSTOCKLOCID__FF100002\":{\"FNUMBER\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) + "\"}}," +
                        "\"FStockStatusID\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockStatusID"]) + "\" }," +
                        "\"FSalUnitID\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSalUnitID"]) + "\" }," +
                        "\"FSALUNITQTY\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSALUNITQTY"]) + "\"," +
@@ -10938,11 +10971,11 @@
                        "\"FOUTCONTROL\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOUTCONTROL"]) + "\"," +
                        "\"FIsOverLegalOrg\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsOverLegalOrg"]) + "\"," +
                        "\"FARNOTJOINQTY\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FARNOTJOINQTY"]) + "\"," +
                            //"\"F_PAEZ_Text\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_PAEZ_Text"]) + "\"," +
                            //"\"F_PAEZ_Text1\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_PAEZ_Text1"]) + "\"," +
                        //"\"F_PAEZ_Text\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_PAEZ_Text"]) + "\"," +
                        //"\"F_PAEZ_Text1\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_PAEZ_Text1"]) + "\"," +
                        sJson_BatchNo +
                            //"\"FLot\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLot"]) + "\" }," +
                            //"\"FCheckDelivery\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FCheckDelivery"]) + "\"," +
                        //"\"FLot\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLot"]) + "\" }," +
                        //"\"FCheckDelivery\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FCheckDelivery"]) + "\"," +
                        "\"FSRCBILLNO\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSRCBILLNO"]) + "\"," +
                        "\"FSOORDERNO\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSOORDERNO"]) + "\"," +
                        "\"FSRCTYPE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSRCTYPE"]) + "\"," +
@@ -10997,7 +11030,7 @@
                        ////生成单据后更新自定义字段
                        oCn.RunProc("exec h_p_Sc_UpDateSelfFildSellOut '" + oMain.HBillNo + "'");
                        //
                        if (oSystemParameterMain.Kf_SellOutBill_AutoCheck == "Y") //系统参数  自动审核 
                        {
                            string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
@@ -11017,7 +11050,7 @@
                        if (HReturn.Contains("\"IsSuccess\":false") == true)
                        {
                            sErrMsg = "生成销售出库单失败!" + HReturn + sJson;
                            oCn.RollBack();
                            //oCn.RollBack();
                            return false;
                        }
                        else
@@ -11039,22 +11072,22 @@
                                }
                            }
                            oCn.Commit();
                            return true;
                        }
                    }
                    else
                    {
                        sErrMsg = "生成销售出库单失败!登录失败!";
                        oCn.RollBack();
                        //oCn.RollBack();
                        return false;
                    }
                }
            }
            catch (Exception e)
            catch (Exception e1)
            {
                sErrMsg = "生成销售出库单失败!" + e.Message;
                oCn.RollBack();
                sErrMsg = "生成销售出库单失败!" + e1.Message;
                //oCn.RollBack();
                return false;
            }
        }