修改了器具PDA其他入库单扫码、提交方法

ch

2021-10-26 da12878d22719f387e254ce15541b4b2089b427c

修改了器具PDA其他入库单扫码、提交方法

 DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache

Binary files differ

 MES/bin/Debug/AxInterop.gregn6Lib.dll

Binary files differ

 MES/bin/Debug/BLL.dll

Binary files differ

 MES/bin/Debug/BLL.pdb

Binary files differ

 MES/bin/Debug/DAL.dll

Binary files differ

 MES/bin/Debug/DAL.pdb

Binary files differ

 MES/bin/Debug/Interop.gregn6Lib.dll

Binary files differ

 MES/bin/Debug/MES.exe

Binary files differ

 MES/bin/Debug/MES.pdb

Binary files differ

 MES/bin/Debug/Model.dll

Binary files differ

 MES/bin/Debug/Model.pdb

Binary files differ

 MES/bin/Debug/WarM.dll

Binary files differ

 MES/bin/Debug/WarM.pdb

Binary files differ

 MES/bin/Debug/stdole.dll

Binary files differ

 WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs

@@ -33,8 +33,70 @@
        #region 根据模治具条码查找模具档案信息
        [Route("Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown")]
        [HttpGet]
        public object txtHBarCode_KeyDown(string HBarCode,long HInterID,long HWHID,long HSPID)
        public object txtHBarCode_KeyDown(string HBarCode)
        {
            //try
            //{
            //    if (HBarCode == null || HBarCode.Equals(""))
            //    {
            //        objJsonResult.code = "0";
            //        objJsonResult.count = 0;
            //        objJsonResult.Message = "条形码不能为空！";
            //        objJsonResult.data = null;
            //        return objJsonResult;
            //    }
            //    //得到信息
            //    ds = oCN.RunProcReturn("select top 1 * from h_v_IF_Mould  where HBarCode = '" + HBarCode + "'", "h_v_IF_Mould");
            //    //ds = oWebs.get_InfoByBarCode(HBarCode, ref DBUtility.ClsPub.sErrInfo);
            //    //写入信息
            //    if (ds == null )
            //    {
            //        objJsonResult.code = "0";
            //        objJsonResult.count = 0;
            //        objJsonResult.Message = "未查询到模具信息！";
            //        objJsonResult.data = null;
            //        return objJsonResult;
            //    }
            //    else
            //    {
            //        omodel.HInterID = HInterID;
            //        omodel.HBillType = "3796";
            //        omodel.HMaker = DBUtility.ClsPub.CurUserName;
            //        omodel.HMaterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HMaterID"]);
            //        omodel.HQty = 0;
            //        omodel.HBarCode = Convert.ToString(ds.Tables[0].Rows[0]["HBarCode"]);
            //        omodel.HWhID = HWHID;
            //        omodel.HStockPlaceID = HSPID;
            //        omodel.HSourceBillNo = "1";
            //        omodel.HSourceBillType = "1";
            //        omodel.HSourceEntryID = 0;
            //        omodel.HSourceInterID = 0;
            //        if (set_SavePonderationBillMain_Temp(omodel, ref DBUtility.ClsPub.sErrInfo))
            //        {
            //            objJsonResult.code = "1";
            //            objJsonResult.count = 1;
            //            objJsonResult.Message = "扫码成功！";
            //            objJsonResult.data = ds.Tables[0];
            //            return objJsonResult;
            //        }
            //        else
            //        {
            //            objJsonResult.code = "0";
            //            objJsonResult.count = 0;
            //            objJsonResult.Message = "存入缓存表失败！";
            //            objJsonResult.data = null;
            //            return objJsonResult;
            //        }
            //    }
            //}
            //catch (Exception e)
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = "Exception！" + e.ToString();
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}
            try
            {
                if (HBarCode == null || HBarCode.Equals(""))
@@ -49,7 +111,7 @@
                ds = oCN.RunProcReturn("select top 1 * from h_v_IF_Mould  where HBarCode = '" + HBarCode + "'", "h_v_IF_Mould");
                //ds = oWebs.get_InfoByBarCode(HBarCode, ref DBUtility.ClsPub.sErrInfo);
                //写入信息
                if (ds == null )
                if (ds == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -59,34 +121,11 @@
                }
                else
                {
                    omodel.HInterID = HInterID;
                    omodel.HBillType = "3796";
                    omodel.HMaker = DBUtility.ClsPub.CurUserName;
                    omodel.HMaterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HMaterID"]);
                    omodel.HQty = 0;
                    omodel.HBarCode = Convert.ToString(ds.Tables[0].Rows[0]["HBarCode"]);
                    omodel.HWhID = HWHID;
                    omodel.HStockPlaceID = HSPID;
                    omodel.HSourceBillNo = "1";
                    omodel.HSourceBillType = "1";
                    omodel.HSourceEntryID = 0;
                    omodel.HSourceInterID = 0;
                    if (set_SavePonderationBillMain_Temp(omodel, ref DBUtility.ClsPub.sErrInfo))
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "扫码成功！";
                        objJsonResult.data = ds.Tables[0];
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "存入缓存表失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)

 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

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