材料规格自动带出 可以输入,材料规格放在第一个页签 生产订单编辑 加 客户规格型号 客户物料名称 客户订单报表增加两字段（业务状态、备注取生产订单...

yangle

2023-07-24 277a5967109b03fe9aaf7b7130492716c44e9a2f

材料规格自动带出 可以输入,材料规格放在第一个页签
生产订单编辑 加 客户规格型号   客户物料名称
客户订单报表增加两字段（业务状态、备注取生产订单），报表增加两个按钮，可以去变更两个字段的值。（业务状态修改成完工之后，报表就显示ok，选择其中一行变更后反写到生产订单当中）
生产日计报表，双击明细内容，根据日期和流转卡号调出生产入库报表数据

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillEdit_NoTable.html

@@ -119,8 +119,6 @@
                                                </button>
                                            </div>
                                        </div>


                                        <div class="layui-inline" style="width: 51%;">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">客户</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
@@ -253,6 +251,20 @@
                                            <label class="layui-form-label" style="width: 85px;">计划开完工期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 80px;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <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="HCusMaterName" lay-verify="HCusMaterName" id="HCusMaterName" style="display: inline-block;" >
                                            </div>
                                        </div>
                                        <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="HCusModel" lay-verify="HCusModel" id="HCusModel" style="display: inline-block;">
                                            </div>
                                        </div>
                                    </div>
@@ -1013,6 +1025,8 @@
                            , "HWidth": d.data[0].HWidth
                            , "HWeight": d.data[0].HWeight
                            , "HColorRemark": d.data[0].染色要求
                            , "HCusMaterName": d.data[0].客户物料名称
                            , "HCusModel": d.data[0].客户规格型号
                            //其他信息
                            , "hmakers": OperationType == 2 ? "" : d.data[0].制单人
                            , "hmakedate": OperationType == 2 ? "" : d.data[0].制单日期 == null ? "" : Format(new Date(d.data[0].制单日期), "yyyy-MM-dd")

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

@@ -300,6 +300,12 @@
                                                <input type="hidden" class="layui-input" name="HCusID" id="HCusID">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label"> ææ–™è§„æ ¼</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs6 layui-inline">
@@ -581,12 +587,7 @@
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label"> ææ–™è§„æ ¼</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
                                            </div>
                                        </div>
                                       

                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">日计划工单选单号</label>

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

@@ -727,7 +727,7 @@
                        $("#HEmpID").val(data1.data[0].HEmpID);
                        //$("#HAuxUnitName").val(data1.data[0].HAuxUnitName);
                        //$("#HAuxUnit").val(data1.data[0].HAuxUnit);
                       // $("#HMaterModel").val(data1.data[0].HMaterModel);
                        $("#HMaterModel").val(data1.data[0].规格型号);

                        $.ajax({
                            type: "get",

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/SC_DayRkReport.html

@@ -2,7 +2,7 @@
<html>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>生产入库报表</title>
    <title>生产日记报表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -163,6 +163,17 @@
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });

            //双击表格事件
            table.on('rowDouble(mainTable)', function (obj) {
                btnrowDouble(obj.data);
            })

            //双击表格事件
            table.on('rowDouble(mainTable1)', function (obj) {
                btnrowDouble(obj.data);
            })


            //#endregion

