1

wtt

2024-09-05 877a3643ea89282775a2a5ca25a2d79fbdfad0b7

 WebAPI/WebServer.cs

@@ -5,7 +5,7 @@
using System.Data;
using System.Linq;
using System.Web;
using Kingdee.BOS.WebApi.Client;
//using Kingdee.BOS.WebApi.Client;


namespace WebAPI
@@ -53,6 +53,8 @@
            //DAL.ClsIF_Department_View dal = new DAL.ClsIF_Department_View();
            //return dal.GetList(sWhere);
        }

       

        /// <summary>
        /// 获取物料列表
@@ -122,6 +124,7 @@
            //return dal.GetList(sWhere);
        }
        #endregion


        #region 一键扫码    入库模块

@@ -1121,6 +1124,7 @@

        #endregion


        #region 外购退料    外购入库（红字）   *

        public bool set_SavePOStockInBackBill_New(WebAPI.WebS.ClsKf_ICStockBillMain oMain, string sHSourceType, ref string sErrMsg)
@@ -1128,7 +1132,7 @@
            WebS.WebService1 oWebs = new WebS.WebService1();
            if (oWebs.set_SavePOStockInBackBill_New(oMain, sHSourceType, ref sErrMsg))
            {
                sErrMsg = "保存成功！" + oMain.HBillNo;
                //sErrMsg = "保存成功！" + oMain.HBillNo;
                return true;
            }
            else
@@ -1618,7 +1622,7 @@
            WebS.WebService1 oWebs = new WebS.WebService1();
            if (oWebs.set_SaveEntrustInBackBill_New(oMain, sHSourceType, ref sErrMsg))
            {
                sErrMsg = "保存成功！" + oMain.HBillNo;
                //sErrMsg = "保存成功！" + oMain.HBillNo;
                return true;
            }
            else
@@ -1856,7 +1860,7 @@
            WebS.WebService1 oWebs = new WebS.WebService1();
            if (oWebs.set_SaveProductInBackBill_New(oMain, sHSourceType, ref sErrMsg))
            {
                sErrMsg = "保存成功！" + oMain.HBillNo;
                //sErrMsg = "保存成功！" + oMain.HBillNo;
                return true;
            }
            else
@@ -1990,6 +1994,11 @@
        public DataSet GetKf_ProductInBillList(string sWhere)
        {
            DAL.Cls_S_IF_ProductInBill_Lite dal = new DAL.Cls_S_IF_ProductInBill_Lite();
            return dal.DisSourceBillList(sWhere);
        }
        public DataSet GetKf_MoveStockRequestBillList(string sWhere)
        {
            DAL.Cls_S_IF_MoveStockRequestBill_Lite dal = new DAL.Cls_S_IF_MoveStockRequestBill_Lite();
            return dal.DisSourceBillList(sWhere);
        }
        #endregion
@@ -2306,7 +2315,7 @@
            WebS.WebService1 oWebs = new WebS.WebService1();
            if (oWebs.set_SaveMateOutBackBill_New(oMain, sHSourceType, ref sErrMsg))
            {
                sErrMsg = "保存成功！" + oMain.HBillNo;
                //sErrMsg = "保存成功！" + oMain.HBillNo;
                return true;
            }
            else
@@ -2863,7 +2872,7 @@
            WebS.WebService1 oWebs = new WebS.WebService1();
            if (oWebs.set_SaveSellOutBackBill_New(oMain, sHSourceType, ref sErrMsg))
            {
                sErrMsg = "保存成功！" + oMain.HBillNo;
                //sErrMsg = "保存成功！" + oMain.HBillNo;
                return true;
            }
            else
