1

yangle

2023-03-31 ab5df9a08da793c33773c837e32600ae7528ad42

1

 WebTM/App_Data/MssqlReportData.cs

@@ -18,7 +18,8 @@
    //public const string SqlConnStr = "Data Source=10.0.2.9;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch测试
    public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    public const string SqlConnStr = "Data Source=192.168.1.251;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//乔一
    //public const string SqlConnStr = "Data Source=192.168.16.53;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//龙山汽配
    //public const string SqlConnStr = @"Data Source=192.168.0.193\SWE2014;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井地址
    //public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//雅琪诺测试

 WebTM/views/Baseset/SRM_OpenTmpList.html

@@ -23,6 +23,7 @@
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Reload">刷新</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Select">选择</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit">退出</button>
                                <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">隐藏列设置</button>
                            </div>
                        </div>
                    </div>
@@ -52,11 +53,16 @@
                , form = layui.form
                , layer = layui.layer
                , element = layui.element; //Tab的切换功能，切换事件监听等，需要依赖element模块
            table.render({

            var option = [];
            var HModName = "SRM_OpenTmpList";
            option={
                elem: '#mainTable'
                // , url: '/demo/table/user/'
                , data: []
                , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 æ–°å¢ž
                , height: 'full-10'
                , loading: false
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HItemID', width: 150, title: 'ID', hide: true }
@@ -64,8 +70,9 @@
                    , { field: 'HName', width: 150, title: '模块名称', hide: true }
                    , { field: '模板名称', width: 150, title: '模板名称' }
                ]]
            });
            };

            DisPlay_HideColumn();

            table.on('row(mainTable)', function (obj) {////注：test是table原始容器的属性 lay-filter="对应的值"
                obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');//选中行样式
@@ -104,14 +111,12 @@
                    //data: { "Value": Value },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false
                            , done: function (index, res) {

                            }
                        });
                        //table.reload('mainTable', {
                        //    data: ajaxReturnData
                           
                        //});
                        option.data = ajaxReturnData;
                        table.render(option);
                    },
                    error: function (result) {
                        console.log(result);
@@ -183,9 +188,11 @@
                        }
                    });
            });

            form.on('submit(Reload)', function (data) {//刷新
                RoadList(Type);
            });

            form.on('submit(Save)', function (obj) {//保存
                var Tmp = obj.field;
                if (Tmp.HName == '') {
@@ -220,10 +227,12 @@
                        }
                    });
            });

            form.on('submit(Cancel)', function (data) {//取消
                element.tabChange('tabDemo', '1');
                element.tabDelete('tabDemo', '2'); //删除
            });

            form.on('submit(Select)', function (data) {//选择
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
@@ -262,6 +271,12 @@
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });

            //隐藏列设置
            form.on('submit(HideColumn)', function (data) {
                get_HideColumn();
            });

            form.on('submit(Exit)', function (data) {//退出
                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                parent.layer.close(index); //再执行关闭
@@ -269,6 +284,119 @@



            //隐藏列设置
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length ; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
               
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: [contentUrl, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }


            //显示列数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    async: false,
                    success: function (data1) {
                        if (data1.data.length != 0) {


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = [""];//不需要显示的字段 å¯æ‰©å±•

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                var dataCols = dataCol[i].split('|');
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option);
                        } else {
                            table.render(option);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }

        });
    </script>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_Department.html

