生产订单备注字段改成白坯要求，底部备注下推流转卡的时候带到流转卡底部备注中去 生产订单 已经下推过 流转卡或 生产入库单 或生产领料单 后，就不能删...

yangle

2023-05-23 238339fb7f4f0f7b11efbce325a85de6f4acaf35

生产订单备注字段改成白坯要求，底部备注下推流转卡的时候带到流转卡底部备注中去
生产订单 已经下推过  流转卡或 生产入库单 或生产领料单 后，就不能删除；
生产资源新增模块增加   负责人 HEmpID int 字段（gy_Employee） 非必录入，打印的时候打印出来
生产订单列表里增加关闭和反关闭按钮（在生产订单编辑模块里有这个功能，将一样的功能复制出来），列表显示关闭状态
工序流转卡维护列表增加当前工序过滤条件（下拉框形式，取值取工序列表）
网格选中行， 背景行 浅蓝色 显示；（优先改  生产订单列表，流转卡列表，出站单列表，进站单列表）（最好改JS底层方法）

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

@@ -13,7 +13,7 @@
        //不同的数据库应该选用不同的报表XML数据生成类，SQL Server数据库用SqlXMLReportData，Oracle数据库用OracleXMLReportData
        //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

        SqlXMLReportData.GenOneRecordset(this, "select a.HItemID è®¾å¤‡ç¼–号,a.HName è®¾å¤‡åç§°,g.HName æ‰€å±žè½¦é—´,e.HName è´£ä»»äºº from Gy_Source a left join Gy_Department g on a.HDeptID=g.HItemID left join Gy_Employee e on g.HEmpID=e.HItemID where a.HItemID=" + Request.Params["linterid"]);
        SqlXMLReportData.GenOneRecordset(this, "select a.HItemID è®¾å¤‡ç¼–号,a.HName è®¾å¤‡åç§°,g.HName æ‰€å±žè½¦é—´,e.HName è´£ä»»äºº from Gy_Source a left join Gy_Department g on a.HDeptID=g.HItemID left join Gy_Employee e on a.HEmpID=e.HItemID where a.HItemID=" + Request.Params["linterid"]);
    }
    </script>
</head>

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

@@ -196,6 +196,8 @@
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy_NT" id="copy_NT"><i class="layui-icon layui-icon-form"></i>复制(无列表)</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>反关闭</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Xc"><i class="layui-icon layui-icon-form"></i>下查</button>
                                    <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Excel" id="Excel"><i class="layui-icon layui-icon-file-b"></i>Excel导入</button>-->
@@ -307,6 +309,12 @@
                    //反审核
                    case 'set_AbandonCheck': set_AbandonCheck();
                        break;
                    //关闭
                    case 'set_CloseBill': set_CloseBill();
                        break;
                    //反关闭
                    case 'set_CancelCloseBill': set_CancelCloseBill();
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill(); 
                        break;
@@ -358,6 +366,25 @@
            form.on('submit(btnSearch)', function (data) {//选择仓位

                get_FastQuery();
            });

            //行监听事件
            table.on('row(mainTable)', function (obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            });

            //#region åˆå§‹åŒ–界面