@@ -3832,6 +3841,28 @@
            }
        }

        //根据托条码  获取条码档案列表唯一码信息
        public DataSet GetBarCode(string HBarCode)
        {
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            //
            try
            {
                DataSet DS = oCn.RunProcReturn("select HBarCode,HQty from Sc_PackUnionBillSub where HBarCode_Pack ='" + HBarCode.ToString() + "'", "Sc_PackUnionBillSub", ref DBUtility.ClsPub.sExeReturnInfo);
                //DataSet DS = oCn.RunProcReturn("Select * from h_v_Sc_AssemblyBill Where HInterID=" + HInterID.ToString() + " and HBillType='" + sBillType + "' " + sWhere, "h_v_Sc_AssemblyBill", ref DBUtility.ClsPub.sExeReturnInfo);
                if (DS.Tables[0].Rows.Count == 0)
                    return null;
                else
                {
                    return DS;
                }
            }
            catch (Exception e)
            {
                throw (e);
            }
        }

        public DataSet GetHBW(long HBadType)
        {
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
@@ -3878,7 +3909,7 @@
            WebS.WebService1 oWebs = new WebS.WebService1();
            if (oWebs.set_SaveMoveStockBill(oMain, sHSourceType, ref sErrMsg))
            {
                sErrMsg = "保存成功！" + oMain.HBillNo;
                //sErrMsg = "保存成功！" + oMain.HBillNo;
                return true;
            }
            else
@@ -3989,6 +4020,44 @@
            //sErrMsg = "保存调拨单失败！" + sErrMsg;
            //return false;
        }




        //public bool set_SaveMoveStockBill_PD(WebAPI.WebS.ClsKf_MoveStockBillMain oMain, string sHSourceType, ref string sErrMsg)
        //{
        //    WebS.WebService1 oWebs = new WebS.WebService1();
        //    if (oWebs.set_SaveMoveStockBill_PD(oMain, sHSourceType, ref sErrMsg))
        //    {
        //        sErrMsg = "保存成功！" + oMain.HBillNo;
        //        return true;
        //    }
        //    else
        //    {
        //        sErrMsg = "单据号：" + oMain.HBillNo + ", 单据ID：" + oMain.HInterID + ";" + sErrMsg;
        //        return false;
        //    }

        //}

        public bool set_MoveStockStepOutBill(WebAPI.WebS.ClsKf_MoveStockStepOutBillMain oMain, string sHSourceType, ref string sErrMsg)
        {
            WebS.WebService1 oWebs = new WebS.WebService1();
            if (oWebs.set_SaveMoveStockStepOutBill_New(oMain, sHSourceType, ref sErrMsg))
            {
                //sErrMsg = "保存成功！" + oMain.HBillNo;
                return true;
            }
            else
            {
                sErrMsg = "单据号：" + oMain.HBillNo + ", 单据ID：" + oMain.HInterID + ";" + sErrMsg;
                return false;
            }

            
        }


        //删除记录
        public bool set_DelPonderationBillMain_Temp_InterIDAndSource(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType, ref string sErrMsg)
        {
@@ -4022,6 +4091,68 @@
                return false;
            }
        }
        //删除单据临时表信息
        public bool DeleteBill_AN(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType, ref string sErrMsg)
        {
            //DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
            //if (dal.DeleteByInterIDAndSource(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType))
            //{
            //    sErrMsg = "删除成功！";
            //    return true;
            //}
            //else
            //{
            //    sErrMsg = "删除失败！";
            //    return false;
            //}
            WebS.WebService1 oWebs = new WebS.WebService1();

            if (oWebs.set_DelPonderationBillMain_Temp_InterIDAndSource(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType, ref DBUtility.ClsPub.sErrInfo))
            {
                sErrMsg = "删除成功！";
                return true;
            }
            else
            {
                sErrMsg = "删除失败！";
                return false;
            }

            //if (WebSoBar == null)
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}
            //else
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 1;
            //    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
            //    objJsonResult.data = WebSoBar;
            //    return objJsonResult;
            //}

        }

        //删除单据临时表信息
        public bool DeleteBill(Int64 sHInterID, string HBillNo, string HBillType, string HBarCode, ref string sErrMsg)
        {
            DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
            if (dal.DeleteBill(sHInterID, HBillNo, HBillType, HBarCode))
            {
                sErrMsg = "删除成功！";
                return true;
            }
            else
            {
                sErrMsg = "删除失败！";
                return false;
            }
        }

        //public Model.ClsGy_BarCodeBill_WMS_Model_View get_InfoByBarCode_Source(string sBarCode, Int64 sInterID, ref bool sBool, ref string sErrMsg)
        //{
        //    SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -4054,7 +4185,7 @@
        //        return null;
        //    }
        //}
 

        #endregion

        #region 外购入库