@@ -327,10 +327,13 @@
                    layer.msg("请输入部门名称！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HEmpID").val() == 0) {
                    layer.msg("请选择负责人！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                if (sessionStorage["OrganizationID"] != 100050) {
                    if ($("#HEmpID").val() == 0) {
                        layer.msg("请选择负责人！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                }
               
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_Department/AddBill1", //方法所在页面和方法名

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Sc_ProcessExchangeBillList.aspx

@@ -14,7 +14,7 @@
            //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
            SqlXMLReportData.GenEntireData(this, "select  distinct b.流水号,a.任务单号,a.流转卡数量,a.产品代码,a.版本,a.成品编号,a.产品名称,a.日期,a.计划完工日期,a.单据号,a.材质,b.工序名称,b.模具编号,b.工艺参数,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="+Request.Params["linterid"] ,"select 1");
            SqlXMLReportData.GenEntireData(this, "select  distinct b.流水号,a.任务单号,a.流转卡数量,a.产品代码,a.版本,a.成品编号,a.产品名称,a.日期,a.计划完工日期,a.单据号,a.材质,b.工序名称,b.模具编号,b.工艺参数,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="+Request.Params["linterid"] ,"select 1");
        }
    </script>
</head>

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

@@ -722,7 +722,7 @@
                    , area: ['90%', '90%']//大小
                    , title: "物料列表"  //标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Material.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -732,11 +732,11 @@
                        }
                        //获取数据
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
                        $("#HMaterName").val(checkStatus.data[0].HName);
                        $("#HModel").val(checkStatus.data[0].HModel);
                        $("#HMaterNumber").val(checkStatus.data[0].物料代码);
                        $("#HMaterName").val(checkStatus.data[0].物料名称);
                        $("#HModel").val(checkStatus.data[0].规格型号);
                        $("#HUnitID").val(checkStatus.data[0].HUnitID);//计量单位id
                        $("#HUnitName").val(checkStatus.data[0].HUnitName);//计量单位名称
                        $("#HUnitName").val(checkStatus.data[0].计量单位名称);//计量单位名称
                        $("#HWidth").val(checkStatus.data[0].HWidth);//幅宽
                        $("#HWeight").val(checkStatus.data[0].HWeight);//克重
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
@@ -1201,11 +1201,6 @@

            //非空验证
            function AllowLoadData(data) {

                if ($("#hchecker").val() != "") {
                    layer.msg("单据已审核,不允许修改!");
                    return false;
                }

                if ($("#HMaterNumber").val() == "") {
                    layer.msg("物料编码没有选择");

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

@@ -886,7 +886,10 @@
            });           

            function txtHBarCode_KeyDown(HBarCode) {
                 //扫码类型1
                var barNo = HBarCode.substr(0, 3);
                //扫码类型2
                var barNo2 = HBarCode.substr(0, 4);
                if (barNo == 'PRO' && $('#HProcExchHinteID').val() == '') {
                    layer.msg("请扫完流转卡后再扫工序码")
                    layer.close(index);
@@ -961,7 +964,43 @@
                                        "HMaterModel": data.规格型号
                                    });
                                    break;
                                case "GXL":
                                case "PGM":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HMaterID": data.HItemID,
                                        "HMaterName": data.物料名称,
                                        "HMaterNumber": data.物料代码,
                                        "HMaterModel": data.规格型号
                                    });
                                    break;
                            }

                            switch (barNo2) {
                                case "GXLZ":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HICMOInterID": data.hicmointerid,
                                        "HICMOBillNo": data.任务单号,
                                        "HMaterID": data.HMaterID,
                                        "HMaterName": data.产品,
                                        "HMaterNumber": data.产品代码,
                                        "HMaterModel": data.规格型号,
                                        "HPieceQty": data.流转卡数量,
                                        "HPlanQty": data.流转卡数量,
                                        "lngBillKey": data.hmainid,
                                        "HProcExchBillNo": data.单据号,
                                        "HProcExchHinteID": data.hmainid,
                                        "HICMOQty": data.任务单数量,
                                        "HOrderProcNO": data.订单跟踪号,
                                        "HPRDOrgID": data.组织,
                                        "lngBillSubKey": data.hsubid,
                                        "HProcName": data.工序,
                                        "HProcID": data.HProcID,
                                        "HProcNo": data.流水号,
                                        "HCenterName": data.工作中心,
                                        "HCenterID": data.HCenterID,
                                    });
                                    HProcExchBillNoFlag = true;
                                    break;
                                case "GXLX":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HICMOInterID": data.hicmointerid,
                                        "lngICMOEntryID": data.lngICMOEntryID,
@@ -972,10 +1011,10 @@
                                        "HMaterModel": data.规格型号,
                                        "HPieceQty": data.流转卡数量,
                                        "HPlanQty": data.流转卡数量,
                                        "lngBillKey": data.hmainid,
                                        "HProcExchBillNo": data.单据号,
                                        "HProcExchHinteID": data.hmainid,
                                        "HICMOQty": data.任务单数量,
                                        "lngBillKey": data.hmainid,
                                        "HOrderProcNO": data.订单跟踪号,
                                        "HPRDOrg": data.组织,
                                        "HPRDOrgID": data.组织
@@ -1053,8 +1092,8 @@
                                            }
                                            table.render(option)
                                        }
                                    })                          
                                    break;                                   
                                    })
                                    break;
                            }


@@ -1066,6 +1105,8 @@
                            //DisPlay_HideColumn();

                            layer.close(index);
                            //清空条码框
                            $('#HBarCode').val("");
                        }
                        else {
                            layer.close(index);
@@ -1082,7 +1123,7 @@
            //流水号（工序号）回车方法
            $('#HProcNo').on('keydown', function (event) {
                var sProcNo = $('#HProcNo').val();
                var sBillNo = $('#HBarCode').val();
                var sBillNo = $('#HProcExchBillNo').val();//流转卡号
                if (event.keyCode == 13) {
                    if (!HProcExchBillNoFlag) {
                        layer.msg("流转卡没有扫描，或者没有按回车键，请扫描流转卡或者在流转卡文本框中按回车键！");

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

@@ -1557,7 +1557,7 @@
                if (checkStatus.data.length === 1) {
                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
                        , area: ['80%', '80%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化