提料计划报表 动态显示日期 生产计划平台 提料运算(缺料) 齐套分析列表优化

yangle

2023-06-29 2f14b82be33feef39fb04d6afe31be915375da5c

提料计划报表 动态显示日期
生产计划平台 提料运算(缺料)
齐套分析列表优化

 WebTM/views/Éú²ú¹ÜÀí/¼´Ê±¿â´æ/JIT_InventoryList.html

@@ -151,6 +151,8 @@
                    , { field: '仓库ID', title: '仓库ID', hide: true }
                    , { field: '仓库编码', title: '仓库编码' }
                    , { field: '仓库名称', title: '仓库名称' }
                    , { field: '仓位ID', title: '仓位ID', hide: true }
                    , { field: '仓位名称', title: '仓位名称' }
                    , { field: '库存主单位ID', title: '库存主单位ID', hide: true }
                    , { field: '单位编码', title: '单位编码' }
                    , { field: '单位名称', title: '单位名称' }

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Cg_PODemandPlanConfigBillList.html

@@ -48,7 +48,7 @@
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料名称</label>
                                        <div class="layui-input-block" style="margin-left: 77px;">
                                            <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" value="" style="width: 60%; display: inline-block;">
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/ReportPODemandPlanBillList.html

@@ -165,8 +165,8 @@
            $("#HENDDATE").val(Format(new Date(), "yyyy-MM-dd"));
            //生产组织加载
            Organ();
            //初始化表格
            set_InitGrid();
            ////初始化表格
            //set_InitGrid();
            //快速过滤
            get_FastQuery(1);
        }
@@ -175,12 +175,6 @@
        //#region åˆå§‹åŒ–表格方法
        function set_InitGrid() {
            var columns = [];
            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 MonthCount = new Date(yyyy, MM-1, 0).getDate();
        
            columns.push({ type: 'checkbox', fixed: 'left' });
            columns.push({ field: '组织', title: '采购组织' });
@@ -196,12 +190,40 @@
            columns.push({ field: '物料代码', title: '物料编码' });
            columns.push({ field: '计量单位名称', title: '计量单位' });
            columns.push({ field: 'TQSUM', title: '提料拖期数量' });
            for (var i = 1; i <= (MonthCount - dd + (SumMonth - MonthCount)); i++) {
                columns.push({ field: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'MM.dd'), width: 70 })//0
         
            //获取两个月期之间的相差
            var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//开始时间
            var time2 = Date.parse(new Date($("#HENDDATE").val()));//结束时间
            var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
            //获取年
            var yyyy = new Date($("#HBEGINDATE").val()).getFullYear();
            //获取月份
            var MM = new Date($("#HBEGINDATE").val()).getMonth() + 1;
            //获取开始月份的最大天数
            var SumMonth = new Date(yyyy, MM, 0).getDate(); //动态两月之差
            //获取开始日期的天数
            var HBEGINDATE = new Date(new Date($("#HBEGINDATE").val())).getDate(); //获取开始日期天数

            var k = 0;//收集循环次数
            for (var j = 0; j <= (Days - k); j++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70 })
                //跨年的话 ä¼šä»Žä¸€æœˆä¸€å·å¼€å§‹
                if (MM == 12 && (HBEGINDATE + j) == 31) {
                    yyyy += 1;
                    MM = 1;
                    SumMonth = new Date(yyyy, MM, 0).getDate();
                    HBEGINDATE = 0;
                    k += j;
                    j = 0;
                } else if ((HBEGINDATE + j) == SumMonth) { //跨月 æœˆæ•°åŠ ä¸€  å¤©æ•°ä»Žä¸€å¼€å§‹
                    HBEGINDATE = 0;
                    MM += 1;
                    SumMonth = new Date(yyyy, MM, 0).getDate();
                    k += j;
                    j = 0;
                }
            }
            for (var i = 1; i <= dd; i++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + i, 'MM.dd'), width: 70 })//0
            }
          
            columns.push({ field: '', title: '提料计划合计' });

            option = {
@@ -217,6 +239,7 @@
            };
        }
        //#endregion


        //获取组织
        function Organ() {
@@ -282,6 +305,10 @@
            var HXQD = $("#HXQD").val();//需求单号
            var HPURORDERNO = $("#HPURORDERNO").val();//采购订单号

            if (HBEGINDATE > HENDDATE) {
                return layer.msg("开始日期不能小于结束日期!");
            }

            sWhere = {
                HORGID: HORGID
                , HBEGINDATE: HBEGINDATE
@@ -291,6 +318,8 @@
                , HXQD: HXQD
                , HPURORDERNO: HPURORDERNO
            }
            //初始化表格
            set_InitGrid();
            get_Display(JSON.stringify(sWhere));
            sWhere = "";//调用接口后清空sWhere缓存
        }

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

