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

zzr99

2022-05-29 fc71ee8c3873c099ee9cce2b2db6ec97aa6e793e

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

 WebTM/views/index.html

@@ -363,43 +363,43 @@
                                        <dd>
                                            <a>生产计划平台</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/生产计划平台/JIT_DayPlanPlatForm.html">生产计划平台</a></dd>
                                                <dd><a lay-href="生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html">导入</a></dd>
                                                <dd><a lay-href="生产管理/生产计划平台/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">生产计划平台</a></dd>
                                                <dd><a lay-href="生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">导入</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>日计划工单</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/生产日计划工单/JIT_DayPlanBillList.html">日计划工单列表</a></dd>
                                                <dd><a lay-href="生产管理/生产日计划工单/JIT_DayPlanBillEdit.html">日计划工单</a></dd>
                                                <dd><a lay-href="生产管理/生产日计划工单/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">日计划工单列表</a></dd>
                                                <dd><a lay-href="生产管理/生产日计划工单/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">日计划工单</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>要料计划</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/要料计划/JIT_NeedMaterPlanBillList.html">要料计划单列表</a></dd>
                                                <dd><a lay-href="生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html">要料计划单</a></dd>
                                                <dd><a lay-href="生产管理/要料计划/JIT_NeedMaterPlanBillList.html" style="margin: 0 0 0 13px;">要料计划单列表</a></dd>
                                                <dd><a lay-href="生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">要料计划单</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>提料计划</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/提料计划/JIT_LiftMaterPlaBillnList.html">提料计划单列表</a></dd>
                                                <dd><a lay-href="生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html">提料计划单</a></dd>
                                                <dd><a lay-href="生产管理/提料计划/JIT_LiftMaterPlaBillnList.html" style="margin: 0 0 0 13px;">提料计划单列表</a></dd>
                                                <dd><a lay-href="生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">提料计划单</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>基础资料</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/日计划基础资料/Gy_WorkWarehouseBillList.html">车间仓库对照列表</a></dd>
                                                <dd><a lay-href="生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html">提料计划信息列表</a></dd>
                                                <dd><a lay-href="生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBillList.html">要料计划信息列表</a></dd>
                                                <dd><a lay-href="生产管理/日计划基础资料/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">车间仓库对照列表</a></dd>
                                                <dd><a lay-href="生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">提料计划信息列表</a></dd>
                                                <dd><a lay-href="生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">要料计划信息列表</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>即时库存</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/即时库存/JIT_InventoryList.html">即时库存列表</a></dd>
                                                <dd><a lay-href="生产管理/即时库存/JIT_InventoryList.html" style="margin: 0 0 0 13px;">即时库存列表</a></dd>
                                            </dl>
                                        </dd>
                                    </dl>

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈռƻ®¹¤µ¥/JIT_DayPlanBillEdit.html

@@ -272,6 +272,8 @@
                                            <label class="layui-form-label" style="width: 85px;">生产订单号</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo">
                                                <input type="text" class="layui-input" lay-verify="HMainSourceInterID" name="HMainSourceInterID" id="HMainSourceInterID" hidden>
                                                <input type="text" class="layui-input" lay-verify="HMainSourceEntryID" name="HMainSourceEntryID" id="HMainSourceEntryID" hidden>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -1271,6 +1273,8 @@
                            , "HPlanBeginDate": Format(new Date(d.data[0].计划开始日期), "yyyy-MM-dd")
                            , "HPlanEndDate":Format(new Date(d.data[0].计划结束日期), "yyyy-MM-dd")
                            , "HICMOBillNo": d.data[0].生产订单号
                            , "HMainSourceInterID": d.data[0].源单主内码
                            , "HMainSourceEntryID": d.data[0].源单子内码
                            , "HOwnerID": d.data[0].货主编码
                            , "HBatchNo": d.data[0].批次
                            , "HYX": d.data[0].优先级

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈռƻ®¹¤µ¥/JIT_DayPlanBillList.html

@@ -58,7 +58,7 @@
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>关闭</button>

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatForm.html

