Merge branch 'master' of http://101.37.171.70:10101/r/~ouyangqing/YqnApi

zgq

2021-01-26 48829b790f75bbf09ca530bd692b7ced9537b7c1

Merge branch 'master' of http://101.37.171.70:10101/r/~ouyangqing/YqnApi

 WebAPI/Models/StationOutBillView.cs

@@ -40,5 +40,6 @@
        public string HBillNo { get; set; }
        public string HRemark { get; set; }
        public int HBillStatus { get; set; }
        public int HProcNo { get; set; }
    }
}

 WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user

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

 WebAPI/Service/YqnQbService.cs

@@ -4,6 +4,7 @@
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Web;
using WebAPI.Dapper;
using WebAPI.Models;
@@ -102,14 +103,14 @@
                {
                    var stationOutList = YqnDal.GetStationOutBillMailList(oMain.HICMOBillNo);//获得该流转卡所有出站单
                    var stationInModel = stationInList.OrderByDescending(a => a.HDate).First();//获取进站单最新进站工序
                    if (stationOutList.Count == 0 && oMain.HEmpID == stationInModel.HEmpID)
                    if (stationOutList.Count == 0 && oMain.HProcID == stationInModel.HProcID)
                        return new ApiResult { code = -1, msg = "重复扫描" };
                    if (stationOutList.Count == 0 && oMain.HEmpID != stationInModel.HEmpID)
                    if (stationOutList.Count == 0 && oMain.HProcID != stationInModel.HProcID)
                        return new ApiResult { code = -1, msg = "此单已关联" };
                    var stationOutModel = stationOutList.OrderByDescending(a => a.HDate).First();//获取出站单最新出站工序
                    if (stationInModel.HProcID != stationOutModel.HProcID && stationInModel.HEmpID == oMain.HEmpID)
                    if (stationInModel.HProcID != stationOutModel.HProcID && stationInModel.HProcID == oMain.HProcID)
                        return new ApiResult { code = -1, msg = "重复扫描" };
                    if (stationInModel.HProcID != stationOutModel.HProcID && stationInModel.HEmpID == oMain.HEmpID)
                    if (stationInModel.HProcID != stationOutModel.HProcID && stationInModel.HProcID == oMain.HProcID)
                        return new ApiResult { code = -1, msg = "此单已关联" };
                    if (stationOutList.Exists(a => a.HProcID == oMain.HProcID))
                        return new ApiResult { code = -1, msg = "该单据已完成此工艺" };
@@ -119,7 +120,6 @@
                var result = oWebs.set_SaveStationInBill(oMain, ref sErrMsg);//进站
                if (!result)
                {

                    return new ApiResult { code = -1, msg = sErrMsg };
                }
                return new ApiResult { code = 1, msg = "操作成功" };
@@ -186,7 +186,7 @@
        /// </summary>
        public static ApiResult SetStationOutBill(StationOutBillView omodel)
        {
            if (!dicLock.TryAdd(omodel.HBillNo, omodel.HBillNo))
            if (!dicLock.TryAdd(omodel.HBillNo, omodel.HBillNo))//同一单号并发处理
                return new ApiResult { code = -1, msg = "服务器繁忙" };
            var stationInBillModel = YqnDal.GetStationInBillMail(omodel.HProcID, omodel.HICMOBillNo);
            if (stationInBillModel == null)
@@ -194,8 +194,7 @@
            var stationOutBillModel = YqnDal.GetStationOutBillMail(omodel.HProcID, omodel.HICMOBillNo);
            if (stationOutBillModel != null)
                return new ApiResult { code = -1, msg = "该工序已存在出站单" };
            WebS.WebService1 oWebs = new WebS.WebService1();
            string sErrMsg = string.Empty;
            omodel.HYear = DateTime.Now.Year;
            var result = SetOutBill(omodel);
            return result;
        }
@@ -271,22 +270,23 @@
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                omodel.HInterID = DBUtility.ClsPub.CreateBillID("3791", ref DBUtility.ClsPub.sExeReturnInfo);
                oCN.BeginTran();
                oCN.RunProc("Insert Into Sc_StationOutBillMain " +
                //oCN.BeginTran();
                var sql = "Insert Into Sc_StationOutBillMain " +
                    "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
                    ",HYear,HPeriod,HRemark" +
                    ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
                    ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationOutTime,HSourceID" +
                    ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
                    ",HSupID,HQty,HPrice,HMoney" +
                    ",HSupID,HQty,HPrice,HMoney,HProcNo" +
                    ") " +
                    " values('3791','3791'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                    "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
                    "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HProcPlanInterID.ToString() + "," + omodel.HProcPlanEntryID.ToString() + ",'" + omodel.HProcPlanBillNo + "'," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
                    ",'" + omodel.HProcExchBillNo + "'," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HICMOQty.ToString() + "," + omodel.HPlanQty.ToString() + ",getdate()," + omodel.HSourceID.ToString() +
                    "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" +
                    "," + omodel.HSupID.ToString() + "," + omodel.HQty.ToString() + "," + omodel.HPrice.ToString() + "," + omodel.HMoney.ToString() +
                  ") ");
                    "," + omodel.HSupID.ToString() + "," + omodel.HQty.ToString() + "," + omodel.HPrice.ToString() + "," + omodel.HMoney.ToString() +"," + omodel.HProcNo + ") ";
                //var result= SqlPools.GetInstance("YqnConn").ExecuteCommand(sql);
                oCN.RunProc(sql);
                oCN.Commit();
                return new ApiResult { code = 1, msg = "新增成功" };
            }
