Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API

YL

2021-08-03 71a3fc79277e2758fc466bf0a869448d6ad43049

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API

 WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs

@@ -43,7 +43,7 @@
                    return objJsonResult;
                }
                //得到信息
                ds = oCN.RunProcReturn("select top 1 * from h_v_IF_Mould  where HNumber= '" + HBarCode + "'", "h_v_IF_Mould");
                ds = oCN.RunProcReturn("select top 1 * from h_v_IF_Mould  where HBarCode = '" + HBarCode + "'", "h_v_IF_Mould");
                //写入信息
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {

 WebAPI/Controllers/Sc_MouldController.cs

@@ -281,7 +281,7 @@
                oSub.HDiameter = DBUtility.ClsPub.isStrNull(subList[0].HDiameter);
                oSub.HBackFlag = DBUtility.ClsPub.isStrNull(subList[0].HBackFlag);
                BillNew.DetailColl.Add(oSub);
                bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
                bResult = BillNew.AddBill_PDA(ref ClsPub.sExeReturnInfo);
                //提示
                if (bResult == true)
                {
@@ -432,7 +432,7 @@
                oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife);
                oSub.HUseLife = DBUtility.ClsPub.isLong(subList[0].HUseLife);
                BillNew.DetailColl.Add(oSub);
                bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
                bResult = BillNew.AddBill_PDA(ref ClsPub.sExeReturnInfo);
                //提示
                if (bResult == true)
                {

 WebAPI/DLL/DAL.dll

Binary files differ

 WebAPI/DLL/DAL20210802.zip

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/21/2021 19:55:31</publishTime>
      <publishTime>08/02/2021 10:33:56</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>07/21/2021 09:18:44</publishTime>
      <publishTime>07/20/2021 15:52:27</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>
@@ -177,163 +177,163 @@
      <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/21/2021 19:55:31</publishTime>
      <publishTime>08/02/2021 10:33:56</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>07/21/2021 09:18:44</publishTime>
      <publishTime>07/20/2021 15:52:27</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>07/21/2021 21:02:11</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>07/21/2021 21:02:10</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>07/21/2021 21:02:11</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>07/21/2021 21:02:11</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>07/21/2021 21:02:11</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>07/21/2021 21:02:10</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>07/21/2021 21:02:11</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>07/21/2021 21:02:12</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>07/21/2021 21:02:12</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>07/21/2021 21:02:11</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>07/21/2021 21:02:12</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>07/21/2021 21:02:11</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>07/21/2021 21:02:11</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>07/21/2021 21:02:12</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>07/21/2021 21:02:12</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>07/21/2021 21:02:12</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>07/21/2021 21:02:11</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>07/21/2021 21:02:12</publishTime>
      <publishTime>07/30/2021 08:33:26</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.map">
      <publishTime>07/21/2021 21:02:08</publishTime>
      <publishTime>07/14/2021 15:45:15</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/02/2021 13:14:41</publishTime>