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

zzr99

2022-03-09 645c71f32d93c1896cee32d4502780170b6d1472

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

 WebTM/WebTM.csproj

@@ -90,8 +90,10 @@
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjGroupEdit.html" />
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjList.html" />
    <Content Include="views\Baseset\基础资料\Gy_LineCenter.html" />
    <Content Include="views\Baseset\基础资料\Gy_OrganizationtList.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckProjectListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_RoutingGroup.html" />
    <Content Include="views\Baseset\基础资料\Gy_WarehouseListNew.html" />
    <Content Include="views\Baseset\基础资料\Sc_ICMOBillListView2.html" />
    <Content Include="views\Baseset\基础资料\Sc_ProcessExchangeBillListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckItemListView.html" />

 WebTM/views/index.html

@@ -702,18 +702,28 @@
                            </a>
                            <dl class="layui-nav-child" style="width:230px;">
                                <dd>
                                    <a href="" target="_blank">
                                    <a href="http://47.96.97.237/kanbanUi/KBNT/KBNT_CGSH.html" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>采购收料看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="http://47.96.97.237/kanbanUi/KBNT/KBNT_BLPS.html" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>备料配送
                                    </a>
                                </dd>
                                <dd>
                                    <a href="http://47.96.97.237/kanbanUi/KBNT/KBNT_SCZX.html" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>生产计划看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="http://47.96.97.237/kanbanUi/KBNT/KBNT_JYJD.html" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>检验进度看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>销售发货看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>生产计划看板
                                    </a>
                                </dd>
                                <dd>

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_Fast.html

