zzr99
2021-12-25 920dbd8e8b5b61ce1f8c586fd516be9a4d51f056
盘点分析报表
7个文件已修改
2 文件已重命名
2421 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 2044 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/grf/器具档案.grf 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/grf/设备档案.grf 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/基础资料/InventoryAnalysis.html 314 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
Diff too large
WebTM/WebTM.csproj
@@ -169,8 +169,8 @@
    <Content Include="views\基础资料\公用基础资料\grf\器具改制入库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具改制出库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具采购入库单.grf" />
    <Content Include="views\grf\cabinet-MZJ.grf" />
    <Content Include="views\grf\cabinet-SB.grf" />
    <Content Include="views\grf\设备档案.grf" />
    <Content Include="views\grf\器具档案.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云MES\Lay-Ui\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,9 +6,9 @@
    //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://47.96.97.237/API/";   //智云服务器
    //var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器外网
    //var WEBURL = "http://192.168.1.253:8080/API/";   //凯贝奈特客户服务器内网
    //var WEBURL = "http://220.189.218.154:8092/API/";   //丸井四维尔服务器
WebTM/views/grf/Æ÷¾ßµµ°¸.grf
File was renamed from WebTM/views/grf/cabinet-MZJ.grf
@@ -28,9 +28,11 @@
            Items Field
                Item
                    Name='模治具编号'
                    DBFieldName='模具编号'
                End
                Item
                    Name='模治具名称'
                    DBFieldName='模具名称'
                End
                Item
                    Name='条码编号'
WebTM/views/grf/É豸µµ°¸.grf
WebTM/views/index.html
@@ -793,6 +793,7 @@
                                        <dd><a lay-href="基础资料/生产基础资料/Gy_BadReason.html">不良原因列表</a></dd>
                                        <dd><a lay-href="基础资料/基础资料/Gy_ConkReasonList.html">故障原因列表</a></dd>
                                        <dd><a lay-href="基础资料/基础资料/Gy_StockCheckItemList.html">盘点方案列表</a></dd>
                                        <dd><a lay-href="基础资料/基础资料/InventoryAnalysis.html">盘点分析列表</a></dd>
                                    </dl>
                                </dd>
                                <dd>
WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/InventoryAnalysis.html
@@ -27,31 +27,37 @@
                                <div style="padding:20px;margin:0px 700px">
                                    <h1>盘点分析表</h1>
                                </div>
                            </div>
                            <div class="layui-form-item">
                                <div class="layui-inline">
                                    <label class="layui-form-label">盘点方案</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HSourceInterID" id="HSourceInterID">
                                        <input type="text" class="layui-input" id="HItemID">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceInterList" style="width:40px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                        </button>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="margin-left:10px">
                                    æŸ¥è¯¢
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">
                                    é‡ç½®
                                </button>
                                <div class="layui-inline">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch1" id="btnSearch1">
                                        æŸ¥è¯¢
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch1" id="btnReSearch1">
                                        é‡ç½®
                                    </button>
                                </div>
                            </div>
                        </div>
                        <div class="layui-tab layui-tab-card" style="margin-top:10px">
                            <ul class="layui-tab-title">
                                <li class="layui-this">正常</li>
                                <li>调拨</li>
                                <li>出库</li>
                                <li>入库</li>
                                <li>盘盈</li>
                                <li>盘亏</li>
                                <li>退库</li>
                                <li class="layui-this" id="zc">正常</li>
                                <li id="db">调拨</li>
                                <li id="ck">出库</li>
                                <li id="rk">入库</li>
                                <li id="py">盘盈</li>
                                <li id="pk">盘亏</li>
                                <li id="tk">退库</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
@@ -172,12 +178,13 @@
                , table6 = layui.table
                , table7 = layui.table
                , form = layui.form
                , ul = layui.ul
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
            //查询条件
            var sWhere = "";
            var sWhere = "k.HCorrespondentTypeID!=3  and m.HNowSupTypeID!=3 and k.HCorrespondentTypeID=m.HNowSupTypeID and k.HCorrespondentID=m.HNowSupID";
            var option1 = [];
            var option2 = [];
            var option3 = [];
