zgq
2021-01-17 a223e72443e926cfd956a5891301934514b0d76a
工序进站-扫条形码,流水号
3个文件已修改
174 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/webtm.pubxml.user 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工序汇报/MES_StationInBill_PDA.html 158 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/webtm.pubxml.user
@@ -13,10 +13,10 @@
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>01/15/2021 12:52:07</publishTime>
      <publishTime>01/17/2021 21:24:39</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>01/15/2021 12:52:07</publishTime>
      <publishTime>01/17/2021 21:24:39</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>01/14/2021 10:06:23</publishTime>
@@ -580,7 +580,7 @@
      <publishTime>01/14/2021 10:06:23</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig.js">
      <publishTime>01/14/2021 10:06:23</publishTime>
      <publishTime>01/17/2021 21:24:22</publishTime>
    </File>
    <File Include="layuiadmin/style/admin.css">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -1081,7 +1081,7 @@
      <publishTime>01/14/2021 15:07:03</publishTime>
    </File>
    <File Include="views/工序汇报/MES_StationInBill_PDA.html">
      <publishTime>01/15/2021 14:22:58</publishTime>
      <publishTime>01/17/2021 23:20:25</publishTime>
    </File>
    <File Include="views/工序汇报/MES_StationOutBill.html">
      <publishTime>01/14/2021 15:28:59</publishTime>
WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,7 +1,7 @@
function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    var WEBURL = "http://124.70.129.242/WebAPI/";          //雅琪诺
    //var WEBURL = "http://localhost:8084/WebAPI/";
    //var WEBURL = "http://124.70.129.242/WebAPI/";          //雅琪诺
    var WEBURL = "http://localhost:8084/WebAPI/";
    //61.130.49.162:9090
    //WEBURL = "";
    return WEBURL
@@ -9,8 +9,8 @@
function GetWEBURL1() {
    //var WEBURL = 'http://192.168.16.80:8011/';           //办公室服务器
    var WEBURL = 'http://124.70.129.242/WebAPI/';          //雅琪诺
    //var WEBURL = 'http://localhost:8084/WebAPI/';
    //var WEBURL = 'http://124.70.129.242/WebAPI/';          //雅琪诺
    var WEBURL = 'http://localhost:8084/WebAPI/';
    //61.130.49.162:9090
    //WEBURL = "";
    return WEBURL
WebTM/views/¹¤Ðò»ã±¨/MES_StationInBill_PDA.html
@@ -57,19 +57,19 @@
                                <tr>
                                    <th>条形码</th>
                                    <td class="t1_input">
                                        <input type="text" name="条形码" class="layui-input" id="HFbarcode" placeholder="请输入条形码" style="background-color:#efefef4d;border-radius: 50px;" readonly>
                                        <input type="text" name="sBillBarCode" class="layui-input" id="sBillBarCode" placeholder="请输入条形码" style="border-radius: 50px;">
                                    </td>
                                </tr>
                                <tr>
                                    <th>流转卡号</th>
                                    <td class="t1_input">
                                        <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="流转卡号" style="background-color:#efefef4d;" readonly>
                                        <input type="text" name="流转卡号" class="layui-input" id="流转卡号" placeholder="流转卡号" style="background-color:#efefef4d;" readonly>
                                    </td>
                                </tr>
                                <tr>
                                    <th>流水号</th>
                                    <td class="t1_input">
                                        <input type="text" name="流水号" class="layui-input" id="Serial_number" placeholder="请输入流水号" style="background-color:#efefef4d;" readonly>
                                        <input type="text" name="sProcNo" class="layui-input" id="sProcNo" placeholder="请输入流水号" style="background-color:#efefef4d;" readonly>
                                    </td>
                                </tr>
                                <tr>
@@ -123,7 +123,8 @@
                                <tr>
                                    <th>进站单号</th>
                                    <td class="t1_input">
                                        <input type="text" name="进站单号" class="layui-input" id="进站单号" placeholder="请输入进站单号" style="background-color:#efefef4d;" readonly>
                                        <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="请输入进站单号" style="background-color:#efefef4d;" readonly>
                                        <input type="hidden" name="HInterID" class="layui-input" id="HInterID">
                                    </td>
                                </tr>
                                <tr>
@@ -208,37 +209,25 @@
                , form = layui.form;
            //获取当前时间处理
            var data = new Date();
            var year = data.getFullYear();  //获取年
            var month = data.getMonth() + 1;    //获取月
            var day = data.getDate(); //获取日
            var time = year + "/" + month + "/" + day;
            var date = new Date();
            //$("#HDateNow").val(time);//加载当前时间
            //alert($("#HDateNow").val());
            $("#HDateNow").val(Format(new Date(), "yyyy-MM-dd"));
            $("#创建人").val(sessionStorage["HUserName"]);
            //laydate.render({
            //    elem: '#HDateNow' //指定元素
            //    , value: new Date()
            //    ,trigger: 'click',
            //});
            //页面初始化赋值
            //获取单据号
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
                type: "GET",
                data: { "HBillType": '3790' },
                //data: { "HBillType": '3790' },
                success: function (d) {
                    $("#HInterID").val(d.data[0].HInterID);
                    $("#HBillNo2").val(d.data[0].HBillNo);
                    $("#HBillNo").val(d.data.HBillNo);//进站单号
                    $("#HInterID").val(d.data.HInterID);//进站单号ID
                }, error: function () {
                    layer.alert("获取单据号失败!", { icon: 5 });
                }
            });
            $("#HFbarcode").focus();
            $("#HFbarcode").css("box-shadow", "0 0 0 1px #00ff00");
            $("#sBillBarCode").focus();
            $("#sBillBarCode").css("box-shadow", "0 0 0 1px #00ff00");
            $("#Serial_number").attr("readonly", "readonly");//流水号只读
            $("#Serial_number").css("background-color", "#efefef4d");
            $("#Entrants_number").attr("readonly", "readonly");//进站数量只读
