王 垚
2021-06-25 91367df5786f779ce75b174a8de236a948c19125
nothing
3个文件已修改
161 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index_Mobile.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBill_PDA.html 139 ●●●●● 补丁 | 查看 | 原始文档 | 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-24T01:19:21.8407413Z;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-24T07:29:05.1557976Z;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/24/2021 09:19:17</publishTime>
      <publishTime>06/24/2021 15:17:28</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>06/24/2021 09:19:17</publishTime>
      <publishTime>06/24/2021 15:17:28</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>05/24/2021 09:34:02</publishTime>
@@ -1032,7 +1032,7 @@
      <publishTime>06/22/2021 13:45:04</publishTime>
    </File>
    <File Include="views/index_Mobile.html">
      <publishTime>05/24/2021 09:34:03</publishTime>
      <publishTime>06/24/2021 15:09:22</publishTime>
    </File>
    <File Include="views/PublicPage/CheckItemType.html">
      <publishTime>06/10/2021 11:23:15</publishTime>
@@ -1388,8 +1388,14 @@
    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldScrapInBillList.html">
      <publishTime>06/24/2021 09:18:58</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldScrapInBill_PDA.html">
      <publishTime>06/24/2021 15:25:57</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/24/2021 14:47:36</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Gy_BarCodeBillList.html">
      <publishTime>05/24/2021 09:34:03</publishTime>
@@ -1902,7 +1908,7 @@
      <publishTime>05/24/2021 09:34:03</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>06/24/2021 09:19:18</publishTime>
      <publishTime>06/24/2021 15:17:35</publishTime>
    </File>
  </ItemGroup>
</Project>
WebTM/views/index_Mobile.html
@@ -149,6 +149,12 @@
                              ç‚¹æ£€è®°å½•单
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="模治具管理/模治具仓库管理/Sc_MouldScrapInBill_PDA.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              æŠ¥åºŸå…¥åº“单
                          </a>
                      </dd>
                  </dl>
              </li>
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldScrapInBill_PDA.html
@@ -14,7 +14,7 @@
    <style>
        .layui-form-label {
            font-size: 14px;
            width: 85px;
            width: 85px;
            text-align: inherit;
        }
        /*全局设置输入框高度*/
@@ -29,10 +29,14 @@
        .bz_td {
            display: -webkit-box; /*设置按钮不换行*/
            padding: 1%; /*设置输入框边距*/
        }
        }
        /*设置本站信息按钮高度*/
        .bz_btu {
            height: 30px;
        }
        .laydate-time-list ol {
            overflow-x: hidden !important;
            overflow-y: auto !important;
        }
    </style>
</head>
@@ -73,7 +77,7 @@
                                    <td class="bz_td">
                                        <input type="text" name="HGroup" class="layui-input" id="HGroup" placeholder="选择仓库" style="background-color:#efefef4d;" readonly>
                                        <input type="hidden" name="HGroupID" id="HGroupID" value="0" autocomplete="off" class="layui-input">
                                        <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionTeam-BT">...</button>
                                        <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="Gy_WarehouseList-BT">...</button>
                                    </td>
                                </tr>
                                <tr>
@@ -93,7 +97,7 @@
                                <tr>
                                    <th>单据日期</th>
                                    <td class="t1_input">
                                        <input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;">
                                        <input type="datetime" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;">
                                    </td>
                                </tr>
                                <tr>
@@ -101,7 +105,7 @@
                                    <td class="bz_td">
                                        <input type="text" name="HDeptName" class="layui-input" id="HDeptName" placeholder="选择部门" style="background-color:#efefef4d;" readonly>
                                        <input type="hidden" name="HDeptID" id="HDeptID" value="0" autocomplete="off" class="layui-input">
                                        <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionTeam-BT">...</button>
                                        <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="Gy_DepartmentList-BT">...</button>
                                    </td>
                                </tr>
                                <tr>
@@ -151,7 +155,7 @@
                                <tr>
                                    <th>创建日期</th>
                                    <td class="t1_input">
                                        <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;">
                                        <input type="datetime" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;">
                                    </td>
                                </tr>
                                <tr>
@@ -163,7 +167,7 @@
                                <tr>
                                    <th>修改日期</th>
                                    <td class="t1_input">
                                        <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                        <input type="datetime" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                    </td>
                                </tr>
                                <tr>
@@ -175,19 +179,19 @@
                                <tr>
                                    <th>审核日期</th>
                                    <td class="t1_input">
                                        <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="background-color:#efefef4d;" readonly>
                                        <input type="datetime" name="HCheckDate" class="layui-input" id="HCheckDate" style="background-color:#efefef4d;" readonly>
                                    </td>
                                </tr>
                                <tr>
                                    <th>作废人</th>
                                    <td class="t1_input">
                                        <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="流转卡号" style="background-color:#efefef4d;" readonly>
                                        <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo"   style="background-color:#efefef4d;" readonly>
                                    </td>
                                </tr>
                                <tr>
                                    <th>作废日期</th>
                                    <td class="t1_input">
                                        <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                        <input type="datetime" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                    </td>
                                </tr>
                            </tbody>