@@ -41,13 +41,16 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">生产订单组织</label>
                                    <label class="layui-form-label" style="width: 85px;">提料类型</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
                                            <!--动态渲染组织-->
                                        <select name="HTLType" id="HTLType" lay-verify="HTLType">
                                            <option value="缺料" selected="selected">缺料</option>
                                            <option value="生产用料清单">生产用料清单</option>
                                            <!--<option value="采购订单">采购订单</option> æš‚时没有-->
                                        </select>
                                    </div>
                                </div>
                               
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产车间</label>
                                    <div class="layui-input-block" style="margin-left: 77px;">
@@ -72,7 +75,7 @@
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料编码</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="width: 60%;display: inline-block;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
@@ -95,15 +98,14 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">物料名称</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d" readonly>
                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">齐套类型</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                <select name="HOrderType" id="HOrderType" lay-verify="HOrderType">
                                                    <option value="全部">全部</option>
                                                    <option value="生产用料清单">生产用料清单</option>
                                                    <option value="生产用料清单" selected="selected">生产用料清单</option>
                                                    <option value="标准Bom">标准Bom</option>
                                                </select>
                                            </div>
@@ -119,7 +121,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">规格型号</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d" readonly>
                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -129,14 +131,24 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:10px;margin-bottom:10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">生产订单组织</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                <select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
                                                    <!--动态渲染组织-->
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <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_BatchFill"><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_BatchFill"><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="btn-CopyLine"><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_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
@@ -837,6 +849,7 @@
            layer.open({
                type: 2 //类型
                , skin: 'layui-layer-rim'//加上边框
                , maxmin: true //设置最大最小按钮是否显示
                , area: ['90%', '90%']//大小
                , title: '齐套分析明细表'//标题
                , shift: 2//弹出动画
@@ -901,12 +914,13 @@
                HProdORGID: $("#HProdORGID").val()
                , HWorkShopID: $("#HWorkShopID").val()
            }
            var HTLType = $("#HTLType").val();
            sWhere = JSON.stringify(sWhere);
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_TLYS',
                type: "GET",
                data: { "sWhere": sWhere, "user": sessionStorage["Czybm"] },
                data: { "sWhere": sWhere, "user": sessionStorage["Czybm"], "HTLType": HTLType },
                success: function (data1) {
                    if (data1.count == 1) {
                        get_FastQuery(2);

 WebTM/views/Éú²ú¹ÜÀí/ÆëÌ×·ÖÎö/JIT_CompleteDetailList.html

@@ -247,7 +247,9 @@
                    , { field: '生产车间名称', title: '生产车间名称' }
                    , { field: '仓库ID', title: '仓库ID', hide: true }
                    , { field: '仓库编码', title: '仓库编码' }
                    , { field: '仓库名称', title: '仓库名称', width: 120}
                    , { field: '仓库名称', title: '仓库名称', width: 120 }
                    , { field: '仓位ID', title: '仓位ID', hide: true }
                    , { field: '仓位名称', title: '仓位名称' }
                    , { field: '批号', title: '批号' ,width:120}
                ]]
                , done: function (res, curr, count) {

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -1781,7 +1781,7 @@
                    layer.confirm("确认要批量打印吗?", { title: "确认" }, function (index) {
                        time = setInterval(function () {
                            dy(data);
                        }, 1000);
                        }, 2000);
                        //关闭当前frame
                        layer.close(index);
                    })
@@ -1797,7 +1797,7 @@
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //方法所在页面和方法名
                    async: true,
                    async: false,
                    data: { "sWhere": sWhere },
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
@@ -1816,7 +1816,7 @@
                                var args = {
                                    type: "print",
                                    showOptionDlg: false, //如果不显示打印对话框而直接打印，将此行注释去掉即可
                                    report: urlAddRandomNo("../../grf/涤纶.grf"),
                                    report: urlAddRandomNo("../../grf/cs10.grf"),
                                    data: Customer
                                };
                                //var args = {