@@ -4261,6 +4392,19 @@
            //return dal.GetInfoByID_View(HInterID, sBillType, sWhere);
        }

        public bool Get_CheckQtyByBarCode(string sBarcode, long HWHID, long HSPID, long HAuxPropID, string sBatchNo, string HMTONo, double sQty, ref double sRelQty)
        {
            DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
            if (dal.CheckQtyByBarCode(sBarcode, HWHID, HSPID, HAuxPropID, sBatchNo, HMTONo, sQty, ref sRelQty))
            {
                return true;
            }
            else
            {
                return false;
            }
        }

        public DataSet GetSPInfoByIDandHWHIDandOrg(long sItemID, long sHWHID, long HUSEORGID, ref string sErrMsg)
        {
            BLL.ClsIF_StockPlace_View bll = new BLL.ClsIF_StockPlace_View();
@@ -4408,11 +4552,20 @@


        //返回缓存列表信息  同步资料
        public DataSet GetKf_PonderationBillMain_TempList_New(string sHBillType, string sHMaker, Int64 sHOWNERID)
        {
            DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
            return dal.GetKf_PonderationBillMain_TempList_New(sHBillType, sHMaker, sHOWNERID);
        }


        //返回缓存列表信息  同步资料
        public DataSet GetKf_PonderationBillMain_TempList(string sHBillType, string sWhere)
        {
            DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
            return dal.GetKf_PonderationBillMain_TempList(sHBillType, sWhere);
        }




@@ -4469,12 +4622,12 @@
                //判断是否反写成功
                if (set_UpdateHStatus(oMain.HInterID, oMain.HExplanation.ToString()))
                {
                    sErrMsg = "保存成功！" + oMain.HBillNo;
                    //sErrMsg = "保存成功！" + oMain.HBillNo;
                    return true;
                }
                else
                {
                    sErrMsg = "保存成功！" + oMain.HBillNo + "状态反写失败！";
                    //sErrMsg = "保存成功！" + oMain.HBillNo + "状态反写失败！";
                    return true;
                }
            }
@@ -4484,6 +4637,60 @@
                return false;
            }
        }

        public bool set_SaveICMOReportBill_Json(WebAPI.WebS.ClsSc_ICMOReportBillMain oMain, string sHSourceType, ref string sErrMsg)
        {
            //BLL.ClsKf_POStockInBill bll = new BLL.ClsKf_POStockInBill();
            //return bll.set_SavePOStockInBill_New(oMain, sHSourceType, ref DBUtility.ClsPub.sExeReturnInfo);
            WebS.WebService1 oWebs = new WebS.WebService1();
            if (oWebs.set_SaveICMOReportBill_New(oMain, sHSourceType, ref sErrMsg))
            {
                //判断是否反写成功
                //if (set_UpdateHStatus(oMain.HInterID, oMain.HExplanation.ToString()))
                //{
                    sErrMsg = "保存成功！" + oMain.HBillNo;
                    return true;
                //}
                //else
                //{
                //    sErrMsg = "保存成功！" + oMain.HBillNo + "状态反写失败！";
                //    return true;
                //}
            }
            else
            {
                sErrMsg = "单据号：" + oMain.HBillNo + ", 单据ID：" + oMain.HInterID + ";" + sErrMsg;
                return false;
            }
        }


        //public bool set_SavePOInStockBill_NEW_Json(WebAPI.WebS.ClsCg_POInStockBillMain oMain, ref string sErrMsg)
        //{
        //    //BLL.ClsKf_POStockInBill bll = new BLL.ClsKf_POStockInBill();
        //    //return bll.set_SavePOStockInBill_New(oMain, sHSourceType, ref DBUtility.ClsPub.sExeReturnInfo);
        //    WebS.WebService1 oWebs = new WebS.WebService1();
        //    if (oWebs.set_SavePOInStockBill_Json(oMain, ref sErrMsg))
        //    {
        //        //判断是否反写成功
        //        //if (set_UpdateHStatus(oMain.HInterID, oMain.HExplanation.ToString()))
        //        //{
        //        sErrMsg = "保存成功！" + oMain.HBillNo;
        //        return true;
        //        //}
        //        //else
        //        //{
        //        //    sErrMsg = "保存成功！" + oMain.HBillNo + "状态反写失败！";
        //        //    return true;
        //        //}
        //    }
        //    else
        //    {
        //        sErrMsg = "单据号：" + oMain.HBillNo + ", 单据ID：" + oMain.HInterID + ";" + sErrMsg;
        //        return false;
        //    }
        //}


        /// <summary>
        /// 生成外购入库单K3