@@ -297,36 +297,37 @@
        }
        public static ApiResult SetInBill(ClsSc_StationInBillMain omodel)
        {
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            //SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            try
            {
                var nowTime = DateTime.Now;
                omodel.HBillType = "3790";
                omodel.HYear = nowTime.Year;
                omodel.HBillSubType = "3790";
                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID("3790", ref DBUtility.ClsPub.sExeReturnInfo);
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(omodel.HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
                omodel.HDate = nowTime;
                omodel.HMakeDate = nowTime.ToString();
                omodel.HStationInTime = nowTime;
                omodel.HBarCodeMakeDate = nowTime;
                omodel.HPeriod = 1;
                var sqlBuilder = new StringBuilder();
                sqlBuilder.Append("Insert Into Sc_StationInBillMain(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate,HYear,HPeriod,HRemark,HICMOInterID,HICMOBillNo");
                sqlBuilder.Append(",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID");
                sqlBuilder.Append(",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSupID,HQty,HPrice,HMoney,HProcId,HProcNo) values ");
                sqlBuilder.Append("(@HBillType,@HBillSubType,@HInterID,@HBillNo,@HBillStatus,@HDate,@HMaker,@HMakeDate,@HYear,@HPeriod,@HRemark,@HICMOInterID,@HICMOBillNo");
                sqlBuilder.Append(",@HProcPlanInterID,@HProcPlanEntryID,@HProcPlanBillNo,@HProcExchInterID,@HProcExchEntryID,@HProcExchBillNo,@HMaterID,@HProcID,@HICMOQty,@HPlanQty,@HStationInTime,@HSourceID");
                sqlBuilder.Append(",@HGroupID,@HDeptID,@HEmpID,@HBarCode,@HAddr,@HBarCodeMaker,@HBarCodeMakeDate,@HSupID,@HQty,@HPrice,@HMoney,@HProcId,@HProcNo)");
                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //主表
                oCN.RunProc("Insert Into Sc_StationInBillMain " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
                ",HYear,HPeriod,HRemark" +
                ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
                ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" +
                ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
                ",HSupID,HQty,HPrice,HMoney,HMaker" +
                ") " +
                " values('3790','3790'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
                "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HProcPlanInterID.ToString() + "," + omodel.HProcPlanEntryID.ToString() + ",'" + omodel.HProcPlanBillNo + "'," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
                ",'" + omodel.HProcExchBillNo + "'," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HICMOQty.ToString() + "," + omodel.HPlanQty.ToString() + ",getdate()," + omodel.HSourceID.ToString() +
                "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" +
                "," + omodel.HSupID.ToString() + "," + omodel.HQty.ToString() + "," + omodel.HPrice.ToString() + "," + omodel.HMoney.ToString() +
              ",'"+omodel.HMaker+"') ");

                oCN.Commit();
                //oCN.BeginTran();
                var result = SqlPools.GetInstance("YqnConn").ExecuteCommand(sqlBuilder.ToString(), omodel);
                //oCN.RunProc(sql);
                //oCN.Commit();
                return new ApiResult { code = 1, msg = "新增成功" };
            }
            catch (Exception e)
            {
                oCN.RollBack();
                //oCN.RollBack();
                return new ApiResult { code = -1, msg = "保存错误/" + e.ToString() };
            }
        }

 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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsCLD_Customer_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsCLD_Department_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsCLD_Employee_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsCLD_StockPlace_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsCLD_Supplier_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsCLD_Warehouse_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_BadReason_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_BarCodeBill_WMS_Model_View, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_Customer_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_Department_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_Employee_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_Group_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_Item30JiTai_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_Source_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_StockPlace_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_Supplier_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsGy_Warehouse_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
   <TypeInfo>WebAPI.WebS.ClsKf_ICStockBill_WMS, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</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.DiscoveryDocumentReference" url="http://124.70.129.242/WEBS-WMS/WebService1.asmx?disco" filename="WebService1.disco" />
    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://124.70.129.242/WEBS-WMS/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
    <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" />
  </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/WEBS-WMS/WebService1.asmx?wsdl" docRef="http://124.70.129.242/WEBS-WMS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
  <soap address="http://124.70.129.242/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/WEBS-WMS/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
  <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/" />
</discovery>

 WebAPI/Web References/WebS/WebService1.wsdl

Diff too large

 WebAPI/WebAPI.csproj

@@ -409,10 +409,10 @@
    <WebReferences Include="Web References\" />
  </ItemGroup>
  <ItemGroup>
    <WebReferenceUrl Include="http://192.168.16.80/WEBS-WMS/WebService1.asmx">
    <WebReferenceUrl Include="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx">
      <UrlBehavior>Static</UrlBehavior>
      <RelPath>Web References\WebS\</RelPath>
      <UpdateFromURL>http://192.168.16.80/WEBS-WMS/WebService1.asmx</UpdateFromURL>
      <UpdateFromURL>http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx</UpdateFromURL>
      <ServiceLocationURL>
      </ServiceLocationURL>
      <CachedDynamicPropName>