@@ -246,109 +235,80 @@
            //扫条形码方法
            $('#HFbarcode').on('keydown', function (event) {   //扫条形码
                var HFbarcode = $('#HFbarcode').val();
            $('#sBillBarCode').on('keydown', function (event) {   //扫条形码
                var sBillBarCode = $('#sBillBarCode').val();//条形码(流转卡号)(数据库中为单据号)
                if (event.keyCode == 13) {
                    //判断文本框是否有数据    new
                    if (HFbarcode == "") {
                    if (sBillBarCode == "") {
                        layer.alert("条形码为空!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        return;
                    }
                    //
                    $.ajax({
                        url: GetWEBURL() + "TEST",
                        url: GetWEBURL() + "api/newBill/getHbarCodeDetail",
                        type: "GET",
                        data: {
                            "sBillBarCode": HFbarcode
                            "sBillBarCode": sBillBarCode
                        },
                        success: function (result) {
                            //var data = result.data;
                            //if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            //    form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                            //        "订单跟踪号": data[0].订单跟踪号
                            //        , "产品代码": data[0].产品代码
                            //        , "产品名称": data[0].产品
                            //        , "规格型号": data[0].规格型号
                            //        , "流转卡数量": data[0].流转卡数量
                            //        , "制单人": data[0].制单人
                            //        , "制单日期": data[0].制单日期
                            //        , "修改人": data[0].修改人
                            //        , "修改日期": data[0].修改日期
                            //        , "审核人": data[0].审核人
                            //        , "审核日期": data[0].审核日期
                            //        , "生产订单号": data[0].源单单号
                            //        , "生产订单数量": data[0].生产数量
                            //        , "HBillNo": $("#HFbarcode").val()
                            //    });
                            //    $("#HFbarcode").attr("readonly", "readonly");//条形码只读
                            //    $("#HFbarcode").css("background-color", "#efefef4d");
                            //    $("#HFbarcode").css("box-shadow", "none");
                            //    $("#Serial_number").removeAttr("readonly");//移除流水号只读
                            //    $("#Serial_number").css("background-color", "white");
                            //    $("#Serial_number").focus();
                            //    $("#Serial_number").css("box-shadow", "0 0 0 1px #00ff00");
                            //} else {
                            //    layer.alert(result.Message, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                            //}
                            var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
                            if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                    "流转卡号": $("#sBillBarCode").val()
                                    , "工序代码": data.工序代码
                                    , "工序名称": data.工序
                                    , "产品代码": data.产品代码
                                    , "产品名称": data.产品
                                    , "规格型号": data.规格型号
                                    , "生产订单数量": data.生产数量
                                });
                                //$("#sBillBarCode").attr("readonly", "readonly");//条形码只读
                                //$("#sBillBarCode").css("background-color", "#efefef4d");
                                $("#sBillBarCode").css("box-shadow", "none");
                                $("#sProcNo").removeAttr("readonly");//移除流水号只读
                                $("#sProcNo").css("background-color", "white");
                                $("#sProcNo").focus();
                                $("#sProcNo").css("box-shadow", "0 0 0 1px #00ff00");
                            } else {
                                layer.alert(result.Message, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                            }
                        }, error: function () {
                            layer.alert("扫条形码方法发生错误!", { icon: 5 });
                        }
                    });
                    // layer.msg($('#HFbarcode').val(), { icon: 1 });
                }
            });
            //流水号回车方法
            $('#Serial_number').on('keydown', function (event) {   //扫条形码
                var sProcNo = $('#Serial_number').val();
                var sBillNo = $('#HBillNo').val();
            $('#sProcNo').on('keydown', function (event) {   //扫条形码
                var sProcNo = $('#sProcNo').val();
                var sBillNo = $('#sBillBarCode').val();
                if (event.keyCode == 13) {
                    if (sProcNo == "" || sBillNo == "") {
                        layer.alert("流水号或流转卡号为空!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        return;
                    }
                    $.ajax({
                        url: GetWEBURL() + "/LEMS/TxtHProcNo_KeyDown",
                        url: GetWEBURL() + "/api/newBill/getProcDetail",
                        type: "GET",
                        data: {
                            "sProcNo": sProcNo
                            , "sBillNo": sBillNo
                            "sBillNo": sBillNo
                            , "sProcNo": sProcNo
                        },
                        success: function (result) {
                            var data = result.data;
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
                            if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                    "订单跟踪号": data[0].订单跟踪号
                                    , "产品代码": data[0].产品代码
                                    , "产品名称": data[0].产品
                                    , "规格型号": data[0].规格型号
                                    , "流转卡数量": data[0].流转卡数量
                                    , "工作中心": data[0].工作中心
                                    , "工作中心代码": data[0].工作中心代码
                                    , "生产班组": data[0].班组
                                    , "生产班组代码": data[0].班组代码
                                    , "生产资源": data[0].生产资源
                                    , "生产资源代码": data[0].生产资源代码
                                    , "制单人": data[0].制单人
                                    , "制单日期": data[0].制单日期
                                    , "修改人": data[0].修改人
                                    , "修改日期": data[0].修改日期
                                    , "审核人": data[0].审核人
                                    , "审核日期": data[0].审核日期
                                    , "生产订单号": data[0].源单单号
                                    , "生产订单数量": data[0].生产数量
                                    , "HBillNo": $("#HFbarcode").val()
                                    "工序代码": data.工序代码
                                    , "工序名称": data.工序
                                    , "产品代码": data.产品代码
                                    , "产品名称": data.产品
                                    , "规格型号": data.规格型号
                                    , "生产订单数量": data.生产数量
                                });
                                $("#Serial_number").attr("readonly", "readonly");//条形码只读
                                $("#Serial_number").css("background-color", "#efefef4d");
                                $("#Serial_number").css("box-shadow", "none");
                                $("#Entrants_number").removeAttr("readonly");//移除进站数量只读
                                $("#Entrants_number").css("background-color", "white");
                                $("#Entrants_number").focus();
                                $("#Entrants_number").css("box-shadow", "0 0 0 1px #00ff00");
                                $("#sProcNo").css("box-shadow", "none");
                                $("#ProductionResources").css("box-shadow", "0 0 1px 2px #00ff00");
                            } else {
                                // $("#verifycode").click();
                                //layer.msg(result.Message, { icon: 5 });
                                layer.alert(result.Message, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                            }
                        }, error: function () {
@@ -443,11 +403,11 @@
            });
            //新增按钮
            form.on('submit(HAddBT)', function (data) {//退出
                layer.confirm('您确定要新增吗?', { icon: 3, title: '提示' }, function (index) {
                    window.location.reload();
                });
            });
            //form.on('submit(HAddBT)', function (data) {//退出
            //    layer.confirm('您确定要新增吗?', { icon: 3, title: '提示' }, function (index) {
            //        window.location.reload();
            //    });
            //});