@@ -406,11 +406,11 @@
            var HSourceFlag = sessionStorage["SourceFlag"];

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            if (sessionStorage.login != "login") {
                layer.confirm("登录失效，请重新登录！", {
                    icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
                }, function () { window.location.href = "../../user/login.html"; });
            }
            //if (sessionStorage.login != "login") {
            //    layer.confirm("登录失效，请重新登录！", {
            //        icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
            //    }, function () { window.location.href = "../../user/login.html"; });
            //}

            //获取参数
            function getUrlVars() {
@@ -865,7 +865,8 @@


            //扫条码
            $('#HBarCode').on('keydown', function (event) { 
            $('#HBarCode').on('keydown', function (event) {
                var sQty = $("#HQty").val();
                if (sSourceBillNo == null)
                {
                    sSourceBillNo = "";

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html

@@ -255,6 +255,60 @@
                set_GridDelete(obj);   //行内删除
                set_GridCellCheck(obj); //行内快捷键筛选
            });

            //监听单元格编辑  å•å…ƒæ ¼ç¼–辑后 å˜æ›´
            table.on('edit(mainTable)', function (obj) {
                // å•å…ƒæ ¼ç¼–辑之前的值
                var oldText = $(this).prev().text();
                var value = obj.value //得到修改后的值
                    , data = obj.data //得到所在行所有键值
                    , field = obj.field; //得到字段
                //layer.msg('[ID: ' + data.id + '] ' + field + ' å­—段更改为：' + value);

                switch (field) {
                    case "HQty":  //数量
                        value = isNaN(value) ? 0 : value;
                        var HMinQty = isNaN(data.HMinQty) ? 0 : data.HMinQty;
                        if (HMinQty == 0) {
                            //同步更新表格和缓存对应的值
                            obj.update({
                                HQty: value,                                   //数量
                                HBQty: 0,                                      //箱数=数量/最小包装数量
                            });
                        }
                        else
                        {
                            //同步更新表格和缓存对应的值
                            obj.update({
                                HQty: value,                                   //数量
                                HBQty: Math.ceil(value / HMinQty),             //箱数=数量/最小包装数量
                            });
                        }
                        break;
                    case "HMinQty":  //最小包装数量
                        value = isNaN(value) ? 0 : value;
                        var HQty = isNaN(data.HQty) ? 0 : data.HQty;
                        if (HQty == 0) //除数为0 
                        {
                            //同步更新表格和缓存对应的值
                            obj.update({
                                HMinQty: value,                                //最小包装数量
                                HBQty: 0,                                      //箱数=数量/最小包装数量
                            });
                        }
                        else {
                            //同步更新表格和缓存对应的值
                            obj.update({
                                HMinQty: value,                                //最小包装数量
                                HBQty: Math.ceil(HQty / value),                //箱数=数量/最小包装数量
                            });
                        }
                      
                        break;
                    default:
                }
            });

            //下拉框事件选择触发
            form.on('select(HSourceBillType)', function (data) {
                $("#HSourceBillNo").val("");

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

@@ -25,21 +25,26 @@
        .layui-card .layui-tab-brief .layui-tab-content {
            padding: 10px;
        }
        /*表单元素居下多少像素*/
        .layui-form-item {
            margin-bottom: 0px;
        }
        /* è¡¨å•æ¡†é«˜åº¦*/
        .layui-input, .layui-select, .layui-textarea {
            height: 32px;
        }
        /*表单按钮高度、行高*/
        .layui-btn {
            height: 31px;
            line-height: 31px;
        }
        /*表单标签名内间距(上下间距、左右间距)*/
        .layui-form-label {
            padding: 6px 15px; 
        }
        /*整个页面所有输入框、面板等边框颜色*/
        .layui-badge-rim, .layui-border, .layui-colla-content, .layui-colla-item, .layui-collapse, .layui-elem-field, .layui-form-pane .layui-form-item[pane], .layui-form-pane .layui-form-label, .layui-input, .layui-layedit, .layui-layedit-tool, .layui-panel, .layui-quote-nm, .layui-select, .layui-tab-bar, .layui-tab-card, .layui-tab-title, .layui-tab-title .layui-this:after, .layui-textarea {
            border-color: #c4c2c2;
            border-color: #dbd8d8;
        }
    </style>
</head>

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

@@ -46,7 +46,7 @@
                    </div>

                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <h1 style="text-align:center;"><b>器具改制入库单</b></h1>
                        <h1 style="text-align:center;"><b>器具改制出库单</b></h1>

                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">基本信息</li>

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html

@@ -832,9 +832,6 @@

            //扫条码-直接调webservice
            $('#HBarCode').on('keydown', function (event) {
                if (sQty == "") {
                    sQty = 0;
                }
                if (event.keyCode == 13) {
                    GetMeesageByBarCode();
                }
@@ -1011,7 +1008,6 @@
                        if (result.count == 1) {
                            ZHOption.data = result.data;
                            table.render(ZHOption);
                           // layer.close(index);
                            element.tabChange('tab-SellOutBill', '5');
                        }
                        else {
@@ -1035,6 +1031,9 @@
                var sHWHID = $("#HWHID").val();//仓库ID
                var sHSPID = $("#HStockPlaceID").val();//仓位ID
                var sQty = $("#HQty").val()//数量
                if (sQty == "") {
                    sQty = 0;
                }
                //var SourceFlag = sessionStorage["SourceFlag"];
                var sSourceBillNo = $("#HSourceBillNo").val();//源单号
                var sHBillType = $("#HBillType").val()  //源单类型-发货通知单：1402，销售订单1401
@@ -1054,40 +1053,9 @@
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                                    playSound1();
                                    table.render({
                                        elem: '#wl-table'
                                        // , url: 'http://61.130.49.162:9090/WMSAPI///OtherInStockBill/DisBillEntryList_Webs_Json'
                                        , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
                                        , toolbar: '#toolbarDemo'
                                        , defaultToolbar: []
                                        , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                                        , cols: [[
                                            { type: 'radio' }
                                            , { field: 'HQty', title: '数量', width: 150 }
                                            , { field: 'HQtyMust', title: '应收数量', width: 150 }
                                            , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                                            , { field: 'HMaterName', title: '物料名称', width: 150 }
                                            , { field: 'HMaterModel', title: '规格型号', width: 150 }
                                            , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                                            , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                                            , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                                            , { field: 'HBatchNo', title: '批次', width: 150 }
                                            , { field: 'HInterID', title: '单据ID', width: 150, hide: true }
                                            , { field: 'HBilltype', title: '单据类型', width: 150, hide: true }
                                            , { field: 'Hbarcode', title: '条码编号', width: 150, hide: true }
                                            , { field: 'HSCWHID', title: '调出仓库ID', width: 150, hide: true }
                                            , { field: 'HSCSPID', title: '调出仓位ID', width: 150, hide: true }
                                            , { field: 'HAuxPropID', title: '辅助属性ID', width: 150, hide: true }
                                            , { field: 'HMTONo', title: 'MTO号', width: 150, hide: true }
                                            , { field: 'HMaterID', title: '物料ID', width: 150, hide: true }
                                        ]]
                                        // , data: [linterid]
                                        // , page: true
                                        //, height: 500
                                        , done: function () {
                                            layer.closeAll("loading");
                                        }
                                    })
                                    table.reload('wl-table', {
                                        where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                                    });
                                }
                                else {
                                    playSound();
@@ -1193,40 +1161,8 @@
                                //$("#HSupName").val(result.data.HSupName);
                                //$("#HDeptID").val(result.data.HDeptID);
                                //$("#HDeptName").val(result.data.HDeptName);
                                layer.load(3)
                                table.render({
                                    elem: '#wl-table'
                                    // , url: 'http://61.130.49.162:9090/WMSAPI///OtherInStockBill/DisBillEntryList_Webs_Json'
                                    , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
                                    , toolbar: '#toolbarDemo'
                                    , defaultToolbar: []
                                    , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                                    , cols: [[
                                        { type: 'radio' }
                                        , { field: 'HQty', title: '数量', width: 150 }
                                        , { field: 'HQtyMust', title: '应收数量', width: 150 }
                                        , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                                        , { field: 'HMaterName', title: '物料名称', width: 150 }
                                        , { field: 'HMaterModel', title: '规格型号', width: 150 }
                                        , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                                        , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                                        , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                                        , { field: 'HBatchNo', title: '批次', width: 150 }
                                        , { field: 'HInterID', title: '单据ID', width: 150, hide: true }
                                        , { field: 'HBilltype', title: '单据类型', width: 150, hide: true }
                                        , { field: 'Hbarcode', title: '条码编号', width: 150, hide: true }
                                        , { field: 'HSCWHID', title: '调出仓库ID', width: 150, hide: true }
                                        , { field: 'HSCSPID', title: '调出仓位ID', width: 150, hide: true }
                                        , { field: 'HAuxPropID', title: '辅助属性ID', width: 150, hide: true }
                                        , { field: 'HMTONo', title: 'MTO号', width: 150, hide: true }
                                        , { field: 'HMaterID', title: '物料ID', width: 150, hide: true }
                                    ]]
                                    // , data: [linterid]
                                    // , page: true
                                    //, height: 500
                                    , done: function () {
                                        layer.closeAll("loading");
                                    }
                                table.reload('wl-table', {
                                    where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                                });
                            }
                            else {
@@ -1274,7 +1210,6 @@
                var sBillNo = $("#HBillNo").val()
                var HSourceBillType = $("#HBillType").val()
                if (HSourceBillNo == "" || sInterID <= 0) {
                    layer.close(index);
                    layer.msg("源单号为空，或者内码不存在！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
@@ -1291,39 +1226,14 @@
                            //$("#HDeptName").val(result.data[0].HDeptName);
                            HSourceFlag = true;
                            element.tabChange('tab-SellOutBill', '3');
                            table.render({
                                elem: '#wl-table'
                                , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
                                , toolbar: '#toolbarDemo'
                                , defaultToolbar: []
                                , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                                , cols: [[
                                    { type: 'radio' }
                                    , { field: 'HQty', title: '数量', width: 150 }
                                    , { field: 'HQtyMust', title: '应发数量', width: 150 }
                                    , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                                    , { field: 'HMaterName', title: '物料名称', width: 150 }
                                    , { field: 'HMaterModel', title: '规格型号', width: 150 }
                                    , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                                    , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                                    , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                                    , { field: 'HBatchNo', title: '批次', width: 150 }
                                ]]
                                // , data: [linterid]
                                // , page: true
                                //, height: 500
                                , done: function () {
                                    layer.close(index);
                                }
                            table.reload('wl-table', {
                                where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                            });
                            $("#HSourceBillNo").attr("disabled", "true");
                            layer.close(index);
                        }
                        else {
                            layer.close(index);
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                        layer.close(index);
                    }
                });
            }

 WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBill_Fast.html

@@ -743,10 +743,6 @@

            //条形码回车方法
            $('#HBarCode').on('keydown', function (event) {
                var sQty = $("#HQty").val();
                if (sQty == "") {
                    sQty = 0;
                }
                if (event.keyCode == 13) {
                    GetMeesageByBarCode();
                }
@@ -788,6 +784,9 @@
                var sInterID = $("#HInterID").val()
                var sBillNo = $("#HBillNo").val()
                var sQty = $("#HQty").val()
                if (sQty == "") {
                    sQty = 0;
                }
                var sHBillType = $("#HBillType").val()
                var sHWHID = $("#HWHID").val()
                var sHSPID = $("#HStockPlaceID").val()

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Add_Edit_Kf_POStockInBillList.html

@@ -488,7 +488,7 @@
                });
            }
            else {//如果修改则走下面 new
                RoadBillMain(hID);
                RoadBillMain(linterid);
                /* RoadBillSub(linterid);*/
            }
            //#region ä¿å­˜æ–¹æ³•