@@ -4839,17 +5046,19 @@
            WebS.WebService1 oWebs = new WebS.WebService1();
            if (oWebs.set_SaveProductInBill_New(oMain, sHSourceType, ref sErrMsg))
            {
                //判断是否反写成功
                if (set_UpdateHStatus(oMain.HInterID,oMain.HExplanation.ToString()))
                {
                    sErrMsg = "保存成功！" + oMain.HBillNo;
                    return true;
                }
                else
                {
                    sErrMsg = "保存成功！" + oMain.HBillNo + "状态反写失败！";
                    return true;
                }
                ////判断是否反写成功
                //if (set_UpdateHStatus(oMain.HInterID,oMain.HExplanation.ToString()))
                //{
                //    sErrMsg = "保存成功！" + oMain.HBillNo;
                //    return true;
                //}
                //else
                //{
                //    sErrMsg = "保存成功！" + oMain.HBillNo + "状态反写失败！";
                //    return true;
                //}
                //sErrMsg = "保存成功！" + oMain.HBillNo;
                return true;
            }
            else
            {
@@ -4929,7 +5138,7 @@
             WebS.WebService1 oWebs = new WebS.WebService1();
             if (oWebs.set_SaveMateOutBill_New(oMain, sHSourceType, ref sErrMsg))
             {
                 sErrMsg = "保存成功！" + oMain.HBillNo;
                 //sErrMsg = "保存成功！" + oMain.HBillNo;
                 return true;
             }
             else
@@ -5391,12 +5600,12 @@
                //判断是否反写成功
                if (set_UpdateHStatus(oMain.HInterID, oMain.HExplanation.ToString()))
                {
                    sErrMsg = "保存成功！" + oMain.HBillNo;
                    //sErrMsg = "保存成功！" + oMain.HBillNo;
                    return true;
                }
                else
                {
                    sErrMsg = "保存成功！" + oMain.HBillNo + "状态反写失败！";
                    //sErrMsg = "保存成功！" + oMain.HBillNo + "状态反写失败！";
                    return true;
                }
            }
@@ -5661,7 +5870,7 @@
              WebS.WebService1 oWebs = new WebS.WebService1();
             if (oWebs.set_SaveEntrustOutBackBill_New(oMain, sHSourceType, ref sErrMsg))
             {
                 sErrMsg = "保存成功！" + oMain.HBillNo;
                 //sErrMsg = "保存成功！" + oMain.HBillNo;
                 return true;
             }
             else