@@ -177,6 +177,35 @@

        //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

         //行内鼠标离开事件
        table.on('edit(mainTable)', function (obj) {
            var myDate = new Date();
            var yyyy = myDate.getFullYear();
            var MM = myDate.getMonth() + 1;
            var dd = myDate.getDate();
            var SumMonth = 31; //动态两月之差 new Date(yyyy, MM, 0).getDate()
            var dateHQty = 0;

            for (var i = 0; i <= (SumMonth - dd); i++) {
                if (obj.field == "生产资源") {
                    return;
                }
                if (obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')] != null) {
                    dateHQty += parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]);
                }
            }
            for (var i = 1; i < dd; i++) {
                if (obj.data[Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd')] != null) {
                    dateHQty += parseInt(obj.data[Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd')]);
                }
            }
            console.log(dateHQty)
            //修改数据
            obj.update({
                "日计划数量总量": dateHQty
            });
        })

        //头工具栏事件
        table.on('toolbar(mainTable)', function (obj) {
            var checkStatus = table.checkStatus('mainTable')
@@ -194,7 +223,7 @@
                    }
                    else {
                        data[0]["生产资源"] = "";
                        data[0]["HSourceID"] = 0;
                        data[0]["HSourceID"] = "";
                        data[0]["hmainid"] = "";
                        data[0]["单据号"] = "";
                        var copydata = JSON.stringify(data);
@@ -238,6 +267,10 @@
            set_ClearQuery();
        });

        //行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridCellCheck(obj); //行内快捷键筛选
        });
        //#endregion

        //#region æœ¬é¡µé¢è¢«è°ƒç”¨çš„所有方法
@@ -258,17 +291,18 @@
        //获取组织
        function Organ() {
            //获取登录页组织列
            var Organization = '<option  style="color:blue;" value="0">组织</option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Web/GetOrganizations",
                success: function (result) {
                    var Organization = "";
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                        }
                        $("#HProdORGID").append(Organization);
                        $("#HProdORGID").val(sessionStorage["OrganizationID"])
                        form.render('select');
                    }
                    layer.closeAll("loading");
@@ -286,7 +320,6 @@
            var SumMonth = 31; //动态两月之差 new Date(yyyy, MM, 0).getDate()

            columns.push({ type: 'checkbox', fixed: 'left' });
            columns.push({ field: 'hmainid', title: 'hmainid', hide: true });
            columns.push({ field: '单据号', title: '单据号', hide: true });
            columns.push({ field: '销售订单号', title: '销售订单号', width:150 });
            columns.push({ field: '生产订单号', title: '生产订单号', width:150 });
@@ -302,7 +335,7 @@
            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true});
            columns.push({ field: '计量单位', title: '计量单位', width:150 });
            columns.push({ field: '销售订单数量', title: '销售订单数量', width:150 });//0
            columns.push({ field: '订单需求数量', title: '生产订单数量', width: 150 });//0
            columns.push({ field: '计划数量', title: '生产订单数量', width: 150 });//0
            columns.push({ field: '订单可排数量', title: '订单可排数量', width:150 });
            columns.push({ field: '未入库数量', title: '未入库数量', width: 150 });//0
            columns.push({ field: '拆单数量', title: '拆单数量', width: 150 });//0
@@ -310,16 +343,16 @@
            columns.push({ field: '今日之前日计划数量', title: '今日之前日计划数量', width: 150 });//0
            columns.push({ field: '计划开始日期', title: '预计开工日期', width:150 });
            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
            columns.push({ field: '生产车间', title: '生产车间', width:150 });
            columns.push({ field: '生产车间', title: '生产车间', width: 150});
            columns.push({ field: 'HSourceID', title: 'HSourceID', hide:true });
            columns.push({ field: '生产资源', title: '生产资源', width:150 });
            columns.push({ field: '生产资源', title: '生产资源', width: 150, edit: 'text', event: "HSourceID"  });
            for (var i = 0; i <= (SumMonth - dd); i++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), edit: 'text',width:120 })//0
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'MM.dd'), edit: 'text', width: 70 })//0
            }
            for (var i = 1; i < dd; i++) {
                columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), edit: 'text',width: 120 })//0
                columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'MM.dd'), edit: 'text', width: 70 })//0
            }
            columns.push({ field: 'T31', title: 'T31', width: 150 });//0
            columns.push({ field: 'T31', title: 'T31', width: 70 });//0
            columns.push({ field: '订单类型', title: '订单类型', width: 150 });
            columns.push({ field: '生产订单单据类型', title: '源单订单单据类型', width: 150 });
            columns.push({ field: '业务状态', title: '业务状态', width: 150 });
