Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

仲国强

2021-09-09 048ab324c11eed0f8be15978d6d1ff2dcc36603a

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -6,7 +6,7 @@
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //章紫柔本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //章紫柔本地配置
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器
    //var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html

@@ -128,6 +128,7 @@
                                            <label class="layui-form-label"><span style="color:red;">*</span>流转卡号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" class="layui-input" name="HProcExchHinteID" id="HProcExchHinteID" >
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -666,6 +667,7 @@
                                "HPlanQty": data.流转卡数量,
                                "lngBillKey": data.hmainid,
                                "HProcExchBillNo": data.单据号,
                                "HProcExchHinteID":data.hmainid,
                                "HICMOQty": data.任务单数量,
                                "HOrderProcNO": data.订单跟踪号
                            });
@@ -731,6 +733,31 @@
                });
            }

            //#region é¡µé¢å¿«æ·é”®å¼¹çª——工序流转卡关联数量
            $('body').on('keydown', function (e) {
                var HinteID = $("#HProcExchHinteID").val();
                if (e.key == "F7") {
                    if (HinteID == "" || HinteID == null || HinteID == undefined) {
                        layer.alert("请先输入条形码或扫描条形码", { icon: 5 });
                    }
                    else {
                        layer.open({
                            type: 2,
                            skin: 'layui-layer-rim', //加上边框
                            title: '工序流转卡关联数量',
                            closeBtn: 1,
                            shift: 2,
                            area: ['90%', '90%'],
                            maxmin: true,
                            content: ['../工序进站接收单/Cj_StationQty.html?HInterID=' + HinteID, 'yes'],
                            end: function () {
                            }
                        });
                    }
                }
            })
            //#endregion

            //是否被转下工序
            form.on('checkbox(checkboxHLastSubProc)', function (data) {
                $("#HLastSubProc").val(data.elem.checked);

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBill.html

@@ -124,6 +124,7 @@
                                            <label class="layui-form-label"><span style="color:red;">*</span>流转卡号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" class="layui-input" name="HProcExchHinteID" id="HProcExchHinteID">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -806,6 +807,7 @@
                                "HPieceQty": data.流转卡数量,
                                "HPlanQty": data.流转卡数量,
                                "HProcExchBillNo": data.单据号,
                                "HProcExchHinteID": data.hmainid,
                                "HICMOQty": data.任务单数量,
                                "lngBillKey": data.hmainid,
                                "HOrderProcNO": data.订单跟踪号
@@ -872,6 +874,31 @@
                });
            }

            //#region é¡µé¢å¿«æ·é”®å¼¹çª——工序流转卡关联数量
            $('body').on('keydown', function (e) {
                var HinteID = $("#HProcExchHinteID").val();
                if (e.key == "F7") {
                    if (HinteID == "" || HinteID == null || HinteID == undefined) {
                        layer.alert("请先输入条形码或扫描条形码", { icon: 5 });
                    }
                    else {
                        layer.open({
                            type: 2,
                            skin: 'layui-layer-rim', //加上边框
                            title: '工序流转卡关联数量',
                            closeBtn: 1,
                            shift: 2,
                            area: ['90%', '90%'],
                            maxmin: true,
                            content: ['../工序进站接收单/Cj_StationQty.html?HInterID=' + HinteID, 'yes'],
                            end: function () {
                            }
                        });
                    }
                }
            })
            //#endregion

            //选择生产班组弹窗
            form.on('submit(ProductionTeam-BT)', function () {//选择生产班组
                layer.open({