@@ -201,21 +205,6 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script>
        function getUrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            }
            return vars;
        }
        var params = getUrlVars();
        var BillStatusjson = params[params[0]];
        var InterID = params[params[1]];
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
@@ -229,26 +218,49 @@
                , laydate = layui.laydate
                , form = layui.form;
            //获取当前时间处理
            $("#HStationInTime").val(Format(new Date(), "yyyy-MM-dd"));
            $("#HMaker").val(sessionStorage["HUserName"]);//创建人
            //页面初始化赋值
            //获取单据号
            $.ajax({
                url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
                type: "GET",
                data: { "billType": '3790' },
                success: function (d) {
                    $("#HBillNo").val(d.data.HBillNo);//进站单号
                    $("#HInterID").val(d.data.HInterID);//进站单号ID
                }, error: function () {
                    layer.alert("获取单据号失败!", { icon: 5 });
                }
            //日期时间选择器
            laydate.render({
                elem: '#HDate'
                , type: 'datetime'
            });
            laydate.render({
                elem: '#HMakeDate'
                , type: 'datetime'
            });
            laydate.render({
                elem: '#HUpDateDate'
                , type: 'datetime'
            });
            laydate.render({
                elem: '#HCheckDate'
                , type: 'datetime'
            });
            laydate.render({
                elem: '#HDeleteDate'
                , type: 'datetime'
            });
            //初始基本信息赋值
            $("#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"]);     //创建人
            $("#HBarCode").focus();
            $("#HBarCode").css("box-shadow", "0 0 0 1px #00ff00");
            //页面初始化赋值
            //获取最大单据号
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                type: "GET",
                data: { "HBillType": '3821' },
                success: function (d) {
                    //console.log(d.data);
                    $("#HInterID").val(d.data[0].HInterID);
                    $("#HBillNo").val(d.data[0].HBillNo);
                }
            });
            //扫条形码方法
            $('#HBarCode').on('keydown', function (event) {   //扫条形码
                var HBarCode = $('#HBarCode').val();//条形码(流转卡号)(数据库中为单据号)
@@ -259,33 +271,24 @@
                        return;
                    }
                    $.ajax({
                        url: GetWEBURL() + "api/newBill/getHbarCodeDetail",
                        url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
                        type: "GET",
                        data: {
                            "sBillBarCode": HBarCode
                            "HBarCode": HBarCode
                        },
                        success: function (result) {
                            if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
                                var data = result.data[0];
                                form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                    "HProcExchBillNo": $("#HBarCode").val()
                                    //, "HProcID": data.HProcID
                                    //, "HProc": data.工序
                                    //, "HCenter": data.工作中心
                                    //, "HCenterID": data.工作中心代码
                                    , "HICMOInterID": data.hicmointerid
                                    , "HICMOBillNo": data.任务单号
                                    , "HDeptID": data.HDeptID
                                    , "HQty": data.计划数量
                                    , "HMaterID": data.HMaterID
                                    , "HMaterName": data.产品
                                    , "HMaterModel": data.规格型号
                                    , "HICMOQty": data.生产数量
                                    , "HOrderProcNO":data.订单跟踪号
                                    "HName": data.HName,
                                    "HModel": data.HModel,
                                    "HModel2": data.HModel2,
                                    "HQty": 1,
                                    "HLeaveLife": data.HLeaveLife,
                                });
                                //$("#HBarCode").attr("readonly", "readonly");//条形码只读
                                //$("#HBarCode").css("background-color", "#efefef4d");
                                $("#HBarCode").css("box-shadow", "none");
                                //$("#HBarCode").css("box-shadow", "none");
                            } else {
                                layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                            }
@@ -295,8 +298,8 @@
                    });
                }
            });
            //选择生产班组弹窗
            form.on('submit(ProductionTeam-BT)', function () {//选择生产班组
            //选择部门
            form.on('submit(Gy_DepartmentList-BT)', function () {//选择生产班组
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
@@ -304,7 +307,7 @@
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../Baseset/基础资料/Gy_GetProductionTeamList.html', 'yes']
                    , content: ['../../Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , resize: false
                    , cancel: function (index, layero) {
                    }
@@ -422,6 +425,18 @@
            } 
        }
        function GetHDeptNameValue(obj) {
            if (obj.length == 0) {
                layer.msg("请先选择部门", { index: 0 });
            } else {
                $("#HDeptName").val(obj[0].部门名称);
                $("#HGroupID").val(obj[0].HItemID);
                $("#HGroup").css("box-shadow", "none");
                checkPopup();
                layer.closeAll();
            }
        }
        //返回生产班组
        function GetProductionTeamValue(obj) {  //返回生产班组
            if (obj.length == 0) {