@@ -6104,48 +6313,48 @@

                     //生成 委外出库 
                     string HReturn;
                     ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
                     string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
                     bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
                     if (bLogin)
                     {
                         var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save",
                         new object[] { "SUB_PickMtrl", sJson });
                     //ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
                     //string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
                     //bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
                     //if (bLogin)
                     //{
                     //    var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save",
                     //    new object[] { "SUB_PickMtrl", sJson });

                         if (oSystemParameterMain.Kf_EntrustOutBill_AutoCheck == "Y") //系统参数  自动审核 
                         {
                             string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
                             var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
                             new object[] { "SUB_PickMtrl", sJson2 });
                     //    if (oSystemParameterMain.Kf_EntrustOutBill_AutoCheck == "Y") //系统参数  自动审核 
                     //    {
                     //        string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
                     //        var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
                     //        new object[] { "SUB_PickMtrl", sJson2 });

                             string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
                             var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
                             new object[] { "SUB_PickMtrl", sJson3 });
                     //        string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
                     //        var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
                     //        new object[] { "SUB_PickMtrl", sJson3 });

                             HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
                         }
                         else
                         {
                             HReturn = result.ToString();
                         }
                         if (HReturn.Contains("\"IsSuccess\":false") == true)
                         {
                             sErrMsg = "生成委外出库单失败！" + HReturn + sJson;
                             oCn.RollBack();
                             return false;
                         }
                         else
                         {
                             oCn.Commit();
                     //        HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
                     //    }
                     //    else
                     //    {
                     //        HReturn = result.ToString();
                     //    }
                     //    if (HReturn.Contains("\"IsSuccess\":false") == true)
                     //    {
                     //        sErrMsg = "生成委外出库单失败！" + HReturn + sJson;
                     //        oCn.RollBack();
                     //        return false;
                     //    }
                     //    else
                     //    {
                     //        oCn.Commit();
                             return true;
                         }
                     }
                     else
                     {
                         sErrMsg = "生成委外出库单失败！登录失败！";
                         oCn.RollBack();
                         return false;
                     }
                         //}
                     //}
                     //else
                     //{
                     //    sErrMsg = "生成委外出库单失败！登录失败！";
                     //    oCn.RollBack();
                     //    return false;
                     //}
                 }
             }
             catch (Exception e)
@@ -6187,7 +6396,7 @@
             WebS.WebService1 oWebs = new WebS.WebService1();
             if (oWebs.set_SaveEntrustOutBill_New(oMain, sHSourceType, ref sErrMsg))
             {
                 sErrMsg = "保存成功！" + oMain.HBillNo;
                 //sErrMsg = "保存成功！" + oMain.HBillNo;
                 return true;
             }
             else
