1
yangle
2023-06-16 158090774c97020f45f75c28d28e0d62bd44be2b
1
3个文件已修改
168 ■■■■■ 已修改文件
WebTM/views/index.html 124 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Excel.html 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html
@@ -303,8 +303,73 @@
                                        <dd><a lay-href="计划管理/工艺路线/Gy_RoutingBill.html">工艺路线</a></dd>
                                        <dd><a lay-href="计划管理/工艺路线/Gy_RoutingBillimport.html">工艺路线数据导入</a></dd>
                                    </dl>
                                </dd>
                                <dd>
                                    <a>工艺路线大类</a>
                                    <dl class="layui-nav-child">
                                <dd><a lay-href="计划管理/工艺路线大类/Gy_RoutingGroupList.html">工艺路线大类</a></dd>
                                    </dl>
                                </dd>
                                <dd>
                                    <a>日计划平台</a>
                                    <dl class="layui-nav-child">
                                        <dd>
                                            <a>生产计划平台</a>
                                            <dl class="layui-nav-child">
                                                <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>-->
                                                <dd><a lay-href="生产管理/齐套分析/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">齐套分析信息明细列表</a></dd>
                                                <dd><a lay-href="生产管理/生产计划平台/Sc_ICMOSortBillList.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" 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" 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" 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" 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" style="margin: 0 0 0 13px;">即时库存列表</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>报表</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/日计划报表/ReportPODemandPlanBillList.html" style="margin: 0 0 0 13px;">提料计划报表(采购订单维度)</a></dd>
                                                <dd><a lay-href="生产管理/日计划报表/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">提料计划报表</a></dd>
                                                <dd><a lay-href="生产管理/日计划报表/ReportWorkDemandPlanBillList.html" style="margin: 0 0 0 13px;">要料计划报表</a></dd>
                                                <dd><a lay-href="生产管理/日计划报表/ReportMOMaterReadysBillList.html" style="margin: 0 0 0 13px;">齐套报表</a></dd>
                                            </dl>
                                        </dd>
                                    </dl>
                                </dd>
                            </dl>
                        </li>
                        <!-- ç”Ÿäº§ç®¡ç† -->
@@ -378,64 +443,7 @@
                                        <dd><a lay-href="生产管理/生产包装单/Sc_PackUnionBill.html">组托单维护</a></dd>
                                    </dl>
                                </dd>
                                <dd>
                                    <a>日计划平台</a>
                                    <dl class="layui-nav-child">
                                        <dd>
                                            <a>生产计划平台</a>
                                            <dl class="layui-nav-child">
                                                <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>-->
                                                <dd><a lay-href="生产管理/齐套分析/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">齐套分析信息明细列表</a></dd>
                                                <dd><a lay-href="生产管理/生产计划平台/Sc_ICMOSortBillList.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" 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" 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" 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" 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" style="margin: 0 0 0 13px;">即时库存列表</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>报表</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/日计划报表/ReportPODemandPlanBillList.html" style="margin: 0 0 0 13px;">提料计划报表(采购订单维度)</a></dd>
                                                <dd><a lay-href="生产管理/日计划报表/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">提料计划报表</a></dd>
                                                <dd><a lay-href="生产管理/日计划报表/ReportWorkDemandPlanBillList.html" style="margin: 0 0 0 13px;">要料计划报表</a></dd>
                                                <dd><a lay-href="生产管理/日计划报表/ReportMOMaterReadysBillList.html" style="margin: 0 0 0 13px;">齐套报表</a></dd>
                                            </dl>
                                        </dd>
                                    </dl>
                                </dd>
                            </dl>
                        </li>-->
                        <!-- è½¦é—´ç®¡ç† -->
WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Cg_PODemandPlanConfigBill_Excel.html
@@ -149,6 +149,10 @@
            }
        });
        //行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridDelete(obj);   //行内删除
        });
        //导入  ä¿å­˜æ•°æ®
        form.on('submit(btnSave)', function (data) {
@@ -218,19 +222,39 @@
            //DisPlay_HideColumn();
        }
        //行内删除
        function set_GridDelete(obj) {
            var data = obj.data;
            var rowIndex = $(obj.tr).attr("data-index");
            if (obj.event === 'del') {
                layer.confirm('真的删除行吗?', function (index) {
                    console.log("索引为:" + rowIndex);
                    if (rowIndex === '0') {
                        layer.msg('首行无法删除!!!');
                    } else {
                        var oldData = option.data;
                        oldData.splice(obj.tr.data('index'), 1)
                        option.data = oldData;//将数据绑定到data上
                        table.render(option);
                        layer.close(index);
                    }
                });
            }
        }
        //导入(保存)
        function set_AddNew(data) {
            var num = [];
            for (var i = 0; i < table.cache["mainTable"].length; i++) {
                if (table.cache["mainTable"][i] != "") {
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                    num.push(table.cache["mainTable"][i])
            for (var i = 0; i < option.data.length; i++) {
                if (option.data[i] != "") {
                    num.push(option.data[i])
                }
            }
            //data.field.HOrgID = sessionStorage["OrganizationID"];//组织
            //var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(num);
            var sMainSub = sSubStr + ';' + sessionStorage["HUserName"];
            var sMainSub = sSubStr + '&和' + sessionStorage["HUserName"];
            var index = layer.load();
            $.ajax({
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html
@@ -1777,17 +1777,23 @@
                    , data = checkStatus.data;
              
                if (checkStatus.data.length > 0) {
                    //逻辑删除方法
                    layer.confirm("确认要批量打印吗?", { title: "确认" }, function (index) {
                    time = setInterval(function () {
                        dy(data);
                    }, 1000);
                        //关闭当前frame
                        layer.close(index);
                    })
                }
                else {
                    layer.msg('请选择一行数据打印!');
                }
            }
            function dy(rest) {
                var HInterID = rest[num].hmainid.toString();
                var sWhere = "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,a.产品规格,a.产品名称,a.日期,a.计划完工日期,a.单据号,b.工序名称,b.模具编号,b.工艺参数,b.加工说明,a.幅宽,a.克重,a.白坯要求,a.底部备注,a.客户,a.业务员,a.毛高,a.寸数组织,a.全毛长,a.坯布密度,a.毛纱名称及规格,a.底丝,a.辅数量,a.辅助单位,a.定型浆料,a.交货日期,a.染色要求 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in(" + HInterID + ")    order by cast(b.流水号 as int)";
                var sWhere = "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,a.产品规格,a.产品名称,a.日期,a.计划完工日期,a.单据号,b.工序名称,b.模具编号,b.工艺参数,b.加工说明,a.幅宽,a.克重,a.白坯要求,a.底部备注,a.客户,a.业务员,a.毛高,a.寸数组织,a.全毛长,a.坯布密度,a.毛纱名称及规格,a.底丝,a.辅数量,a.辅助单位,a.定型浆料,a.交货日期,a.染色要求 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where a.hmainid in(" + HInterID + ")    order by cast(b.流水号 as int)";
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //方法所在页面和方法名
@@ -1819,7 +1825,7 @@
                                //};
                                webapp_ws_ajax_run(args);
                                if (rest.length == num + 1) {
                                if (rest.length <= num + 1) {
                                    num = 0;
                                    clearInterval(time);
                                } else {