parent: 274db11b | 补丁 | 提交 | ignore whitespace
ch
2022-02-07 0cdff49898d0e98556501de01d02a446501e2901 
生产领料刷新方法
4个文件已修改
223 ■■■■■ 已修改文件
WebAPI/Controllers/MateOutController.cs 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsSc_MESReturnStepWorkBill.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user 176 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj.user 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebAPI/Controllers/MateOutController.cs


@@ -764,11 +764,11 @@


        //刷新表体  返回出入库条码临时表（领料出库简洁版）


        [Route("MateOutBill/DisBillEntryList_Webs_New_Json1")]


        [HttpGet]


        public object DisBillEntryList_Webs_New_Json1(long HBillID, string HBillType, string sWhere)


        public object DisBillEntryList_Webs_New_Json1(long HBillID, string HBillNo, string HBillType, string sMouldManagerCtl, string sFIFOCtl)


        {


            try


            {


                ds = webserver.GetKf_PonderationBillMain_Temp_New(HBillID, HBillType, sWhere);


                ds = oWebs.GetBillEntry_TmpList(HBillID, HBillNo, HBillType,ref sMouldManagerCtl,ref sFIFOCtl, ref DBUtility.ClsPub.sErrInfo);


                if (ds == null || ds.Tables[0].Rows.Count <= 0)


                {


                    objJsonResult.code = "0";


@@ -801,6 +801,45 @@


            }


        }






        //刷新表体  返回条码库存信息


        [Route("KF_ICInventoryByMaterID/GetBillEntry_TmpList_Pack")]


        [HttpGet]


        public object GetBillEntry_TmpList_Pack(string HBarCode, long sHWHID, long sHSPID, long HOWNERID, string sWhere)


        {


            try


            {


                WebS.WebService1 oWebs = new WebS.WebService1();


                ds = oWebs.Get_ICInventoryByMaterIDList(HBarCode, sHWHID, sHSPID, HOWNERID, sWhere);


                if (ds == null || ds.Tables[0].Rows.Count <= 0)


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "没有返回任何记录！";


                    objJsonResult.data = null;


                    return objJsonResult;


                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);


                }


                else


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 1;


                    objJsonResult.Message = "获取信息成功！";


                    objJsonResult.data = ds.Tables[0];


                    return objJsonResult;


                }


            }


            catch (Exception e)


            {




                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "没有返回任何记录！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


        }




        [Route("MateOutBill/Delete_Json")]


        [HttpGet]


        public object Delete_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType)




 WebAPI/DLL/ClsSc_MESReturnStepWorkBill.cs


@@ -144,7 +144,7 @@


                                    "from Sc_ICMOBillStatus_Tmp where HSourceBillNo='"+omodel.HSourceBillNo.ToString()+"'" +


                                    " and HSourceInterID='"+omodel.HSourceInterID+"' and HSourceEntryID='"+omodel.HMainSourceEntryID.ToString()+"'" +


                                    " and HSourceID='"+omodel.HSourceID.ToString()+"' and HProcID='"+omodel.HProcID.ToString()+"'");


                oCn.RunProc(sql);


                oCn.RunProc(sql1);


                sReturn = "新增单据成功！";


                oCn.Commit();


                return true;




 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user


@@ -9,7 +9,7 @@


  </PropertyGroup>


  <ItemGroup>


    <File Include="apiapp.json">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:08</publishTime>


    </File>


    <File Include="bin/Antlr3.Runtime.dll">


      <publishTime>02/22/2013 08:43:40</publishTime>


@@ -18,40 +18,40 @@


      <publishTime>02/22/2013 08:43:40</publishTime>


    </File>


    <File Include="bin/BLL.dll">


      <publishTime>01/22/2022 00:48:36</publishTime>


      <publishTime>01/23/2022 20:35:05</publishTime>


    </File>


    <File Include="bin/BLL.pdb">


      <publishTime>01/22/2022 00:48:36</publishTime>


      <publishTime>01/23/2022 20:35:05</publishTime>


    </File>


    <File Include="bin/BouncyCastle.Crypto.dll">


      <publishTime>12/18/2020 05:32:28</publishTime>


      <publishTime>12/17/2020 21:32:28</publishTime>


    </File>


    <File Include="bin/DAL.dll">


      <publishTime>01/22/2022 00:48:32</publishTime>


      <publishTime>01/23/2022 20:35:04</publishTime>


    </File>


    <File Include="bin/DAL.pdb">


      <publishTime>01/22/2022 00:48:32</publishTime>


      <publishTime>01/23/2022 20:35:04</publishTime>


    </File>


    <File Include="bin/Dapper.dll">


      <publishTime>07/22/2016 14:52:40</publishTime>


    </File>


    <File Include="bin/DBUtility.dll">


      <publishTime>01/22/2022 00:48:29</publishTime>


      <publishTime>01/14/2022 19:13:57</publishTime>


    </File>


    <File Include="bin/DBUtility.pdb">


      <publishTime>01/22/2022 00:48:29</publishTime>


      <publishTime>01/14/2022 19:13:57</publishTime>


    </File>


    <File Include="bin/ICSharpCode.SharpZipLib.dll">


      <publishTime>05/09/2021 01:08:30</publishTime>


      <publishTime>05/08/2021 17:08:30</publishTime>


    </File>


    <File Include="bin/ICSharpCode.SharpZipLib.pdb">


      <publishTime>05/09/2021 01:08:30</publishTime>


      <publishTime>05/08/2021 17:08:30</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>01/16/2022 20:46:27</publishTime>


      <publishTime>12/23/2021 16:19:02</publishTime>


    </File>


    <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">


      <publishTime>09/20/2018 19:23:20</publishTime>