@@ -186,7 +193,7 @@
            var option6 = [];
            var option7 = [];
            var col = [
                , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                { type: 'checkbox', fixed: 'left' }
                , { field: '条码', title: '器具条码', width: 200 }
                , { field: '器具编号', title: '器具编号', width: 200 }
                , { field: '盘点方案', title: '盘点方案', width: 200 }
@@ -309,20 +316,127 @@
            });
            //#endregion
            
            // æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            //查询按钮
            form.on('submit(btnSearch1)', function (data) {
                var HItemID = $("#HItemID").val();//盘点
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
                    type: "GET",
                    data: { "sWhere": sWhere, "sID": HItemID },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option1.data = data1.list[0];
                            table1.render(option1);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
            });
            // é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            form.on('submit(btnReSearch1)', function (data) {
                $("#HItemID").val("");
                var HItemID = $("#HItemID").val();//盘点
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
                    type: "GET",
                    data: { "sWhere": sWhere, "sID": HItemID },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option1.data = data1.list[0];
                            table1.render(option1);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
            });
            //盘点方案弹窗
            form.on('submit(HSourceInterList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim',
                    title: '盘点方案列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../基础资料/Gy_StockCheckItemList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HItemID").val(checkStatus.data[0].hitemid);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //#region é¡µç­¾åŠ è½½
            //正常页签
            $("#zc").click(function () {
                zc_Display();
            });
            //调拨页签
            $("#db").click(function () {
                db_Display();
            });
            //出库页签
            $("#ck").click(function () {
                ck_Display();
            });
            //入库页签
            $("#rk").click(function () {
                rk_Display();
            });
            //盘盈页签
            $("#py").click(function () {
                py_Display();
            });
            //盘亏页签
            $("#pk").click(function () {
                pk_Display();
            });
            //退库页签
            $("#tk").click(function () {
                tk_Display();
            });
            //#endregion
         //#endregion
           //#region å½“前页面加载所有方法
           // åˆå§‹åŒ–界面
           // #region åˆå§‹åŒ–界面
           function set_ClearBill() {
                //初始化表格(正常)
                set_InitGrid1();
@@ -339,7 +453,7 @@
               //初始化表格(退库)
               set_InitGrid7();
                //查询
                //get_Display(sWhere);
                zc_Display();
            }
@@ -455,29 +569,146 @@
                table7.render(option7);
                layer.close(ajaxLoad);
            }
            //#endregion
            //查询
            function get_Display(sWhere) {
            // #region æŸ¥è¯¢
            //初始查询 æ­£å¸¸
            function zc_Display() {
                var HItemID = $("#HItemID").val();//盘点
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "sID": HItemID },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option1.data = data1.list[0];
                            table1.render(option1);
                            option2.data = data1.list[1];
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
            }
            //调拨查询
            function db_Display() {
                sWhere = "k.HCorrespondentTypeID!=3  and m.HNowSupTypeID!=3 and k.HCorrespondentTypeID=m.HNowSupTypeID and k.HCorrespondentTypeID=4 and k.HCorrespondentID!=m.HNowSupID";
                var HItemID = $("#HItemID").val();//盘点
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
                    type: "GET",
                    data: { "sWhere": sWhere, "sID": HItemID },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option2.data = data1.list[0];
                            table2.render(option2);
                            option3.data = data1.list[2];
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
            }
             //出库查询
            function ck_Display() {
                sWhere = "k.HCorrespondentTypeID!=3  and m.HNowSupTypeID!=3 and m.HNowSupTypeID=4 and isnull(m.HNowSupID,'')!='' and (k.HCorrespondentTypeID=1 or k.HCorrespondentTypeID=2) and isnull(k.HCorrespondentID,'')!=''";
                var HItemID = $("#HItemID").val();//单据类型
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
                    type: "GET",
                    data: { "sWhere": sWhere, "sID": HItemID },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option3.data = data1.list[0];
                            table3.render(option3);
                            option4.data = data1.list[3];
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
            }
             //入库查询
            function rk_Display() {
                sWhere = "k.HCorrespondentTypeID!=3  and m.HNowSupTypeID!=3 and (k.HCorrespondentTypeID=1 or k.HCorrespondentTypeID=2) and (m.HNowSupTypeID=1 or m.HNowSupTypeID=2) and k.HCorrespondentID!=m.HNowSupID";
                var HItemID = $("#HItemID").val();//单据类型
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
                    type: "GET",
                    data: { "sWhere": sWhere, "sID": HItemID },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option4.data = data1.list[0];
                            table4.render(option4);
                            option5.data = data1.list[4];
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
            }
             //盘盈查询
            function py_Display() {
                sWhere = "isnull(m.HNowSupID,'')='' and isnull(k.HCorrespondentID,'')!='' and k.HCorrespondentTypeID!=3  and m.HNowSupTypeID!=3";
                var HItemID = $("#HItemID").val();//单据类型
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
                    type: "GET",
                    data: { "sWhere": sWhere, "sID": HItemID },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option5.data = data1.list[0];
                            table5.render(option5);
                            option6.data = data1.list[5];
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
            }
             //盘亏查询
            function pk_Display() {
                sWhere = "isnull(m.HNowSupID,'')!='' and isnull(k.HCorrespondentID,'')='' and k.HCorrespondentTypeID!=3  and m.HNowSupTypeID!=3";
                var HItemID = $("#HItemID").val();//单据类型
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
                    type: "GET",
                    data: { "sWhere": sWhere, "sID": HItemID },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option6.data = data1.list[0];
                            table6.render(option6);
                            option7.data = data1.list[6];
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
            }
             //退库查询
            function tk_Display() {
                sWhere = "k.HCorrespondentTypeID!=3  and m.HNowSupTypeID!=3 and k.HCorrespondentTypeID=4 and isnull(k.HCorrespondentID,'')!='' and  (m.HNowSupTypeID=1 or m.HNowSupTypeID=2)";
                var HItemID = $("#HItemID").val();//单据类型
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
                    type: "GET",
                    data: { "sWhere": sWhere, "sID": HItemID },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option7.data = data1.list[0];
                            table7.render(option7);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
@@ -487,23 +718,8 @@
                    }
                });
            }
            //#endregion
            //快速过滤
            function get_FastQuery() {
                var HSourceInterID = $("#HSourceInterID").val();//单据类型
                if (HSourceInterID) {
                    sWhere += " and HSourceInterID like '%" + HSourceInterID + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //重置过滤条件方法
            function set_ClearQuery() {
                $("#HSourceInterID").val("");//单据类型
                $("#btnSearch").click();
                sWhere = "";
            }
           //#region å®¡æ ¸
            //审核 è°ƒæ‹¨
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_MouldFileList.html
@@ -51,6 +51,8 @@
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-edit"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
@@ -98,6 +100,12 @@
                switch (obj.event) {
                    //新增按钮
                    case 'btnAdd': set_AddNew();
                        break;
                    //预览
                    case 'btn-view': get_ViewReport();
                        break;
                    //打印
                    case 'btn-print': get_PrintReport();
                        break;
                    //编辑按钮
                    case 'btnModify': set_ShowBill();
@@ -426,6 +434,48 @@
            }
            //预览
            function get_ViewReport() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HEquipFileMainBill', 'yes']
                        , resize: false
                    })
                }
                else {
                    layer.msg('请选择一行数据打印!');
                }
            }
            //打印
            function get_PrintReport() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HEquipFileMainBill', 'yes']
                        , resize: false
                    })
                }
                else {
                    layer.msg('请选择一行数据打印!');
                }
            }
            //刷新
            function get_Refresh() {
                $("#HNumber").val("");