@@ -370,6 +381,28 @@
                sWhere = "";
            }

            //双击跳转生产入库报表
            function btnrowDouble(obj) {

                var HProcExchBillNo = obj["工艺单号"];
                var HBeginDate = $("#HBeginDate").val();//下达日期 å¼€å§‹æ—¥æœŸ
                var HEndDate = $("#HEndDate").val();//结束日期

                if (HProcExchBillNo == "" || HProcExchBillNo == null) {
                    return layer.alert("无生产入库明细,无法查看!", { icon: 5 });
                }

                layer.open({
                    type: 2 //类型
                    , skin: 'layui-layer-rim'//加上边框
                    , maxmin: true //设置最大最小按钮是否显示
                    , area: ['90%', '90%']//大小
                    , title: '生产入库报表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../车间管理/报表分析/sc_ICOMRKReport.html?OperationType=1&HProcExchBillNo=' + HProcExchBillNo + '&HBeginDate="' + HBeginDate + '"&HEndDate="' + HEndDate+'"', 'yes']
                })
            }

            //重置过滤条件
            function set_ClearQuery() {
                //初始化时间

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/sc_ICOMRKReport.html

@@ -147,10 +147,24 @@
            var sWhere = "";
            var option = [];
            var HModName = "sc_ICOMRKReport";
            var HProcExchBillNo = "";
            var HBeginDate_u = "";
            var HEndDate_u = "";

            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½

            var params = getUrlVars();
            var OperationType = params[params[0]];

            //判断是否有参数传递
            if (!isNaN(OperationType)) {
                HProcExchBillNo = params[params[1]];
                HBeginDate_u = params[params[2]];
                HEndDate_u = params[params[3]];
            }


            //#region åˆå§‹åŒ–界面
          
@@ -310,6 +324,12 @@
                var HBillNo = $("#HBillNo").val();          //单据号
                var HProductName = $("#HProductName").val();//产品名称
                var HProductModel = $("#HProductModel").val();//产品规格

                if (HProcExchBillNo != "") {
                    sWhere += " and æµè½¬å¡å· ='" + HProcExchBillNo + "'";
                    HBeginDate = HBeginDate_u;
                    HEndDate = HEndDate_u;
                }

                if (HBeginDate != "" && HEndDate != "") {
                    sWhere += " and æ—¥æœŸ between '" + HBeginDate + "' and '" + HEndDate + "' ";
@@ -502,6 +522,18 @@
                })
            }

            //获取参数
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }

            //#endregion
        });
    </script>

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/sc_ICOMReport.html

@@ -117,6 +117,8 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-form"></i>关闭订单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddHRemark"><i class="layui-icon layui-icon-form"></i>添加备注</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                            </div>
                        </script>
@@ -165,9 +167,16 @@
                    //退出
                    case 'btn-exit': Pub_Close(2);
                        break;
                    //关闭订单
                    case 'btn-Close': btn_Close(obj);
                        break;
                    //隐藏列设置
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                    //添加备注
                    case 'btn-AddHRemark':
                        btn_AddHRemark();
                        break;
                };
            });
@@ -372,6 +381,70 @@
                sWhere = "";
            }

            //关闭订单
            function btn_Close(obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                var HICOMBillNoNum = [];
                for (var i = 0; i < checkStatus.data.length; i++) {
                    HICOMBillNoNum.push(checkStatus.data[i]["生产订单号"])
                }
                var sMainSub = HICOMBillNoNum.toString() + ";" + sessionStorage["HUserName"];
                $.ajax({
                    url: GetWEBURL() + "/LEMS/sc_ICOMReportClose",
                    type: "POST",
                    async: false,
                    data: { "sMainSub": sMainSub },
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.msg(data1.Message);
                            get_FastQuery();
                        } else {
                            layer.msg(data1.Message);
                        }
                    },
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
                        });
                    }
                })
               
            }

            function btn_AddHRemark() {
                var checkStatus = table.checkStatus('mainTable');
                if (checkStatus.data.length != 1) {
                    layer.msg("请选择一条数据!");
                } else {
                    layer.prompt({ title: '添加备注', formType: 2 }, function (text, index) {

                        var sMainSub = checkStatus.data[0]["生产订单号"]+ ";"+text + ";" + sessionStorage["HUserName"];
                        $.ajax({
                            url: GetWEBURL() + "/LEMS/sc_ICOMReportAddHRemark",
                            type: "POST",
                            async: false,
                            data: { "sMainSub": sMainSub },
                            success: function (data1) {
                                if (data1.count == 1) {
                                    get_FastQuery();
                                    layer.close(index);
                                    layer.msg(data1.Message);
                                } else {
                                    layer.msg(data1.Message);
                                }
                            },
                            error: function (err) {
                                layer.msg('错误' + err, {
                                    icon: 5,
                                    time: 20000
                                });
                            }
                        })
                       
                    });
                }
            }

            //隐藏列设置
            function get_HideColumn() {
@@ -483,7 +556,7 @@
            //双击跳转客户订单明细报表
            function btnrowDouble(obj) {

                HICMOBillNo = obj["生产订单号"];
                var HICMOBillNo = obj["生产订单号"];

                if (HICMOBillNo == "" || HICMOBillNo == null) {
                    return layer.alert("无工艺明细,无法查看!", { icon: 5 });