@@ -6978,61 +7187,61 @@
         }


         //生成其他入库单 
         //public bool set_SaveOtherInBill_New(Model.ClsKf_OtherInBillMain oMain, string sHSourceType, ref string sErrMsg)
         //{
         //    //获取系统参数
         //    Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
         //    if (oSystemParameter.ShowBill(ref sErrMsg) == false)
         //    {
         //        sErrMsg = "获取系统参数失败！ " + sErrMsg;
         //        return false;
         //    }
         //    //
         //    if (oSystemParameter.omodel.Kf_OtherInBill_ERPMode.ToUpper() == "WISE") //判断同步模式是金蝶WISE
         //    {
         //        if (SaveOtherInBill_K3(oMain, sHSourceType, oSystemParameter.omodel, ref sErrMsg))
         //        {
         //            //"保存成功！";
         //            sErrMsg = "保存成功！" + oMain.HBillNo;
         //            return true;
         //        }
         //        else
         //        {
         //            //"保存失败！";
         //            sErrMsg = sErrMsg;
         //            return false;
         //        }
         //    }
         //    if (oSystemParameter.omodel.Kf_OtherInBill_ERPMode.ToUpper() == "CLOUD")  //判断同步模式是金蝶CLOUD
         //    {
         //       ////上传前必填项判断
         //       //if (oMain.HDeptID == 0)
         //       //{
         //       //    sErrMsg = "部门没有选择！";
         //       //    return false;
         //       //}
         //       //同步生成CLOUD单据
         //       //if (SaveOtherInBill_CLD(oMain, sHSourceType, oSystemParameter.omodel, ref sErrMsg) == true)
         //       //{
         //       //    //"保存成功！";
         //       //    return true;
         //       //}
         //       //else
         //       //{
         //       //    //"保存失败！";
         //       //    return false;
         //       //}
         //   }
        //生成其他入库单 
        //public bool set_SaveOtherInBill_New(Model.ClsKf_OtherInBillMain oMain, string sHSourceType, ref string sErrMsg)
        //{
        //    //获取系统参数
        //    Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        //    if (oSystemParameter.ShowBill(ref sErrMsg) == false)
        //    {
        //        sErrMsg = "获取系统参数失败！ " + sErrMsg;
        //        return false;
        //    }
        //    //
        //    if (oSystemParameter.omodel.Kf_OtherInBill_ERPMode.ToUpper() == "WISE") //判断同步模式是金蝶WISE
        //    {
        //        if (SaveOtherInBill_K3(oMain, sHSourceType, oSystemParameter.omodel, ref sErrMsg))
        //        {
        //            //"保存成功！";
        //            sErrMsg = "保存成功！" + oMain.HBillNo;
        //            return true;
        //        }
        //        else
        //        {
        //            //"保存失败！";
        //            sErrMsg = sErrMsg;
        //            return false;
        //        }
        //    }
        //    if (oSystemParameter.omodel.Kf_OtherInBill_ERPMode.ToUpper() == "CLOUD")  //判断同步模式是金蝶CLOUD
        //    {
        //       ////上传前必填项判断
        //       //if (oMain.HDeptID == 0)
        //       //{
        //       //    sErrMsg = "部门没有选择！";
        //       //    return false;
        //       //}
        //       //同步生成CLOUD单据
        //       //if (SaveOtherInBill_CLD(oMain, sHSourceType, oSystemParameter.omodel, ref sErrMsg) == true)
        //       //{
        //       //    //"保存成功！";
        //       //    return true;
        //       //}
        //       //else
        //       //{
        //       //    //"保存失败！";
        //       //    return false;
        //       //}
        //   }

         //    sErrMsg = "保存其他入库单失败！" + sErrMsg;
         //    return false;
         //}
        //    sErrMsg = "保存其他入库单失败！" + sErrMsg;
        //    return false;
        //}

         public bool set_SaveOtherInBill_New(WebAPI.WebS.ClsKf_OtherInBillMain oMain, string sHSourceType,WebS.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
         {
        public bool set_SaveOtherInBill_New(WebAPI.WebS.ClsKf_OtherInBillMain oMain, string sHSourceType, WebS.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
        {
            WebS.WebService1 oWebs = new WebS.WebService1();//set_SaveOtherInBill_CLD_New
            if (oWebs.set_SaveOtherInBill_CLD_New(oMain, sHSourceType,oSystemParameterMain,ref sErrMsg))
            if (oWebs.set_SaveOtherInBill_CLD_New(oMain, sHSourceType, oSystemParameterMain, ref sErrMsg))
            {
                sErrMsg = "保存成功！" + oMain.HBillNo;
                return true;
@@ -7230,48 +7439,48 @@

                    //生成 其他入库单 1个物料1单
                    string HReturn;
                    ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
                    string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
                    bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
                    if (bLogin)
                    {
                        var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save",
                        new object[] { "STK_MISCELLANEOUS", sJson });
                    //ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
                    //string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
                    //bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
                    //if (bLogin)
                    //{
                    //    var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save",
                    //    new object[] { "STK_MISCELLANEOUS", sJson });

                        if (oSystemParameterMain.Kf_OtherInBill_AutoCheck == "Y") //系统参数  自动审核 
                        {
                            string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
                            var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
                            new object[] { "STK_MISCELLANEOUS", sJson2 });
                    //    if (oSystemParameterMain.Kf_OtherInBill_AutoCheck == "Y") //系统参数  自动审核 
                    //    {
                    //        string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
                    //        var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
                    //        new object[] { "STK_MISCELLANEOUS", sJson2 });

                            string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
                            var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
                            new object[] { "STK_MISCELLANEOUS", sJson3 });
                    //        string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
                    //        var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
                    //        new object[] { "STK_MISCELLANEOUS", sJson3 });

                            HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
                        }
                        else
                        {
                            HReturn = result.ToString();
                        }
                        if (HReturn.Contains("\"IsSuccess\":false") == true)
                        {
                            sErrMsg = "其他入库单失败！" + HReturn + sJson;
                            oCn.RollBack();
                    //        HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
                    //    }
                    //    else
                    //    {
                    //        HReturn = result.ToString();
                    //    }
                    //    if (HReturn.Contains("\"IsSuccess\":false") == true)
                    //    {
                    //        sErrMsg = "其他入库单失败！" + HReturn + sJson;
                    //        oCn.RollBack();
                            return false;
                        }
                        else
                        {
                            oCn.Commit();
                            return true;
                        }
                    }
                    else
                    {
                        sErrMsg = "其他入库单失败！登录失败！";
                        oCn.RollBack();
                        return false;
                    }
                        //}
                        //else
                        //{
                        //    oCn.Commit();
                        //    return true;
                        //}
                    //}
                    //else
                    //{
                    //    sErrMsg = "其他入库单失败！登录失败！";
                    //    oCn.RollBack();
                    //    return false;
                    //}
                }
            }
            catch (Exception e)