@@ -69,58 +69,58 @@


      <publishTime>07/25/2012 11:48:56</publishTime>


    </File>


    <File Include="bin/Model.dll">


      <publishTime>01/22/2022 00:48:30</publishTime>


      <publishTime>01/19/2022 09:36:30</publishTime>


    </File>


    <File Include="bin/Model.pdb">


      <publishTime>01/22/2022 00:48:30</publishTime>


      <publishTime>01/19/2022 09:36:30</publishTime>


    </File>


    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="bin/Newtonsoft.Json.dll">


      <publishTime>08/03/2014 20:33:56</publishTime>


    </File>


    <File Include="bin/NPOI.dll">


      <publishTime>10/23/2021 09:07:54</publishTime>


      <publishTime>10/23/2021 01:07:54</publishTime>


    </File>


    <File Include="bin/NPOI.OOXML.dll">


      <publishTime>10/23/2021 09:07:56</publishTime>


      <publishTime>10/23/2021 01:07:56</publishTime>


    </File>


    <File Include="bin/NPOI.OOXML.pdb">


      <publishTime>10/23/2021 17:07:56</publishTime>


      <publishTime>10/23/2021 09:07:56</publishTime>


    </File>


    <File Include="bin/NPOI.OpenXml4Net.dll">


      <publishTime>10/23/2021 09:07:54</publishTime>


      <publishTime>10/23/2021 01:07:54</publishTime>


    </File>


    <File Include="bin/NPOI.OpenXml4Net.pdb">


      <publishTime>10/23/2021 17:07:54</publishTime>


    </File>


    <File Include="bin/NPOI.OpenXmlFormats.dll">


      <publishTime>10/23/2021 09:07:54</publishTime>


    </File>


    <File Include="bin/NPOI.OpenXmlFormats.dll">


      <publishTime>10/23/2021 01:07:54</publishTime>


    </File>


    <File Include="bin/NPOI.OpenXmlFormats.pdb">


      <publishTime>10/23/2021 17:07:54</publishTime>


      <publishTime>10/23/2021 09:07:54</publishTime>


    </File>


    <File Include="bin/NPOI.pdb">


      <publishTime>10/23/2021 17:07:54</publishTime>


      <publishTime>10/23/2021 09:07:54</publishTime>


    </File>


    <File Include="bin/Pub_Class.dll">


      <publishTime>01/22/2022 00:48:25</publishTime>


      <publishTime>01/14/2022 19:13:56</publishTime>


    </File>


    <File Include="bin/Pub_Class.pdb">


      <publishTime>01/22/2022 00:48:25</publishTime>


      <publishTime>01/14/2022 19:13:56</publishTime>


    </File>


    <File Include="bin/Pub_Control.dll">


      <publishTime>01/22/2022 00:48:26</publishTime>


      <publishTime>01/14/2022 19:13:57</publishTime>


    </File>


    <File Include="bin/Pub_Control.pdb">


      <publishTime>01/22/2022 00:48:26</publishTime>


      <publishTime>01/14/2022 19:13:57</publishTime>


    </File>


    <File Include="bin/SQLHelper.dll">


      <publishTime>01/22/2022 00:48:27</publishTime>


      <publishTime>01/14/2022 19:13:57</publishTime>


    </File>


    <File Include="bin/SQLHelper.pdb">


      <publishTime>01/22/2022 00:48:27</publishTime>


      <publishTime>01/14/2022 19:13:57</publishTime>


    </File>


    <File Include="bin/stdole.dll">


      <publishTime>05/09/2021 13:35:37</publishTime>


@@ -189,7 +189,7 @@


      <publishTime>11/28/2018 13:01:00</publishTime>


    </File>


    <File Include="bin/System.Web.Http.WebHost.dll">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="bin/System.Web.Mvc.dll">


      <publishTime>01/28/2015 04:02:18</publishTime>


