智云MES-UI前端
parent: d360cb1d | 补丁 | 提交 | ignore whitespace
王 垚
2021-06-25 bdbc38eeff8d576fc6eb31b805c257cf72022fd1 
报废入库单
4个文件已修改
40 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBill_PDA.html 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具点检保养/Sc_MouldDotCheckBill_PDA.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user


@@ -5,7 +5,7 @@


<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">


  <PropertyGroup>


    <_PublishTargetUrl>D:\网站发布\智云MESWMS\LAYUI</_PublishTargetUrl>


    <History>True|2021-06-25T03:04:32.0541037Z;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>


    <History>True|2021-06-25T06:47:08.0595253Z;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>


  </PropertyGroup>


  <ItemGroup>


    <File Include="bin/layuiadmin/style/admin.css">


@@ -15,10 +15,10 @@


      <publishTime>05/24/2021 09:34:03</publishTime>


    </File>


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


      <publishTime>06/25/2021 10:56:02</publishTime>


      <publishTime>06/25/2021 14:46:59</publishTime>


    </File>


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


      <publishTime>06/25/2021 10:56:02</publishTime>


      <publishTime>06/25/2021 14:46:59</publishTime>


    </File>


    <File Include="layuiadmin/config.js">


      <publishTime>05/24/2021 09:34:02</publishTime>


@@ -1395,13 +1395,13 @@


      <publishTime>06/24/2021 09:18:58</publishTime>


    </File>


    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldScrapInBill_PDA.html">


      <publishTime>06/25/2021 11:04:13</publishTime>


      <publishTime>06/25/2021 14:46:52</publishTime>


    </File>


    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBillList.html">


      <publishTime>06/08/2021 09:09:20</publishTime>


    </File>


    <File Include="views/模治具管理/模治具点检保养/Sc_MouldDotCheckBill_PDA.html">


      <publishTime>06/25/2021 10:22:45</publishTime>


      <publishTime>06/25/2021 14:31:03</publishTime>


    </File>


    <File Include="views/模治具管理/模治具管理/Gy_BarCodeBillList.html">


      <publishTime>05/24/2021 09:34:03</publishTime>


@@ -1914,7 +1914,7 @@


      <publishTime>05/24/2021 09:34:03</publishTime>


    </File>


    <File Include="Web.config">


      <publishTime>06/25/2021 10:56:09</publishTime>


      <publishTime>06/25/2021 14:47:05</publishTime>


    </File>


  </ItemGroup>


</Project>




 WebTM/WebTM.csproj.user


@@ -2,7 +2,7 @@


<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">


  <PropertyGroup>


    <NameOfLastUsedPublishProfile>D:\项目\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>


    <ProjectView>ShowAllFiles</ProjectView>


    <ProjectView>ProjectFiles</ProjectView>


    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>


    <UseIISExpress>true</UseIISExpress>


    <Use64BitIISExpress />




 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldScrapInBill_PDA.html


@@ -292,14 +292,6 @@




            //日期时间选择器


            laydate.render({


                elem: '#HBeginDate'


                , type: 'datetime'


            });


            laydate.render({


                elem: '#HEndDate'


                , type: 'datetime'


            });


            laydate.render({


                elem: '#HDate'


                , type: 'datetime'


            });


@@ -329,6 +321,10 @@


            $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期


            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //创建日期


            $("#HMaker").val(sessionStorage["HUserName"]);     //创建人


            $("#HManagerName").val(sessionStorage["HUserName"]);     //创建人


            $("#HManagerID").val(sessionStorage["HBillerID"]);     //创建人


            $("#HDeptName").val(sessionStorage["HDept"]);     //部门


            $("#HDeptID").val(sessionStorage["HDeptID"]);     //部门


            //模治具条码是否扫描标记


            var HProcExchBillNoFlag = false;




@@ -365,7 +361,9 @@


                                    "HMouldID": data.hinterid,


                                    "HBarName": data.HName,


                                    "HBarSpec": data.HModel,


                                    "HBarModel": data.HModel2


                                    "HBarModel": data.HModel2,


                                    "HQty": 1,


                                    "HLeaveLife": data.HLeaveLife


                                });


                                $("#HBarCode").attr("readonly", "readonly");//条形码只读


                                $("#HBarCode").css("background-color", "#efefef4d");


@@ -403,7 +401,7 @@


                var index = layer.load();


                $.ajax({


                    type: "POST",


                    url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/SaveGetMoudlCheckBillList",


                    url: GetWEBURL() + "/Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA",


                    //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",


                    async: true,


                    data: { "msg": oMain },


@@ -451,15 +449,13 @@


                $.ajax({


                    url: GetWEBURL() + "/Web/GetMAXNum",


                    type: "GET",


                    data: { "HBillType": '3821' },


                    data: { "HBillType": '3831' },


                    success: function (d) {


                        //console.log(d.data);


                        $("#HInterID").val("0");


                        $("#HBillNo").val(d.data[0].HBillNo);


                    }


                });


                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //点检开始时间


                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //点检结束时间


                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期


                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //创建日期


                $("#HMaker").val(sessionStorage["HUserName"]);     //创建人


@@ -535,7 +531,7 @@


            //选择仓位


            form.on('submit(StockPlace)', function () {//选择仓位


                var HWHID = $("#HWHID").val();


                if (HWHID = "") {


                if (HWHID== "") {


                    layer.msg("请先选择仓库", { index: 0 });


                    return;


                }




 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξߵã¼ì±£Ñø/Sc_MouldDotCheckBill_PDA.html


@@ -391,7 +391,7 @@


                var index = layer.load();


                $.ajax({


                    type: "POST",


                    url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/SaveGetMoudlCheckBillList",


                    url: GetWEBURL() + "/Sc_MouldScrapInHouseBill/SaveGetMoudlCheckBillList_PDA",


                    //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",


                    async: true,


                    data: { "msg": oMain },