@@ -329,7 +362,7 @@
            columns.push({ field: '交货日期', title: '交货日期', width: 150 });
            columns.push({ field: '源单主内码', title: '源单主内码', width: 150 });
            columns.push({ field: '源单子内码', title: '源单子内码', width: 150 });
            columns.push({ field: '日计划工单主码', title: '日计划工单主码', width: 150 });
            columns.push({ field: 'hmainid', title: '日计划工单主码', width: 150 });

            option = {
                elem: '#mainTable'
@@ -516,6 +549,47 @@
                }
            });
        }

        //行内快捷键
        function set_GridCellCheck(obj) {
            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                if (event.key == "F7") {
                    //生产资源
                    if (obj.event == "HSourceID") {
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "生产资源列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../基础资料/生产基础资料/Gy_Source.html", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "HSourceID": checkStatus.data[0].HItemID
                                    , "生产资源": checkStatus.data[0].生产资源名称
                                })
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                    obj.event = "";
                    return false;
                }

            })
        }

        //#endregion
        //以上是layui模块
    });

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatFormImport.html

@@ -142,6 +142,7 @@
        //行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridDelete(obj);   //行内删除
            set_GridCellCheck(obj);//行内快捷键筛选
        });

        //文件上传
@@ -222,7 +223,7 @@
            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
            columns.push({ field: '生产车间编码*', title: '生产车间' });
            columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
            columns.push({ field: '生产资源编码*', title: '生产资源' });
            columns.push({ field: '生产资源编码*', title: '生产资源', edit: 'text', event: "HSourceID"   });
            columns.push({ field: '优先级', title: '优先级' });
            columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
            columns.push({ field: '员工', title: '员工' });
@@ -237,11 +238,13 @@
            columns.push({ field: '销售订单数量', title: '销售订单数量', width: 200 });
            columns.push({ field: '生产订单数量', title: '生产订单数量', width: 200 });
            columns.push({ field: '总齐套数量', title: '总齐套数量', width: 200 });
            columns.push({ field: 'ICMOBillHInterID', title: 'ICMOBillHInterID', hide: true});
            columns.push({ field: 'ICMOBillHEntryID', title: 'ICMOBillHEntryID', hide: true });
            for (var i = 0; i <= (SumMonth - dd); i++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), edit: 'text' })
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'MM.dd'), edit: 'text', width:60 })
            }
            for (var i = 1; i < dd; i++) {
                columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), edit: 'text' })
                columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'MM.dd'), edit: 'text', width: 60 })
            }
            columns.push({ fixed: 'right', title: '操作', toolbar: '#barDemo' });

@@ -312,6 +315,46 @@
            }
        }

        //行内删除快捷键
        function set_GridCellCheck(obj) {
            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                if (event.key == "F7") {
                    //生产资源
                    if (obj.event == "HSourceID") {
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "生产资源列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../基础资料/生产基础资料/Gy_Source.html", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "HSourceID": checkStatus.data[0].HItemID
                                    , "生产资源编码*": checkStatus.data[0].生产资源代码
                                })
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                    obj.event = "";
                    return false;
                }

            })
        }

        //获取参数
        function getUrlVars() {
            var vars = [], hash;

 WebTM/views/³µ¼ä¹ÜÀí/½ÐÁϹÜÀí/Jl_CallGoodsBillMain.html

@@ -158,7 +158,7 @@
            //#endregion

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {//选择仓位
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });
            //#endregion