@@ -222,181 +222,181 @@


      <publishTime>11/24/2014 11:18:48</publishTime>


    </File>


    <File Include="bin/WebAPI.dll">


      <publishTime>01/22/2022 00:48:41</publishTime>


      <publishTime>01/26/2022 00:28:53</publishTime>


    </File>


    <File Include="bin/WebAPI.dll.config">


      <publishTime>12/15/2021 17:59:43</publishTime>


    </File>


    <File Include="bin/WebAPI.pdb">


      <publishTime>01/22/2022 00:48:41</publishTime>


      <publishTime>01/26/2022 00:28:53</publishTime>


    </File>


    <File Include="bin/WebGrease.dll">


      <publishTime>07/17/2013 17:03:52</publishTime>


    </File>


    <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">


      <publishTime>11/29/2018 21:26:02</publishTime>


      <publishTime>11/29/2018 13:26:02</publishTime>


    </File>


    <File Include="bin/zh-Hans/System.Web.Http.resources.dll">


      <publishTime>11/29/2018 21:26:30</publishTime>


      <publishTime>11/29/2018 13:26:30</publishTime>


    </File>


    <File Include="Content/bootstrap.css">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:04</publishTime>


    </File>


    <File Include="Content/bootstrap.min.css">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:04</publishTime>


    </File>


    <File Include="Content/Site.css">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:04</publishTime>


    </File>


    <File Include="DLL/BLL.dll">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="DLL/DAL.dll">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="DLL/DBUtility.dll">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="DLL/Model.dll">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="DLL/Newtonsoft.Json.Net35.dll">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="DLL/Pub_Class.dll">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="DLL/Pub_Control.dll">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="DLL/SQLHelper.dll">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="fonts/glyphicons-halflings-regular.eot">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:08</publishTime>


    </File>


    <File Include="fonts/glyphicons-halflings-regular.svg">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:08</publishTime>


    </File>


    <File Include="fonts/glyphicons-halflings-regular.ttf">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:08</publishTime>


    </File>


    <File Include="fonts/glyphicons-halflings-regular.woff">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:08</publishTime>


    </File>


    <File Include="Global.asax">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="Index.html">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="packages.config">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>01/14/2022 09:12:59</publishTime>


    </File>


    <File Include="Views/Scripts/bootstrap.js">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="Views/Scripts/bootstrap.min.js">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="Views/Scripts/jquery-1.10.2.js">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="Views/Scripts/jquery-1.10.2.min.js">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="Views/Scripts/jquery-1.10.2.min.map">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="Views/Scripts/jquery.validate.js">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="Views/Scripts/jquery.validate.min.js">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="Views/Scripts/modernizr-2.6.2.js">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="Views/Shared/Error.cshtml">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="Views/Shared/_Layout.cshtml">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="Views/web.config">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="Views/_ViewStart.cshtml">


      <publishTime>01/16/2022 20:46:29</publishTime>


      <publishTime>12/23/2021 16:19:07</publishTime>


    </File>


    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:23:00</publishTime>


    </File>


    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:22:59</publishTime>


    </File>


    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:23:00</publishTime>


    </File>


    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:22:59</publishTime>


    </File>


    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:23:00</publishTime>


    </File>


    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:22:59</publishTime>


    </File>


    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:23:00</publishTime>


    </File>


    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:23:00</publishTime>


    </File>


    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:23:00</publishTime>


    </File>


    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:23:00</publishTime>


    </File>


    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:23:00</publishTime>


    </File>


    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:23:00</publishTime>


    </File>


    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:23:00</publishTime>


    </File>


    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:23:00</publishTime>


    </File>


    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:23:00</publishTime>


    </File>


    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:23:00</publishTime>


    </File>


    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:23:00</publishTime>


    </File>


    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:23:00</publishTime>


    </File>


    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">


      <publishTime>01/16/2022 23:02:58</publishTime>


      <publishTime>01/14/2022 09:23:00</publishTime>


    </File>


    <File Include="Web References/WebS/Reference.cs">


      <publishTime>12/20/2021 13:19:56</publishTime>


@@ -411,7 +411,7 @@


      <publishTime>12/20/2021 13:19:56</publishTime>


    </File>


    <File Include="Web.config">


      <publishTime>01/22/2022 00:48:49</publishTime>


      <publishTime>01/19/2022 09:36:34</publishTime>


    </File>


  </ItemGroup>


</Project>




 WebAPI/WebAPI.csproj.user


@@ -9,7 +9,7 @@


    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>


    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>


    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>


    <NameOfLastUsedPublishProfile>D:\智云MES\Lay-Api\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>


    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>


    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>


    <UseIISExpress>false</UseIISExpress>


    <Use64BitIISExpress />