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

zzr99

2022-08-30 910fa242df948a01c43923183e7a703442d192e1

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

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -4,10 +4,10 @@
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost:8085/API/";   //zgq本地
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    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://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器

 WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Gy_UserByOrg.html

@@ -204,8 +204,7 @@
            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                if (event.key == "F7") {
                    //组织
                    if (obj.event === 'HNumber')  
                    {
                    if (obj.event === 'HNumber') {
                        //页面层-自定义  
                        layer.open({
                            type: 2,

 WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Gy_UserByWorkStation.html

@@ -204,8 +204,7 @@
            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                if (event.key == "F7") {
                    //工位
                    if (obj.event === 'HNumber')
                    {
                    if (obj.event === 'HNumber') {
                        //页面层-自定义
                        layer.open({
                            type: 2,

 WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserSuplies.html

@@ -280,7 +280,7 @@
                }
                var list = [];
                for (var i = 0; i < JSON.parse(sSubStr).length; i++) {
                    list.push(JSON.parse(sSubStr)[i].供应商代码)
                    list.push(JSON.parse(sSubStr)[i].HSupperNumber)
                }
                if (isAllEqual(list)) {
                    layer.msg("有重复的供应商信息！");

 WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Kf_OtherOutBill_Fast.html

@@ -24,15 +24,38 @@
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div class="layui-form-item" style="padding:15px;margin:0px">
                        <div class="layui-row">
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:40px;padding-left:0px;">条码</label>
                            </div>
                            <div class="layui-col-xs8">
                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
                            </div>
                            <div class="layui-col-xs2">
                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">确定</button>
                            </div>
                        </div>
                        <div class="layui-form-item" style="padding:0px;margin:0px">
                            <div class="layui-row">
                                <div class="layui-col-xs3">
                                    <label class="layui-form-label" style="width:40px;padding-left:0px;">数量</label>
                                </div>
                                <div class="layui-col-xs8">
                                    <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
                                </div>
                            </div>
                        </div>
                    </div>
                    <div class="layui-tab" lay-filter="tab-Kf_OtherOutBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <!-- <li lay-id="1">源单信息</li>-->
                            <li lay-id="1">源单信息</li>
                            <li lay-id="2">单据信息</li>
                            <li lay-id="3">物料清单</li>
                            <li lay-id="4">日志</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--源单信息-->
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item">
                                    <div class="layui-row">
@@ -42,6 +65,21 @@
                                        <div class="layui-col-xs8">
                                            <select name=" HBillType" id="HBillType">
                                                <option value="-1">手工录入</option>
                                            </select>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item">
                                    <div class="layui-row">
                                        <div class="layui-col-xs4">
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">扫描类型</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <select name=" HScanStyle" id="HScanStyle" disabled:"disabled">
                                                <option value="整托扫码">整托扫码</option>
                                                <option value="单个拆码">单个拆码</option>
                                                <option value="反向拆码">反向拆码</option>
                                                <option value="整托删除">整托删除</option>
                                            </select>
                                        </div>
                                    </div>
@@ -60,6 +98,7 @@
                                    </div>
                                </div>
                            </div>
                            <!--单据信息-->
                            <div class="layui-tab-item">
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
@@ -157,34 +196,36 @@
                                    </div>
                                </div>
                            </div>
                            <!--物料清单-->
                            <div class="layui-tab-item">
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs4">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">条码</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding:0px;margin:0px">
                                    <div class="layui-row">
                                        <div class="layui-col-xs4">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">数量</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                            </div>
                            <!--日志-->
                            <div class="layui-tab-item">
                                <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
                                <div class="layui-row">
                                    <div class="layui-col-xs3">
                                        <label class="layui-form-label" style="width:60px;padding-left:0px;">条码数量</label>
                            </div>
                            <div class="layui-tab-item">
                                <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
                                    <div class="layui-col-xs8 layui-input-inline mobile">
                                        <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-col-xs3">
                                        <label class="layui-form-label" style="width:60px;padding-left:0px;">总数量</label>
                                    </div>
                                    <div class="layui-col-xs8 layui-input-inline mobile">
                                        <input type="text" name="HSumQtys" id="HSumQtys" lay-verify="HSumQtys" value="0" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-col-xs3">
                                        <label class="layui-form-label" style="width:60px;padding-left:0px;">日志</label>
                                    </div>
                                    <div class="layui-col-xs8 layui-input-inline mobile">
                                        <input type="text" name="HNote" id="HNote" lay-verify="HNote" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>
                        </div>
                        <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
@@ -677,26 +718,117 @@
     
            //扫条码
            function GetMeesageByBarCode(obj) {  //返回工作中心
                var sSubStr = table.cache['wl-table'];
                var sBarCode = $('#HBarCode').val()
                var sOldBarCode = $('#HBarCode').val()
                var HDeleteFlag = sOldBarCode.substring(0, 1);
                var sBarCode = sOldBarCode.slice(1);
                var sInterID = $("#HInterID").val()
                var sBillType = '1206'
                var sBillNo = $("#HBillNo").val()
                var sMaker = sessionStorage["HUserName"];
                var sHWHID = $("#HWHID").val();//仓库ID
                var sHSPID = $("#HStockPlaceID").val();//仓位ID
                var sQty = $("#HQty").val()
                var sHBillType = $("#HBillType").val()
                var sHWHID = $("#HWHID").val()
                var sHSPID = $("#HStockPlaceID").val()
                var sSourceBillNo = $("#HSourceBillNo").val()
                var sMouldManagerCtl = "N";  //是否启用器具管理
                var sFIFOCtl = "N";          //是否启用先进先出管理
                var HScanStyle = $("#HScanStyle").val();
                if (sQty == "") {
                    sQty = 0;
                }

                if (HDeleteFlag == "*") {
                    if (sBarCode != "") {
                        $('#HBarCode').val("");
                    }
                    $.ajax(
                        {
                            type: "Get",
                            url: GetWEBURL() + "/ProductIn/Delete_Json",
                            async: true,
                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HBarCode": sBarCode },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                                    playSound1();
                                    table.reload('wl-table', {
                                        where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
                                    });
                                }
                                else {
                                    playSound();
                                    layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });

                                }
                            },
                            error: function (err) {
                                playSound();
                                layer.msg('错误' + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });

                            }
                        });
                }
                else if (HScanStyle == "整托删除") {
                    var HBarCode = $('#HBarCode').val();
                    var HInterID = $('#HInterID').val();
                    if (HBarCode == "") {
                        layer.msg("整托删除条码不能为空", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                    $.ajax(
                        {
                            type: "Get",
                            url: GetWEBURL() + "/OtherOutBillList/OtherOutBillSDeleCode",
                            async: true,
                            data: { "HBarCode": HBarCode, "HInterID": HInterID },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                                    layer.msg(data.Message, { icon: 1, btn: ['确认'], time: 100000, title: "温馨提示" });
                                    table.render({
                                        elem: '#wl-table'
                                        , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
                                        , cellMinWidth: 80
                                        , toolbar: '#toolbarDemo'
                                        , defaultToolbar: []
                                        , where: { HBillID: sInterID, HBillType: '1206', sWhere: '' }
                                        , cols: [[
                                            { type: 'radio' }
                                            , { field: 'HQty', title: '数量', width: 80 }
                                            , { field: 'HAuxQty', title: '辅助数量', width: 80 }
                                            , { field: 'HQtyMust', title: '应收数量', width: 80 }
                                            , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                                            , { field: 'HMaterName', title: '物料名称', width: 150 }
                                            , { field: 'HMaterModel', title: '规格型号', width: 100 }
                                            , { field: 'HSourceInterID', title: '源单主内码', width: 100 }
                                            , { field: 'HSourceEntryID', title: '源单子内码', width: 100 }
                                            , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                                            , { field: 'HBatchNo', title: '批次', width: 100 }
                                            , { field: 'HAuxPropID', title: '辅助属性', width: 100 }
                                            , { field: 'HMTONo', title: '计划跟踪号', width: 100 }
                                            , { field: 'HWHID', title: 'ck', width: 100 }
                                        ]]
                                        //, height: 500
                                    })
                                }
                                else {
                                    layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                }
                            },
                            error: function (err) {
                                layer.msg("错误" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        });
                }
                else {

                    var sBarCode = $('#HBarCode').val()
                if (sBarCode == '') {
                    playSound();
                    layer.msg("条码为空，不能扫描！", { icon: 5, btn: ['确定'], time: 100000, offset: 't' });
                    return false;
                }
                if (sQty == "") {
                    sQty = 0;
                }
                var sBillType = '1206'

                if (sBarCode != "") {
                    $('#HBarCode').val("");
                }
@@ -707,7 +839,7 @@
                $.ajax({
                    url: GetWEBURL() + "/OtherOutBill/get_CheckTypeByBarCode_Out_Json",
                    type: "GET",
                    data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"]},
                        data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle },
                    success: function (result) {
                        if (result.count == 1) {
                            if (result.data.HBarType == '仓库条码') {
@@ -843,6 +975,7 @@
                    }
                });
            }
            }

            var listOption = {
                elem: '#wl-table'

 WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Kf_OtherOutBill_FastList.html

@@ -164,7 +164,7 @@
                elem: '#dj-table'
                , url: GetWEBURL() + '/Web/chanpinruk'
                    ,toolbar: '#toolbarDemo'
                    , where: { HBillType: sBillType,sWhere:''}
                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                    , cols: [[
                        { type: 'radio' }
                        , { field: 'HInterID', title: '单据内码', width: 120 }

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

@@ -166,6 +166,7 @@
                                            <input type="text" name="HBillerID" id="HBillerID" lay-verify="HBillerID" autocomplete="off" class="layui-input">
                                            <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HMakerID" id="HMakerID" lay-verify="HMakerID" value="0" autocomplete="off" class="layui-input" style="display : none">
                                            <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0" autocomplete="off" class="layui-input" style="display : none">
                                        </div>
                                    </div>
                                </div>
@@ -404,6 +405,8 @@
            $("#HMakerID").hide();
            $("#HBillerID").val(sessionStorage["HBillerID"]);
            $("#HBillerID").hide();
            $("#HSTOCKORGID").val(sessionStorage["OrganizationID"]);
            $("#HSTOCKORGID").hide();
            var HSourceFlag = sessionStorage["SourceFlag"];
            //默认带入的仓库，如果启用仓位则仓位有效，如果没有启用则仓位灰度 new