@@ -7511,55 +7720,20 @@


         //生成其他出库单 
         public bool set_SaveOtherOutBill_New(Model.ClsKf_OtherOutBillMain oMain, string sHSourceType, ref string sErrMsg)
         public bool set_SaveOtherOutBill_New(WebAPI.WebS.ClsKf_OtherOutBillMain oMain, string sHSourceType, WebS.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
         {
             //获取系统参数
             Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
             if (oSystemParameter.ShowBill(ref sErrMsg) == false)
             {
                 sErrMsg = "获取系统参数失败！ " + sErrMsg;
                 return false;
             }
             //
             if (oSystemParameter.omodel.Kf_OtherOutBill_ERPMode.ToUpper() == "WISE") //判断同步模式是金蝶WISE
             {
                 if (SaveOtherOutBill_K3(oMain, sHSourceType, oSystemParameter.omodel, ref sErrMsg))
                 {
                     //"保存成功！";
                     sErrMsg = "保存成功！" + oMain.HBillNo;
                     return true;
                 }
                 else
                 {
                     //"保存失败！";
                     sErrMsg = sErrMsg;
                     return false;
                 }
             }
             if (oSystemParameter.omodel.Kf_OtherOutBill_ERPMode.ToUpper() == "CLOUD")  //判断同步模式是金蝶CLOUD
             {
                 //上传前必填项判断
                 //if (oMain.HDeptID == 0)
                 //{
                 //    sErrMsg = "部门没有选择！";
                 //    return false;
                 //}
                 ////同步生成CLOUD单据
                 //if (set_SaveOtherOutBill_CLD(oMain, sHSourceType, oSystemParameter.omodel, ref sErrMsg) == true)
                 //{
                 //    //"保存成功！";
                 //    return true;
                 //}
                 //else
                 //{
                     //"保存失败！";
                     return false;
                 //}
             }

             sErrMsg = "保存其他出库单失败！" + sErrMsg;
             return false;
         }
            WebS.WebService1 oWebs = new WebS.WebService1();//set_SaveOtherInBill_CLD_New
            if (oWebs.set_SaveOtherOutBill_CLD_New(oMain, sHSourceType, oSystemParameterMain, ref sErrMsg))
            {
                sErrMsg = "保存成功！" + oMain.HBillNo;
                return true;
            }
            else
            {
                sErrMsg = "单据号：" + oMain.HBillNo + ", 单据ID：" + oMain.HInterID + ";" + sErrMsg;
                return false;
            }
        }