@@ -1293,6 +1320,72 @@
                }
            }

            //关闭
            function set_CloseBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;

                if (data.length == 1) {
                    layer.confirm("确认要关闭吗?", function (index) {
                        var wait = layer.load();
                        var HInterID = data[0].hmainid;
                        $.ajax({
                            url: GetWEBURL() + '/Sc_ICMOBill/CloseSc_ICMOReportBill',
                            type: "GET",
                            data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    })
                }
                else {
                    layer.msg("请选择一条数据!");
                }
            }

            //反关闭
            function set_CancelCloseBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;

                if (data.length == 1) {
                    layer.confirm("确认要反关闭吗?", function (index) {
                        var wait = layer.load();
                        var HInterID = data[0].hmainid;
                        $.ajax({
                            url: GetWEBURL() + '/Sc_ICMOBill/CloseSc_ICMOReportBill',
                            type: "GET",
                            data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    })
                }
                else {
                    layer.msg("请选择一条数据!");
                }
            }

            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -347,6 +347,25 @@
                };
            });

            //行监听事件
            table.on('row(mainTable)', function (obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            });

            //隐藏列设置
            function get_HideColumn() {
                var colName = "";

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

@@ -1227,28 +1227,28 @@
            }

            //#region é¡µé¢å¿«æ·é”®å¼¹çª——工序流转卡关联数量
            $('body').on('keydown', function (e) {
                var HinteID = $("#HProcExchHinteID").val();
                if (e.key == "F7") {
                    if (HinteID == "" || HinteID == null || HinteID == undefined) {
                        layer.alert("请先输入条形码或扫描条形码", { icon: 5 });
                    }
                    else {
                        layer.open({
                            type: 2,
                            skin: 'layui-layer-rim', //加上边框
                            title: '工序流转卡关联数量',
                            closeBtn: 1,
                            shift: 2,
                            area: ['90%', '90%'],
                            maxmin: true,
                            content: ['../工序进站接收单/Cj_StationQty.html?HInterID=' + HinteID, 'yes'],
                            end: function () {
                            }
                        });
                    }
                }
            })
            //$('body').on('keydown', function (e) {
            //    var HinteID = $("#HProcExchHinteID").val();
            //    if (e.key == "F7") {
            //        if (HinteID == "" || HinteID == null || HinteID == undefined) {
            //            layer.alert("请先输入条形码或扫描条形码", { icon: 5 });
            //        }
            //        else {
            //            layer.open({
            //                type: 2,
            //                skin: 'layui-layer-rim', //加上边框
            //                title: '工序流转卡关联数量',
            //                closeBtn: 1,
            //                shift: 2,
            //                area: ['90%', '90%'],
            //                maxmin: true,
            //                content: ['../工序进站接收单/Cj_StationQty.html?HInterID=' + HinteID, 'yes'],
            //                end: function () {
            //                }
            //            });
            //        }
            //    }
            //})
            //#endregion

            //是否被转下工序

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

@@ -508,6 +508,10 @@

            //点击主表带出从表数据
            table.on('row(mainTable)', function (obj) { //注：tool æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"

                //选中行改变颜色
                check_row(obj);

                var datas = obj.data; //获得当前行数据
                HBillNo = datas["单据号"].toString();
                var HMainID = datas.hmainid;
@@ -677,6 +681,24 @@
                DisPlay_HideColumn_Mod();
            }
            //#endregion

            function check_row(obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            }

            //#region æŸ¥è¯¢ å·¥è‰ºå‚æ•°
            function get_Display4(HMainID) {
@@ -954,25 +976,25 @@
                                , height: 550
                                , page: true
                                , totalRow: true
                                //, cellMinWidth: 90
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                                , done: function (res, curr, count) {
                                    var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
                                    var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
                                    var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
                                    for (var i = 0; i < $data.length; i++) {
                                        var l1 = $data.eq(i).find('div').width();
                                        var l2 = $head.eq(i).find('div').width();
                                        if (l1 > l2) {
                                            $head.eq(i).find('div').width(l1);
                                            $total.eq(i).find('div').width(l1);
                                        } else {
                                            $data.eq(i).find('div').width(l2);
                                            $total.eq(i).find('div').width(l2);
                                        }
                                    }
                                }
                                //, done: function (res, curr, count) {
                                //    var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
                                //    var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
                                //    var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
                                //    for (var i = 0; i < $data.length; i++) {
                                //        var l1 = $data.eq(i).find('div').width();
                                //        var l2 = $head.eq(i).find('div').width();
                                //        if (l1 > l2) {
                                //            $head.eq(i).find('div').width(l1);
                                //            $total.eq(i).find('div').width(l1);
                                //        } else {
                                //            $data.eq(i).find('div').width(l2);
                                //            $total.eq(i).find('div').width(l2);
                                //        }
                                //    }
                                //}
                            }
                            table.render(option);


 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBillList.html

@@ -219,6 +219,25 @@
                }
            });

            //行监听事件
            table.on('row(mainTable)', function (obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            });

            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {