SANJIAPI.git - Gitblit

parent: a87ff957 | 补丁 | 提交 | ignore whitespace

2021-07-15 876a872af774e4943eb54286c868407902bf1347

调拨单扫码方法修改

2个文件已添加

32个文件已修改

	WebAPI/Controllers/MoveStockBillController.cs	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/OtherInStockController.cs	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/WebAPIController.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/DLL/Model.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/DLL/Model20210714.rar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/DLL/Pub_Class20210714.rar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user	135 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Properties/Settings.Designer.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Properties/Settings.settings	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsCLD_Customer_Model.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsCLD_Department_Model.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsCLD_Employee_Model.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsCLD_StockPlace_Model.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsCLD_Supplier_Model.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsCLD_Warehouse_Model.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsGy_BadReason_Model.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsGy_Customer_Model.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsGy_Department_Model.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsGy_Employee_Model.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsGy_Group_Model.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsGy_Item30JiTai_Model.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsGy_Source_Model.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsGy_StockPlace_Model.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsGy_Supplier_Model.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsGy_Warehouse_Model.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/ClsKf_ICStockBill_WMS.datasource	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/Reference.cs	19775 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/Reference.map	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/WebService1.disco	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web References/WebS/WebService1.wsdl	5527 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Web.config	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/WebAPI.csproj	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/WebServer.cs	354 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebAPI/Controllers/MoveStockBillController.cs

@@ -221,7 +221,7 @@
        /// <returns></returns>
        [Route("MoveStockBill/get_InfoByBarCode_Source_Json")]
        [HttpGet]
        public object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
        public object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID, string HMaker, Int64 HOrgID)
        {
            try
            {
@@ -230,7 +230,7 @@
                dal.GetInfoByNumber_View(sCode);
                if (dal.omodel_View.HBarCodeType != "托盘条码")
                {
                    return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
                    return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker, HOrgID);
                }
                else
                {
@@ -256,7 +256,7 @@
                        for (int i = 0; i < dsTBarCode.Tables[0].Rows.Count; i++)
                        {
                            sBarCode_MX = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCodeMX"]);
                            objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
                            objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker,HOrgID);
                            if (objJsonResult.code == "0")
                            {
                                return objJsonResult;
@@ -277,7 +277,7 @@
            }
        }

        public object get_InfoByBarCode_Source_Json_s(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
        public object get_InfoByBarCode_Source_Json_s(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID, string HMaker,Int64 HOrgID)
        {
            try
            {
@@ -310,7 +310,7 @@
                model.HInterID = DBUtility.ClsPub.isLong(sInterID);
                model.HBillNo = DBUtility.ClsPub.isStrNull(sBillNo);
                model.HBillType = this.HBillType;
                model.HMaker = DBUtility.ClsPub.CurUserName;
                model.HMaker = HMaker;
                //
                model.HMaterID = oView.HMaterID;
                model.HAuxPropID = oView.HAuxPropID;
@@ -320,7 +320,6 @@
                model.HBarCode = oView.HBarCode;
                model.HBatchNo = oView.HBatchNo;
                model.HMTONo = oView.HMTONo;
                model.HMaker = oView.HMaker;

                model.HWhID = DBUtility.ClsPub.isLong(HWHID);
                model.HStockPlaceID = DBUtility.ClsPub.isLong(HSPID);
@@ -336,8 +335,8 @@
                model.HSourceBillType = oView.HSourceBillType;
                model.HRedBlueFlag = false;
                model.HPieceQty = 1;
                //model.HSTOCKORGID = DBUtility.ClsPub.HORGANIZATIONSID;
                //model.HOWNERID = DBUtility.ClsPub.HORGANIZATIONSID;
                model.HSTOCKORGID = HOrgID;
                model.HOWNERID = HOrgID;

                WebS.WebService1 oWebs = new WebS.WebService1();
                //if (webserver.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
@@ -439,7 +438,7 @@
                websLsmain.HStockStyle = "";
                websLsmain.HBillType = "1207";
                websLsmain.HSupID = 0;
                websLsmain.HGroupID = lsmain[0].HGroupID;
                //websLsmain.HGroupID = lsmain[0].HGroupID;

                if (webserver.set_SaveMoveStockBill(websLsmain, "-1", ref DBUtility.ClsPub.sErrInfo))
                {

 WebAPI/Controllers/OtherInStockController.cs

@@ -42,6 +42,8 @@
        public DataSet ds = new DataSet();
        public ClsGy_BarCodeBill_WMS_Model_View oView = new ClsGy_BarCodeBill_WMS_Model_View();
        public ClsKF_PonderationBillMain_Temp model = new ClsKF_PonderationBillMain_Temp();
        public WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
        public WebS.WebService1 oWebs = new WebS.WebService1();
        //public double sRelQty = 0;
        // private DataBaseServices objDataBaseServices = new DataBaseServices();
        private JsonResult objJsonResult = new JsonResult();
@@ -68,8 +70,9 @@
        [HttpGet]
        public Object get_CheckTypeByBarCode_Json(string sCode, Int64 sInterID, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID)
        {
            oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
            if (oBar == null)
            string sExpressNumber = "";
            WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
            if (WebSoBar == null)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -189,8 +192,8 @@
                model.HSourceBillType = oView.HSourceBillType;
                model.HRedBlueFlag = false;
                model.HPieceQty = 1;
                model.HSTOCKORGID = 0;
                model.HOWNERID = 0;
                model.HSTOCKORGID = ClsPub.HORGANIZATIONSID;
                model.HOWNERID = ClsPub.HORGANIZATIONSID;
                if (webserver.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
                {
                    objJsonResult.code = "0";
@@ -273,6 +276,8 @@
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();


            try
            {
                List<Model.ClsKf_OtherInBillMain> lsmain = new List<Model.ClsKf_OtherInBillMain>();
@@ -281,7 +286,20 @@
                lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                string sSourceBillType = lsmain[0].HBillType;
                if (webserver.set_SaveOtherInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo))

                WebAPI.WebS.ClsKf_OtherInBillMain websLsmain = new WebS.ClsKf_OtherInBillMain();
                websLsmain.HInterID = lsmain[0].HInterID;
                websLsmain.HDate = lsmain[0].HDate;
                websLsmain.HBillNo = lsmain[0].HBillNo;
                websLsmain.HDeptID = lsmain[0].HDeptID;
                websLsmain.HEmpID = lsmain[0].HEmpID;
                websLsmain.HRemark = lsmain[0].HRemark;
                websLsmain.HMaker = lsmain[0].HMaker;
                websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
                websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;

                WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
                if (webserver.set_SaveOtherInBill_New(websLsmain, sSourceBillType, oSystemParameterMain, ref DBUtility.ClsPub.sErrInfo))
                {            
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;

 WebAPI/Controllers/WebAPIController.cs

@@ -23,6 +23,7 @@
        public DataSet ds = new DataSet();
        private json objjson = new json();
        private json objJsonResult = new json();
        //public static string sUrl = "http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx";
        //  private POInStockBillServices oclscg_poinstockbillmain = new POInStockBillServices();
        /// <summary>
        /// 送货单表头信息

 WebAPI/DLL/Model.dll

Binary files differ

 WebAPI/DLL/Model20210714.rar

Binary files differ

 WebAPI/DLL/Pub_Class20210714.rar

Binary files differ

 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -9,7 +9,7 @@
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.dll">
      <publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,19 +18,19 @@
      <publishTime>02/22/2013 08:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>07/02/2021 16:55:02</publishTime>
      <publishTime>07/02/2021 08:47:34</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
      <publishTime>09/20/2018 19:23:20</publishTime>
@@ -48,22 +48,22 @@
      <publishTime>07/25/2012 11:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>06/28/2021 17:33:22</publishTime>
      <publishTime>07/14/2021 13:49:39</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>07/12/2021 18:14:19</publishTime>
      <publishTime>07/05/2021 15:15:53</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>08/03/2014 20:33:56</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/15/2015 17:57:08</publishTime>
@@ -129,7 +129,7 @@
      <publishTime>11/28/2018 13:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 04:02:18</publishTime>
@@ -162,10 +162,10 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>07/13/2021 16:17:19</publishTime>
      <publishTime>07/15/2021 15:22:17</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>07/13/2021 16:17:19</publishTime>
      <publishTime>07/15/2021 15:22:17</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/17/2013 17:03:52</publishTime>
@@ -177,163 +177,166 @@
      <publishTime>11/29/2018 13:26:30</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>07/02/2021 16:55:02</publishTime>
      <publishTime>07/02/2021 08:47:34</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>06/28/2021 17:33:22</publishTime>
      <publishTime>07/14/2021 13:49:39</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>05/25/2021 14:18:15</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>05/10/2021 09:27:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:18</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:18</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:18</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:19</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:18</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:18</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:18</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:18</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:18</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:18</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:18</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:18</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:18</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>05/25/2021 14:18:16</publishTime>
      <publishTime>07/14/2021 15:45:18</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.map">
      <publishTime>07/14/2021 15:45:15</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>07/13/2021 16:17:25</publishTime>
      <publishTime>07/15/2021 15:22:21</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -26,7 +26,7 @@
        [global::System.Configuration.ApplicationScopedSettingAttribute()]
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
        [global::System.Configuration.DefaultSettingValueAttribute("http://124.70.129.242/WEBS-WMS/WebService1.asmx")]
        [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/WEBS-WMSTest/WebService1.asmx")]
        public string WebAPI_WebS_WebService1 {
            get {
                return ((string)(this["WebAPI_WebS_WebService1"]));

 WebAPI/Properties/Settings.settings

@@ -3,7 +3,7 @@
  <Profiles />
  <Settings>
    <Setting Name="WebAPI_WebS_WebService1" Type="(Web Service URL)" Scope="Application">
      <Value Profile="(Default)">http://124.70.129.242/WEBS-WMS/WebService1.asmx</Value>
      <Value Profile="(Default)">http://localhost/WEBS-WMSTest/WebService1.asmx</Value>
    </Setting>
  </Settings>
</SettingsFile>

 WebAPI/Web References/WebS/ClsCLD_Customer_Model.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsCLD_Customer_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsCLD_Customer_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsCLD_Customer_Model</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsCLD_Department_Model.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsCLD_Department_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsCLD_Department_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsCLD_Department_Model</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsCLD_Employee_Model.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsCLD_Employee_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsCLD_Employee_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsCLD_Employee_Model</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsCLD_StockPlace_Model.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsCLD_StockPlace_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsCLD_StockPlace_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsCLD_StockPlace_Model</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsCLD_Supplier_Model.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsCLD_Supplier_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsCLD_Supplier_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsCLD_Supplier_Model</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsCLD_Warehouse_Model.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsCLD_Warehouse_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsCLD_Warehouse_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsCLD_Warehouse_Model</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsGy_BadReason_Model.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsGy_BadReason_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsGy_BadReason_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_BadReason_Model</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsGy_BarCodeBill_WMS_Model_View" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsGy_BarCodeBill_WMS_Model_View, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_BarCodeBill_WMS_Model_View</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsGy_Customer_Model.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsGy_Customer_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsGy_Customer_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_Customer_Model</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsGy_Department_Model.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsGy_Department_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsGy_Department_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_Department_Model</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsGy_Employee_Model.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsGy_Employee_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsGy_Employee_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_Employee_Model</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsGy_Group_Model.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsGy_Group_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsGy_Group_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_Group_Model</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsGy_Item30JiTai_Model.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsGy_Item30JiTai_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsGy_Item30JiTai_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_Item30JiTai_Model</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsGy_Source_Model.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsGy_Source_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsGy_Source_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_Source_Model</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsGy_StockPlace_Model.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsGy_StockPlace_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsGy_StockPlace_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_StockPlace_Model</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsGy_Supplier_Model.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsGy_Supplier_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsGy_Supplier_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_Supplier_Model</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsGy_Warehouse_Model.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsGy_Warehouse_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsGy_Warehouse_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_Warehouse_Model</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/ClsKf_ICStockBill_WMS.datasource

@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsKf_ICStockBill_WMS" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
   <TypeInfo>WebAPI.WebS.ClsKf_ICStockBill_WMS, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsKf_ICStockBill_WMS</TypeInfo>
</GenericObjectDataSource>

 WebAPI/Web References/WebS/Reference.cs

Diff too large

 WebAPI/Web References/WebS/Reference.map

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
  <Results>
    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx?disco" filename="WebService1.disco" />
    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost/WEBS-WMSTest/WebService1.asmx?disco" filename="WebService1.disco" />
    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/WEBS-WMSTest/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
  </Results>
</DiscoveryClientResultsFile>

 WebAPI/Web References/WebS/WebService1.disco

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
  <contractRef ref="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx?wsdl" docRef="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
  <soap address="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
  <soap address="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
  <contractRef ref="http://localhost/WEBS-WMSTest/WebService1.asmx?wsdl" docRef="http://localhost/WEBS-WMSTest/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
  <soap address="http://localhost/WEBS-WMSTest/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
  <soap address="http://localhost/WEBS-WMSTest/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
</discovery>

 WebAPI/Web References/WebS/WebService1.wsdl

Diff too large

 WebAPI/Web.config

@@ -5,10 +5,10 @@
  -->
<configuration>
  <configSections>
    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
      <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
    </sectionGroup>
	  
  </configSections>
    <connectionStrings>
        <add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />
@@ -19,6 +19,7 @@
      <!--服务器文件IP地址-->
    <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
    <add key="FileIP" value="http://localhost:8080/"/>
      <add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>
    <add key="webpages:Version" value="3.0.0.0" />
    <add key="webpages:Enabled" value="false" />
    <add key="ClientValidationEnabled" value="true" />
@@ -70,13 +71,6 @@
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
  <applicationSettings>
    <WebAPI.Properties.Settings>
      <setting name="WebAPI_WebS_WebService1" serializeAs="String">
        <value>http://124.70.129.242/WEBS-WMS/WebService1.asmx</value>
      </setting>
    </WebAPI.Properties.Settings>
  </applicationSettings>
<system.webServer>
    <handlers>
      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
@@ -84,4 +78,12 @@
      <remove name="TRACEVerbHandler" />
      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
    </handlers>
  </system.webServer></configuration>
  </system.webServer>
  <applicationSettings>
    <WebAPI.Properties.Settings>
      <setting name="WebAPI_WebS_WebService1" serializeAs="String">
        <value>http://localhost/WEBS-WMSTest/WebService1.asmx</value>
      </setting>
    </WebAPI.Properties.Settings>
  </applicationSettings>
</configuration>

 WebAPI/WebAPI.csproj

@@ -299,10 +299,10 @@
    <Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
      <DependentUpon>Reference.map</DependentUpon>
    </Content>
    <None Include="Web References\WebS\Reference.map">
    <Content Include="Web References\WebS\Reference.map">
      <Generator>MSDiscoCodeGenerator</Generator>
      <LastGenOutput>Reference.cs</LastGenOutput>
    </None>
    </Content>
    <None Include="Web References\WebS\WebService1.disco" />
    <Content Include="Web.config">
      <SubType>Designer</SubType>
@@ -568,10 +568,16 @@
    <WebReferences Include="Web References\" />
  </ItemGroup>
  <ItemGroup>
    <WebReferenceUrl Include="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx">
      <UrlBehavior>Static</UrlBehavior>
    <EmbeddedResource Include="Properties\Resources.resx">
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <WebReferenceUrl Include="http://localhost/WEBS-WMSTest/WebService1.asmx">
      <UrlBehavior>Dynamic</UrlBehavior>
      <RelPath>Web References\WebS\</RelPath>
      <UpdateFromURL>http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx</UpdateFromURL>
      <UpdateFromURL>http://localhost/WEBS-WMSTest/WebService1.asmx</UpdateFromURL>
      <ServiceLocationURL>
      </ServiceLocationURL>
      <CachedDynamicPropName>
@@ -579,12 +585,6 @@
      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
      <CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName>
    </WebReferenceUrl>
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="Properties\Resources.resx">
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

 WebAPI/WebServer.cs

@@ -126,7 +126,7 @@
        #region 一键扫码    入库模块

        //一键扫码模式，根据条码前缀走 不同方法（仓库、仓位、部门）（源单、物料条码）    入库模块
        public Model.ClsKf_ICStockBill_WMS get_CheckTypeByBarCode(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool HRedBlueFlag, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HOWNERID, ref string sErrMsg)
        public Model.ClsKf_ICStockBill_WMS get_CheckTypeByBarCode(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool HRedBlueFlag, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HOWNERID,Int64 HOrgID, ref string sErrMsg)
        {
            BLL.ClsKF_PonderationBillMain_Temp bll = new ClsKF_PonderationBillMain_Temp();
            return bll.get_CheckTypeByBarCode(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -6979,59 +6979,311 @@


         //生成其他入库单 
         public bool set_SaveOtherInBill_New(Model.ClsKf_OtherInBillMain oMain, string sHSourceType, ref string sErrMsg)
         //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;
         //}

         public bool set_SaveOtherInBill_New(WebAPI.WebS.ClsKf_OtherInBillMain 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_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 (set_SaveOtherInBill_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_SaveOtherInBill_CLD_New(oMain, sHSourceType,oSystemParameterMain,ref sErrMsg))
            {
                sErrMsg = "保存成功！" + oMain.HBillNo;
                return true;
            }
            else
            {
                sErrMsg = "单据号：" + oMain.HBillNo + ", 单据ID：" + oMain.HInterID + ";" + sErrMsg;
                return false;
            }
        }


         ///生成其他入库单
         public bool set_SaveOtherInBill(Model.ClsKf_OtherInBillMain oMain, ref string sErrMsg)
        public bool SaveOtherInBill_CLD(Model.ClsKf_OtherInBillMain oMain, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
        {
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            try
            {
                //判断会计期是否合理
                string s = "";
                int sYear = 0;
                int sPeriod = 0;
                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oMain.HDate, ref sYear, ref sPeriod, ref s) == false)
                {
                    sErrMsg = s;
                    return false;
                }
                oMain.HYear = sYear;
                oMain.HPeriod = sPeriod;

                oCn.BeginTran();
                //生成出入库单据
                //插入子表
                oCn.RunProc("EXEC h_p_Kf_OtherInBillSub_Insert_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + sHSourceType + "'");
                //插入主表
                oCn.RunProc("Insert Into Kf_ICStockBillMain   " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMainSourceBillType" +
                ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
                ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
                ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
                ",HStockStyle" +
                ",HSTOCKORGID,HOWNERID" +
                ") " +
                " values('1203','1203'," + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "',convert(varchar(10),getdate(),120),'" + oMain.HMainSourceBillType + "'" +
                ", " + oMain.HYear.ToString() + "," + oMain.HPeriod.ToString() + ",'" + oMain.HRemark + "','" + oMain.HMaker + "',convert(varchar(10),getdate(),120)" +
                ", " + oMain.HSupID.ToString() + "," + oMain.HWHID.ToString() + "," + oMain.HSCWHID.ToString() + "," + oMain.HEmpID.ToString() + "," + oMain.HManagerID.ToString() + "," + oMain.HSecManagerID.ToString() +
                ", " + oMain.HKeeperID.ToString() + "," + oMain.HDeptID.ToString() + ",'" + oMain.HExplanation + "','" + oMain.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(oMain.HRedBlueFlag) +
                ",'" + oMain.HStockStyle + "'" +
                ", " + oMain.HSTOCKORGID.ToString() + "," + oMain.HOWNERID.ToString() +
                ") ");
                //更新关联数量

                if (oSystemParameterMain.Kf_OtherInBill_AutoCheck == "Y") //系统参数  自动审核 
                {
                    //审核单据
                    oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=convert(varchar(10),getdate(),120) where HInterID= " + oMain.HInterID.ToString());
                }

                //根据TMP表 返回 子表信息
                DataSet Ds;
                Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherInBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherInBill_CLD");
                if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                {
                    sErrMsg = "获取子表信息失败！";
                    oCn.RollBack();
                    return false;
                }
                else
                {
                    string sJson_StockStyle = "";
                    if (oSystemParameterMain.WMS_CampanyName == "韩电") //系统参数  客户定制化名称     空白为通用
                    {
                        sJson_StockStyle = "\"F_RKLX\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["F_RKLX"]) + "\",";    //入库类型
                    }
                    else if (oSystemParameterMain.WMS_CampanyName == "四维尔") //系统参数  客户定制化名称     空白为通用
                    {
                        sJson_StockStyle = "\"F_ABCD_COMBO\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["F_ABCD_COMBO"]) + "\",";    //其他入库业务类型
                    }
                    else
                    {
                        sJson_StockStyle = "";
                    }
                    string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"Model\":{\"FBillNo\":\"" + oMain.HBillNo + "\"," +

                        //\"FID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FID"]) + "\"," +
                        "\"FBillTypeID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\"}," +
                        "\"FStockOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FStockOrgId"]) + "\"}," +
                        "\"FStockDirect\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FStockDirect"]) + "\"," +
                        "\"FDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDate"]) + "\"," +
                        //"\"FSUPPLIERID\":{\"FNumber\":\"" + oMain.HSupplyID.ToString() + "\"}," +
                        "\"FDEPTID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDEPTID"]) + "\"}," +
                        //"\"FSTOCKERID\":{\"FName\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FSTOCKERID"]) + "\"}," +
                        //"\"FSTOCKERGROUPID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FSTOCKERGROUPID"]) + "\"}," +
                        "\"FOwnerTypeIdHead\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FOwnerTypeIdHead"]) + "\"," +
                        "\"FOwnerIdHead\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FOwnerIdHead"]) + "\"}," +
                        "\"FNOTE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FNOTE"]) + "\"," +
                        "\"FBaseCurrId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBaseCurrId"]) + "\"}," +
                        "\"FScanBox\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FScanBox"]) + "\"," +
                        sJson_StockStyle +
                        "\"FEntity\":[";
                    string sJson_Entry = "";
                    for (int i = 0; i < Ds.Tables[1].Rows.Count; i++)
                    {
                        if (sJson_Entry != "")
                        {
                            sJson_Entry = sJson_Entry + " , ";
                        }
                        string sJson_BatchNo = "";
                        string sJson_StockPlace = "";
                        string sJson_FAUXPROPID = "";
                        if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HISBATCHMANAGE"]) == "1") //是否启用批次管理
                        {
                            sJson_BatchNo = "  \"FLOT\": {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\"},    \"FLOT_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\"  , ";
                        }
                        else
                        {
                            sJson_BatchNo = "";
                        }

                        if (oSystemParameterMain.WMS_CampanyName == "卓力") //系统参数  客户定制化名称     空白为通用
                        {
                            sJson_StockPlace = "\"FStockLocId\":{\"FSTOCKLOCID__FF100002\":{\"FNUMBER\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) + "\"}},";
                        }
                        else
                        {
                            if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) == "")
                            {
                                sJson_StockPlace = "";
                            }
                            else
                            {
                                sJson_StockPlace = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) + "\"}},";
                            }
                        }
                        //辅助属性
                        if (oSystemParameterMain.WMS_CampanyName == "卓力" || oSystemParameterMain.WMS_CampanyName == "韩电") //系统参数  客户定制化名称     空白为通用
                        {
                            sJson_FAUXPROPID = "";
                        }
                        else
                        {
                            sJson_FAUXPROPID = " \"FAUXPROPID\":{\"FAUXPROPID__FF100002\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXPROPID"]) + "\"}},";
                        }
                        //自定义字段处理

                        sJson_Entry = sJson_Entry + "{\"FEntryID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntryID"]) + "\"," +
                            "\"FMATERIALID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMATERIALID"]) + "\"}," +
                            sJson_FAUXPROPID +
                            //"\"FAuxPropId\":{\"FAUXPROPID__FF100001\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAuxPropId"]) + "\"}," +
                            //"\"FAUXPROPID__FF100030\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXPROPID__FF100030"]) + "\"}," +
                            //"\"FAUXPROPID__FF100002\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXPROPID__FF100002"]) + "\"}}," +
                            "\"FUnitID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FUnitID"]) + "\"}," +
                            "\"FSTOCKSTATUSID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSTOCKSTATUSID"]) + "\"}," +
                            "\"FQty\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FQty"]) + "," +
                            "\"FBaseUnitId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBaseUnitId"]) + "\"}," +
                            "\"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"]) + "\"}}," +
                            //"\"FLOT\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\"}," +
                            sJson_BatchNo +
                            "\"FEntryNote\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntryNote"]) + "\"," +
                            //"\"FBOMID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBOMID"]) + "\"}," +
                            //"\"FPRODUCEDATE\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPRODUCEDATE"]) + "," +
                            //"\"FMTONO\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMTONO"]) + "," +
                            "\"FExtAuxUnitId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExtAuxUnitId"]) + "\"}," +
                            //"\"FProjectNo\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProjectNo"]) + "," +
                            "\"FExtAuxUnitQty\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExtAuxUnitQty"]) + "," +
                            "\"FOWNERTYPEID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOWNERTYPEID"]) + "\"," +
                            "\"FOWNERID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOWNERID"]) + "\"}," +
                            "\"FKEEPERTYPEID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FKEEPERTYPEID"]) + "\"," +
                            "\"FKEEPERID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FKEEPERID"]) + "\"}} ";
                    }
                    //"\"FInStockEntry_Link_FSId\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FInStockEntry_Link_FSId"]) +
                    string sJson_End = "  ]  }}";
                    string sJson = sJson_Main + sJson_Entry + sJson_End;

                    //从配置文件获取 CLOUD网址、账套信息、登录用户、登录密码
                    if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
                    {
                        sErrMsg = Pub_Class.ClsPub.sExeReturnInfo;
                        return false;
                    }

                    //获取CLOUD账号密码
                    string sCLOUDUseName = Pub_Class.ClsPub.sCLOUDUseName;
                    string sCLOUDPsd = Pub_Class.ClsPub.sCLOUDPsd;
                    DataSet ds11 = get_SaveCLOUDUseNameandPsd(oMain.HInterID);
                    if (ds11 == null || ds11.Tables[0].Rows.Count == 0)
                    {
                    }
                    else
                    {
                        sCLOUDUseName = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserName"]);
                        sCLOUDPsd = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserPsd"]);
                    }

                    //生成 其他入库单 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 });

                        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 });

                            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;
                    }
                }
            }
            catch (Exception e)
            {
                sErrMsg = "其他入库单失败！" + e.Message;
                oCn.RollBack();
                return false;
            }
        }

        ///生成其他入库单
        public bool set_SaveOtherInBill(Model.ClsKf_OtherInBillMain oMain, ref string sErrMsg)
         {
             //获取系统参数
             Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

			@@ -221,7 +221,7 @@
			/// <returns></returns>
			[Route("MoveStockBill/get_InfoByBarCode_Source_Json")]
			[HttpGet]
			public object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
			public object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID, string HMaker, Int64 HOrgID)
			{
			try
			{
			@@ -230,7 +230,7 @@
			dal.GetInfoByNumber_View(sCode);
			if (dal.omodel_View.HBarCodeType != "托盘条码")
			{
			return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
			return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker, HOrgID);
			}
			else
			{
			@@ -256,7 +256,7 @@
			for (int i = 0; i < dsTBarCode.Tables[0].Rows.Count; i++)
			{
			sBarCode_MX = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCodeMX"]);
			objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
			objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker,HOrgID);
			if (objJsonResult.code == "0")
			{
			return objJsonResult;
			@@ -277,7 +277,7 @@
			}
			}

			public object get_InfoByBarCode_Source_Json_s(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
			public object get_InfoByBarCode_Source_Json_s(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID, string HMaker,Int64 HOrgID)
			{
			try
			{
			@@ -310,7 +310,7 @@
			model.HInterID = DBUtility.ClsPub.isLong(sInterID);
			model.HBillNo = DBUtility.ClsPub.isStrNull(sBillNo);
			model.HBillType = this.HBillType;
			model.HMaker = DBUtility.ClsPub.CurUserName;
			model.HMaker = HMaker;
			//
			model.HMaterID = oView.HMaterID;
			model.HAuxPropID = oView.HAuxPropID;
			@@ -320,7 +320,6 @@
			model.HBarCode = oView.HBarCode;
			model.HBatchNo = oView.HBatchNo;
			model.HMTONo = oView.HMTONo;
			model.HMaker = oView.HMaker;

			model.HWhID = DBUtility.ClsPub.isLong(HWHID);
			model.HStockPlaceID = DBUtility.ClsPub.isLong(HSPID);
			@@ -336,8 +335,8 @@
			model.HSourceBillType = oView.HSourceBillType;
			model.HRedBlueFlag = false;
			model.HPieceQty = 1;
			//model.HSTOCKORGID = DBUtility.ClsPub.HORGANIZATIONSID;
			//model.HOWNERID = DBUtility.ClsPub.HORGANIZATIONSID;
			model.HSTOCKORGID = HOrgID;
			model.HOWNERID = HOrgID;

			WebS.WebService1 oWebs = new WebS.WebService1();
			//if (webserver.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
			@@ -439,7 +438,7 @@
			websLsmain.HStockStyle = "";
			websLsmain.HBillType = "1207";
			websLsmain.HSupID = 0;
			websLsmain.HGroupID = lsmain[0].HGroupID;
			//websLsmain.HGroupID = lsmain[0].HGroupID;

			if (webserver.set_SaveMoveStockBill(websLsmain, "-1", ref DBUtility.ClsPub.sErrInfo))
			{

			@@ -42,6 +42,8 @@
			public DataSet ds = new DataSet();
			public ClsGy_BarCodeBill_WMS_Model_View oView = new ClsGy_BarCodeBill_WMS_Model_View();
			public ClsKF_PonderationBillMain_Temp model = new ClsKF_PonderationBillMain_Temp();
			public WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
			public WebS.WebService1 oWebs = new WebS.WebService1();
			//public double sRelQty = 0;
			// private DataBaseServices objDataBaseServices = new DataBaseServices();
			private JsonResult objJsonResult = new JsonResult();
			@@ -68,8 +70,9 @@
			[HttpGet]
			public Object get_CheckTypeByBarCode_Json(string sCode, Int64 sInterID, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID)
			{
			oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
			if (oBar == null)
			string sExpressNumber = "";
			WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -189,8 +192,8 @@
			model.HSourceBillType = oView.HSourceBillType;
			model.HRedBlueFlag = false;
			model.HPieceQty = 1;
			model.HSTOCKORGID = 0;
			model.HOWNERID = 0;
			model.HSTOCKORGID = ClsPub.HORGANIZATIONSID;
			model.HOWNERID = ClsPub.HORGANIZATIONSID;
			if (webserver.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			@@ -273,6 +276,8 @@
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();


			try
			{
			List<Model.ClsKf_OtherInBillMain> lsmain = new List<Model.ClsKf_OtherInBillMain>();
			@@ -281,7 +286,20 @@
			lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
			string sSourceBillType = lsmain[0].HBillType;
			if (webserver.set_SaveOtherInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo))

			WebAPI.WebS.ClsKf_OtherInBillMain websLsmain = new WebS.ClsKf_OtherInBillMain();
			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HDate = lsmain[0].HDate;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HDeptID = lsmain[0].HDeptID;
			websLsmain.HEmpID = lsmain[0].HEmpID;
			websLsmain.HRemark = lsmain[0].HRemark;
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
			websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;

			WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
			if (webserver.set_SaveOtherInBill_New(websLsmain, sSourceBillType, oSystemParameterMain, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;

			@@ -23,6 +23,7 @@
			public DataSet ds = new DataSet();
			private json objjson = new json();
			private json objJsonResult = new json();
			//public static string sUrl = "http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx";
			// private POInStockBillServices oclscg_poinstockbillmain = new POInStockBillServices();
			/// <summary>
			/// 送货单表头信息

			@@ -9,7 +9,7 @@
			</PropertyGroup>
			<ItemGroup>
			<File Include="apiapp.json">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="bin/Antlr3.Runtime.dll">
			<publishTime>02/22/2013 08:43:40</publishTime>
			@@ -18,19 +18,19 @@
			<publishTime>02/22/2013 08:43:40</publishTime>
			</File>
			<File Include="bin/BLL.dll">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="bin/DAL.dll">
			<publishTime>07/02/2021 16:55:02</publishTime>
			<publishTime>07/02/2021 08:47:34</publishTime>
			</File>
			<File Include="bin/Dapper.dll">
			<publishTime>07/22/2016 14:52:40</publishTime>
			</File>
			<File Include="bin/DBUtility.dll">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
			<publishTime>09/20/2018 19:23:20</publishTime>
			@@ -48,22 +48,22 @@
			<publishTime>07/25/2012 11:48:56</publishTime>
			</File>
			<File Include="bin/Model.dll">
			<publishTime>06/28/2021 17:33:22</publishTime>
			<publishTime>07/14/2021 13:49:39</publishTime>
			</File>
			<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
			<publishTime>07/12/2021 18:14:19</publishTime>
			<publishTime>07/05/2021 15:15:53</publishTime>
			</File>
			<File Include="bin/Newtonsoft.Json.dll">
			<publishTime>08/03/2014 20:33:56</publishTime>
			</File>
			<File Include="bin/Pub_Class.dll">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="bin/Pub_Control.dll">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="bin/SQLHelper.dll">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="bin/Swashbuckle.Core.dll">
			<publishTime>02/15/2015 17:57:08</publishTime>
			@@ -129,7 +129,7 @@
			<publishTime>11/28/2018 13:01:00</publishTime>
			</File>
			<File Include="bin/System.Web.Http.WebHost.dll">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="bin/System.Web.Mvc.dll">
			<publishTime>01/28/2015 04:02:18</publishTime>
			@@ -162,10 +162,10 @@
			<publishTime>11/24/2014 11:18:48</publishTime>
			</File>
			<File Include="bin/WebAPI.dll">
			<publishTime>07/13/2021 16:17:19</publishTime>
			<publishTime>07/15/2021 15:22:17</publishTime>
			</File>
			<File Include="bin/WebAPI.pdb">
			<publishTime>07/13/2021 16:17:19</publishTime>
			<publishTime>07/15/2021 15:22:17</publishTime>
			</File>
			<File Include="bin/WebGrease.dll">
			<publishTime>07/17/2013 17:03:52</publishTime>
			@@ -177,163 +177,166 @@
			<publishTime>11/29/2018 13:26:30</publishTime>
			</File>
			<File Include="Content/bootstrap.css">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Content/bootstrap.min.css">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Content/Site.css">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="DLL/BLL.dll">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="DLL/DAL.dll">
			<publishTime>07/02/2021 16:55:02</publishTime>
			<publishTime>07/02/2021 08:47:34</publishTime>
			</File>
			<File Include="DLL/DBUtility.dll">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="DLL/Model.dll">
			<publishTime>06/28/2021 17:33:22</publishTime>
			<publishTime>07/14/2021 13:49:39</publishTime>
			</File>
			<File Include="DLL/Newtonsoft.Json.Net35.dll">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="DLL/Pub_Class.dll">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="DLL/Pub_Control.dll">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="DLL/SQLHelper.dll">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="fonts/glyphicons-halflings-regular.eot">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="fonts/glyphicons-halflings-regular.svg">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="fonts/glyphicons-halflings-regular.ttf">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="fonts/glyphicons-halflings-regular.woff">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Global.asax">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Index.html">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
			<publishTime>05/25/2021 14:18:15</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="packages.config">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Views/Scripts/bootstrap.js">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Views/Scripts/bootstrap.min.js">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Views/Scripts/jquery-1.10.2.js">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Views/Scripts/jquery-1.10.2.min.js">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Views/Scripts/jquery-1.10.2.min.map">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Views/Scripts/jquery.validate.js">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Views/Scripts/jquery.validate.min.js">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Views/Scripts/modernizr-2.6.2.js">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Views/Shared/Error.cshtml">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Views/Shared/_Layout.cshtml">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Views/web.config">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Views/_ViewStart.cshtml">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>05/10/2021 09:27:02</publishTime>
			</File>
			<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:17</publishTime>
			</File>
			<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:17</publishTime>
			</File>
			<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:18</publishTime>
			</File>
			<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:17</publishTime>
			</File>
			<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:18</publishTime>
			</File>
			<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:17</publishTime>
			</File>
			<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:18</publishTime>
			</File>
			<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:19</publishTime>
			</File>
			<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:18</publishTime>
			</File>
			<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:18</publishTime>
			</File>
			<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:18</publishTime>
			</File>
			<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:18</publishTime>
			</File>
			<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:18</publishTime>
			</File>
			<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:18</publishTime>
			</File>
			<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:18</publishTime>
			</File>
			<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:18</publishTime>
			</File>
			<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:18</publishTime>
			</File>
			<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
			<publishTime>05/25/2021 14:18:16</publishTime>
			<publishTime>07/14/2021 15:45:18</publishTime>
			</File>
			<File Include="Web References/WebS/Reference.map">
			<publishTime>07/14/2021 15:45:15</publishTime>
			</File>
			<File Include="Web.config">
			<publishTime>07/13/2021 16:17:25</publishTime>
			<publishTime>07/15/2021 15:22:21</publishTime>
			</File>
			</ItemGroup>
			</Project>

			@@ -12,7 +12,7 @@


			[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
			[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
			[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
			internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {

			private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
			@@ -26,7 +26,7 @@
			[global::System.Configuration.ApplicationScopedSettingAttribute()]
			[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
			[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
			[global::System.Configuration.DefaultSettingValueAttribute("http://124.70.129.242/WEBS-WMS/WebService1.asmx")]
			[global::System.Configuration.DefaultSettingValueAttribute("http://localhost/WEBS-WMSTest/WebService1.asmx")]
			public string WebAPI_WebS_WebService1 {
			get {
			return ((string)(this["WebAPI_WebS_WebService1"]));

			@@ -3,7 +3,7 @@
			<Profiles />
			<Settings>
			<Setting Name="WebAPI_WebS_WebService1" Type="(Web Service URL)" Scope="Application">
			<Value Profile="(Default)">http://124.70.129.242/WEBS-WMS/WebService1.asmx</Value>
			<Value Profile="(Default)">http://localhost/WEBS-WMSTest/WebService1.asmx</Value>
			</Setting>
			</Settings>
			</SettingsFile>

			@@ -6,5 +6,5 @@
			cause the file to be unrecognizable by the program.
			-->
			<GenericObjectDataSource DisplayName="ClsCLD_Customer_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
			<TypeInfo>WebAPI.WebS.ClsCLD_Customer_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
			<TypeInfo>WebAPI.WebS.ClsCLD_Customer_Model</TypeInfo>
			</GenericObjectDataSource>

			@@ -1,7 +1,7 @@
			<?xml version="1.0" encoding="utf-8"?>
			<DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
			<Results>
			<DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
			<DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx?disco" filename="WebService1.disco" />
			<DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost/WEBS-WMSTest/WebService1.asmx?disco" filename="WebService1.disco" />
			<DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/WEBS-WMSTest/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
			</Results>
			</DiscoveryClientResultsFile>

			@@ -1,6 +1,6 @@
			<?xml version="1.0" encoding="utf-8"?>
			<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
			<contractRef ref="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx?wsdl" docRef="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
			<soap address="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
			<soap address="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
			<contractRef ref="http://localhost/WEBS-WMSTest/WebService1.asmx?wsdl" docRef="http://localhost/WEBS-WMSTest/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
			<soap address="http://localhost/WEBS-WMSTest/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
			<soap address="http://localhost/WEBS-WMSTest/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
			</discovery>

			@@ -5,10 +5,10 @@
			-->
			<configuration>
			<configSections>
			<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

			<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
			<section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
			</sectionGroup>

			</configSections>
			<connectionStrings>
			<add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />
			@@ -19,6 +19,7 @@
			<!--服务器文件IP地址-->
			<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
			<add key="FileIP" value="http://localhost:8080/"/>
			<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>
			<add key="webpages:Version" value="3.0.0.0" />
			<add key="webpages:Enabled" value="false" />
			<add key="ClientValidationEnabled" value="true" />
			@@ -70,13 +71,6 @@
			</dependentAssembly>
			</assemblyBinding>
			</runtime>
			<applicationSettings>
			<WebAPI.Properties.Settings>
			<setting name="WebAPI_WebS_WebService1" serializeAs="String">
			<value>http://124.70.129.242/WEBS-WMS/WebService1.asmx</value>
			</setting>
			</WebAPI.Properties.Settings>
			</applicationSettings>
			<system.webServer>
			<handlers>
			<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
			@@ -84,4 +78,12 @@
			<remove name="TRACEVerbHandler" />
			<add name="ExtensionlessUrlHandler-Integrated-4.0" path="." verb="" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
			</handlers>
			</system.webServer></configuration>
			</system.webServer>
			<applicationSettings>
			<WebAPI.Properties.Settings>
			<setting name="WebAPI_WebS_WebService1" serializeAs="String">
			<value>http://localhost/WEBS-WMSTest/WebService1.asmx</value>
			</setting>
			</WebAPI.Properties.Settings>
			</applicationSettings>
			</configuration>

			@@ -299,10 +299,10 @@
			<Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
			<DependentUpon>Reference.map</DependentUpon>
			</Content>
			<None Include="Web References\WebS\Reference.map">
			<Content Include="Web References\WebS\Reference.map">
			<Generator>MSDiscoCodeGenerator</Generator>
			<LastGenOutput>Reference.cs</LastGenOutput>
			</None>
			</Content>
			<None Include="Web References\WebS\WebService1.disco" />
			<Content Include="Web.config">
			<SubType>Designer</SubType>
			@@ -568,10 +568,16 @@
			<WebReferences Include="Web References\" />
			</ItemGroup>
			<ItemGroup>
			<WebReferenceUrl Include="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx">
			<UrlBehavior>Static</UrlBehavior>
			<EmbeddedResource Include="Properties\Resources.resx">
			<Generator>ResXFileCodeGenerator</Generator>
			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
			</EmbeddedResource>
			</ItemGroup>
			<ItemGroup>
			<WebReferenceUrl Include="http://localhost/WEBS-WMSTest/WebService1.asmx">
			<UrlBehavior>Dynamic</UrlBehavior>
			<RelPath>Web References\WebS\</RelPath>
			<UpdateFromURL>http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx</UpdateFromURL>
			<UpdateFromURL>http://localhost/WEBS-WMSTest/WebService1.asmx</UpdateFromURL>
			<ServiceLocationURL>
			</ServiceLocationURL>
			<CachedDynamicPropName>
			@@ -579,12 +585,6 @@
			<CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
			<CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName>
			</WebReferenceUrl>
			</ItemGroup>
			<ItemGroup>
			<EmbeddedResource Include="Properties\Resources.resx">
			<Generator>ResXFileCodeGenerator</Generator>
			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
			</EmbeddedResource>
			</ItemGroup>
			<PropertyGroup>
			<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

			@@ -126,7 +126,7 @@
			#region 一键扫码入库模块

			//一键扫码模式，根据条码前缀走不同方法（仓库、仓位、部门）（源单、物料条码）入库模块
			public Model.ClsKf_ICStockBill_WMS get_CheckTypeByBarCode(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool HRedBlueFlag, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HOWNERID, ref string sErrMsg)
			public Model.ClsKf_ICStockBill_WMS get_CheckTypeByBarCode(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool HRedBlueFlag, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HOWNERID,Int64 HOrgID, ref string sErrMsg)
			{
			BLL.ClsKF_PonderationBillMain_Temp bll = new ClsKF_PonderationBillMain_Temp();
			return bll.get_CheckTypeByBarCode(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, ref DBUtility.ClsPub.sExeReturnInfo);
			@@ -6979,59 +6979,311 @@


			//生成其他入库单
			public bool set_SaveOtherInBill_New(Model.ClsKf_OtherInBillMain oMain, string sHSourceType, ref string sErrMsg)
			//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;
			//}

			public bool set_SaveOtherInBill_New(WebAPI.WebS.ClsKf_OtherInBillMain 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_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 (set_SaveOtherInBill_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_SaveOtherInBill_CLD_New(oMain, sHSourceType,oSystemParameterMain,ref sErrMsg))
			{
			sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			{
			sErrMsg = "单据号：" + oMain.HBillNo + ", 单据ID：" + oMain.HInterID + ";" + sErrMsg;
			return false;
			}
			}


			///生成其他入库单
			public bool set_SaveOtherInBill(Model.ClsKf_OtherInBillMain oMain, ref string sErrMsg)
			public bool SaveOtherInBill_CLD(Model.ClsKf_OtherInBillMain oMain, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
			{
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			try
			{
			//判断会计期是否合理
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oMain.HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			sErrMsg = s;
			return false;
			}
			oMain.HYear = sYear;
			oMain.HPeriod = sPeriod;

			oCn.BeginTran();
			//生成出入库单据
			//插入子表
			oCn.RunProc("EXEC h_p_Kf_OtherInBillSub_Insert_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + sHSourceType + "'");
			//插入主表
			oCn.RunProc("Insert Into Kf_ICStockBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMainSourceBillType" +
			",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
			",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
			",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
			",HStockStyle" +
			",HSTOCKORGID,HOWNERID" +
			") " +
			" values('1203','1203'," + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "',convert(varchar(10),getdate(),120),'" + oMain.HMainSourceBillType + "'" +
			", " + oMain.HYear.ToString() + "," + oMain.HPeriod.ToString() + ",'" + oMain.HRemark + "','" + oMain.HMaker + "',convert(varchar(10),getdate(),120)" +
			", " + oMain.HSupID.ToString() + "," + oMain.HWHID.ToString() + "," + oMain.HSCWHID.ToString() + "," + oMain.HEmpID.ToString() + "," + oMain.HManagerID.ToString() + "," + oMain.HSecManagerID.ToString() +
			", " + oMain.HKeeperID.ToString() + "," + oMain.HDeptID.ToString() + ",'" + oMain.HExplanation + "','" + oMain.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(oMain.HRedBlueFlag) +
			",'" + oMain.HStockStyle + "'" +
			", " + oMain.HSTOCKORGID.ToString() + "," + oMain.HOWNERID.ToString() +
			") ");
			//更新关联数量

			if (oSystemParameterMain.Kf_OtherInBill_AutoCheck == "Y") //系统参数自动审核
			{
			//审核单据
			oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=convert(varchar(10),getdate(),120) where HInterID= " + oMain.HInterID.ToString());
			}

			//根据TMP表返回子表信息
			DataSet Ds;
			Ds = oCn.RunProcReturn("exec h_p_Kf_GetOtherInBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetOtherInBill_CLD");
			if (Ds == null \|\| Ds.Tables[0].Rows.Count == 0 \|\| Ds.Tables[1].Rows.Count == 0)
			{
			sErrMsg = "获取子表信息失败！";
			oCn.RollBack();
			return false;
			}
			else
			{
			string sJson_StockStyle = "";
			if (oSystemParameterMain.WMS_CampanyName == "韩电") //系统参数客户定制化名称空白为通用
			{
			sJson_StockStyle = "\"F_RKLX\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["F_RKLX"]) + "\","; //入库类型
			}
			else if (oSystemParameterMain.WMS_CampanyName == "四维尔") //系统参数客户定制化名称空白为通用
			{
			sJson_StockStyle = "\"F_ABCD_COMBO\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["F_ABCD_COMBO"]) + "\","; //其他入库业务类型
			}
			else
			{
			sJson_StockStyle = "";
			}
			string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"Model\":{\"FBillNo\":\"" + oMain.HBillNo + "\"," +

			//\"FID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FID"]) + "\"," +
			"\"FBillTypeID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\"}," +
			"\"FStockOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FStockOrgId"]) + "\"}," +
			"\"FStockDirect\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FStockDirect"]) + "\"," +
			"\"FDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDate"]) + "\"," +
			//"\"FSUPPLIERID\":{\"FNumber\":\"" + oMain.HSupplyID.ToString() + "\"}," +
			"\"FDEPTID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDEPTID"]) + "\"}," +
			//"\"FSTOCKERID\":{\"FName\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FSTOCKERID"]) + "\"}," +
			//"\"FSTOCKERGROUPID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FSTOCKERGROUPID"]) + "\"}," +
			"\"FOwnerTypeIdHead\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FOwnerTypeIdHead"]) + "\"," +
			"\"FOwnerIdHead\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FOwnerIdHead"]) + "\"}," +
			"\"FNOTE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FNOTE"]) + "\"," +
			"\"FBaseCurrId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBaseCurrId"]) + "\"}," +
			"\"FScanBox\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FScanBox"]) + "\"," +
			sJson_StockStyle +
			"\"FEntity\":[";
			string sJson_Entry = "";
			for (int i = 0; i < Ds.Tables[1].Rows.Count; i++)
			{
			if (sJson_Entry != "")
			{
			sJson_Entry = sJson_Entry + " , ";
			}
			string sJson_BatchNo = "";
			string sJson_StockPlace = "";
			string sJson_FAUXPROPID = "";
			if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HISBATCHMANAGE"]) == "1") //是否启用批次管理
			{
			sJson_BatchNo = " \"FLOT\": {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\"}, \"FLOT_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\" , ";
			}
			else
			{
			sJson_BatchNo = "";
			}

			if (oSystemParameterMain.WMS_CampanyName == "卓力") //系统参数客户定制化名称空白为通用
			{
			sJson_StockPlace = "\"FStockLocId\":{\"FSTOCKLOCID__FF100002\":{\"FNUMBER\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) + "\"}},";
			}
			else
			{
			if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) == "")
			{
			sJson_StockPlace = "";
			}
			else
			{
			sJson_StockPlace = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) + "\"}},";
			}
			}
			//辅助属性
			if (oSystemParameterMain.WMS_CampanyName == "卓力" \|\| oSystemParameterMain.WMS_CampanyName == "韩电") //系统参数客户定制化名称空白为通用
			{
			sJson_FAUXPROPID = "";
			}
			else
			{
			sJson_FAUXPROPID = " \"FAUXPROPID\":{\"FAUXPROPID__FF100002\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXPROPID"]) + "\"}},";
			}
			//自定义字段处理

			sJson_Entry = sJson_Entry + "{\"FEntryID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntryID"]) + "\"," +
			"\"FMATERIALID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMATERIALID"]) + "\"}," +
			sJson_FAUXPROPID +
			//"\"FAuxPropId\":{\"FAUXPROPID__FF100001\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAuxPropId"]) + "\"}," +
			//"\"FAUXPROPID__FF100030\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXPROPID__FF100030"]) + "\"}," +
			//"\"FAUXPROPID__FF100002\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXPROPID__FF100002"]) + "\"}}," +
			"\"FUnitID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FUnitID"]) + "\"}," +
			"\"FSTOCKSTATUSID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSTOCKSTATUSID"]) + "\"}," +
			"\"FQty\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FQty"]) + "," +
			"\"FBaseUnitId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBaseUnitId"]) + "\"}," +
			"\"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"]) + "\"}}," +
			//"\"FLOT\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\"}," +
			sJson_BatchNo +
			"\"FEntryNote\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntryNote"]) + "\"," +
			//"\"FBOMID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBOMID"]) + "\"}," +
			//"\"FPRODUCEDATE\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPRODUCEDATE"]) + "," +
			//"\"FMTONO\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMTONO"]) + "," +
			"\"FExtAuxUnitId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExtAuxUnitId"]) + "\"}," +
			//"\"FProjectNo\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProjectNo"]) + "," +
			"\"FExtAuxUnitQty\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExtAuxUnitQty"]) + "," +
			"\"FOWNERTYPEID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOWNERTYPEID"]) + "\"," +
			"\"FOWNERID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOWNERID"]) + "\"}," +
			"\"FKEEPERTYPEID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FKEEPERTYPEID"]) + "\"," +
			"\"FKEEPERID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FKEEPERID"]) + "\"}} ";
			}
			//"\"FInStockEntry_Link_FSId\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FInStockEntry_Link_FSId"]) +
			string sJson_End = " ] }}";
			string sJson = sJson_Main + sJson_Entry + sJson_End;

			//从配置文件获取 CLOUD网址、账套信息、登录用户、登录密码
			if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
			{
			sErrMsg = Pub_Class.ClsPub.sExeReturnInfo;
			return false;
			}

			//获取CLOUD账号密码
			string sCLOUDUseName = Pub_Class.ClsPub.sCLOUDUseName;
			string sCLOUDPsd = Pub_Class.ClsPub.sCLOUDPsd;
			DataSet ds11 = get_SaveCLOUDUseNameandPsd(oMain.HInterID);
			if (ds11 == null \|\| ds11.Tables[0].Rows.Count == 0)
			{
			}
			else
			{
			sCLOUDUseName = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserName"]);
			sCLOUDPsd = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserPsd"]);
			}

			//生成其他入库单 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 });

			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 });

			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;
			}
			}
			}
			catch (Exception e)
			{
			sErrMsg = "其他入库单失败！" + e.Message;
			oCn.RollBack();
			return false;
			}
			}

			///生成其他入库单
			public bool set_SaveOtherInBill(Model.ClsKf_OtherInBillMain oMain, ref string sErrMsg)
			{
			//获取系统参数
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();