@@ -7802,5 +7976,105 @@
         }
        #endregion

        #region [获取打印模板]
        /// <summary>
        /// 打印模板列表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <param name="sErr"></param>
        /// <returns></returns>
        public DataSet GetOpenTmpList(string sWhere, ref string sErr)
        {
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            DataSet ds = new DataSet();
            ds = oCn.RunProcReturn("select * from h_v_IF_OpenTmpList " + sWhere, "h_v_IF_OpenTmpList");
            return ds;
        }
        #endregion

        #region [获取默认打印模板]
        /// <summary>
        /// 默认打印模板
        /// </summary>
        /// <param name="sWhere"></param>
        /// <param name="sErr"></param>
        /// <returns></returns>
        public DataSet GetDefaultOpenTmp(string sWhere, ref string sErr)
        {
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            DataSet ds = new DataSet();
            ds = oCn.RunProcReturn("select * from h_v_IF_OpenTmpList " + sWhere, "h_v_IF_OpenTmpList");
            return ds;
        }
        #endregion

        //返回条码临时表
        /// <summary>
        /// 返回条码临时表
        /// </summary>
        public DataSet GetBarCode_Temp(long HInterID, long HMaterID, Int64 HAuxPropID, string HMTONo, Int64 HWhID, Int64 HSPID, Int64 HSCWhID, Int64 HSCSPID, string HBatchNo, Int64 HSourceInterID, Int64 HSourceEntryID, string sBillType, string sWhere)
        {
            DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
            return dal.GetBarCodeByID_View(HInterID, sBillType, HMaterID, HAuxPropID, HMTONo, HWhID, HSPID, HSCWhID, HSCSPID, HBatchNo, HSourceInterID, HSourceEntryID, sWhere);
        }

        //删除出入库条码临时表(根据条码)
        public bool set_DelPonderationBillMain_Temp_BarCode(long HInterID, string sBarCode, string sHBillType, ref string sErrMsg)
        {
            DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
            if (dal.DeleteByBarCode(HInterID, sBarCode, sHBillType))
            {
                sErrMsg = "删除成功！";
                return true;
            }
            else
            {
                sErrMsg = "删除失败！";
                return false;
            }
        }


        /// <summary>
        /// 返回扫码明细信息
        /// </summary>
        public DataSet GetBarcodeList(long HInterID, string HBillNo, string sBillType, ref string sMouldManagerCtl, ref string sFIFOCtl, ref string sErrMsg)
        {
            DAL.ClsKF_PonderationBillMain_Temp_View bll = new DAL.ClsKF_PonderationBillMain_Temp_View();
            return bll.GetBillEntry_TmpList(HInterID, HBillNo, sBillType, ref sMouldManagerCtl, ref sFIFOCtl, ref sErrMsg);
            //DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
            //return dal.GetInfoByID_View(HInterID, sBillType, sWhere);
        }

        //撤销缓存列表选中数据
        public bool RescindBillList(Int64 sHInterID, string sBillNo, string sBillType, ref string sErrMsg)
        {
            DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
            if (dal.DeleteICStockBillAndWMS(sHInterID, sBillNo, sBillType, ref sErrMsg))
            {
                sErrMsg = "删除成功！";
                return true;
            }
            else
            {
                sErrMsg = "删除失败！";
                return false;
            }
        }

        //返回缓存列表已上传列表信息
        public DataSet GetDisBillUpdateLoad_Json(string sHBillType, string HMaker, Int64 HOrgID)
        {
            DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
            return dal.GetKf_ICStockBillList(sHBillType, HMaker, HOrgID);
        }

        //返回缓存列表查询已上传列表信息
        public DataSet GetQueryBillUpdateLoad_Json(string BillType, string HBillNo, string HSourceBillNo)
        {
            DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
            return dal.GetKf_ICStockBillQueryList(BillType, HBillNo, HSourceBillNo);
        }

    }
}