已经生成生产汇报单了的产量汇报大在列表上添加背景色,生产汇报单编辑页面添加采购订单相关字段
4个文件已修改
62 ■■■■■ 已修改文件
WebTM/views/生产管理/产量汇报单/Sc_ProductReportBillList.html 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_ProductReportBillList.html
@@ -228,10 +228,10 @@
                };
            }
            //报工平台进入(有源单)
            //报工平台进入(有源单) åªèƒ½çœ‹åˆ°å½“前生产资源上开工了的生产订单的产量汇报单
            function set_AddNew()
            {
                sWhere = " where a.HSourceID='" + HSourceID + "' and a.HICMOBillNo='" + workcode + "' and HICMOInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and HICMOEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and HMaker='" + HMaker + "' ";
                sWhere = " where HSourceID='" + HSourceID + "' and HICMOBillNo='" + workcode + "' and HICMOInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and HICMOEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and HMaker='" + HMaker + "' ";
                SchWhere = sWhere;
                console.log(sWhere);
                //进入页面显示的缓存列表
@@ -395,19 +395,19 @@
                    var Source = $("#Source").val();  //资源
                    sWhere += SchWhere;
                    if (HDate) {
                        sWhere += " and CONVERT(varchar(100),a.HDate, 23) >= '" + HDate + "'";
                        sWhere += " and CONVERT(varchar(100),HDate, 23) >= '" + HDate + "'";
                    }
                    if (HDate1) {
                        sWhere += " and CONVERT(varchar(100),a.HDate, 23) <= '" + HDate1 + "'";
                        sWhere += " and CONVERT(varchar(100),HDate, 23) <= '" + HDate1 + "'";
                    }
                    if (HBillNo) {
                        sWhere += " and a.HBillNo like '%" + HBillNo + "%'";
                        sWhere += " and HBillNo like '%" + HBillNo + "%'";
                    }
                    if (Part) {
                        sWhere += " and concat(m.HNumber,m.HName,m.HModel) like '%" + Part + "%'";
                        sWhere += " and concat(HNumber,HName,HModel) like '%" + Part + "%'";
                    }
                    if (Source) {
                        sWhere += " and s.HName like '%" + Dept + "%'";
                        sWhere += " and HName like '%" + Dept + "%'";
                    }
                    $.ajax({
                        //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ProductReportStepBillList_Web.html
@@ -282,10 +282,7 @@
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
                        soulTable.render(this);
                    }
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200 }
@@ -393,6 +390,21 @@
                        //, { field: 'HReportType', title: '汇报类型', width: 200 , sort: true}
                        , { field: 'HRelationInterID', title: '是否报检申请', width: 200, hide: true, sort: true }
                    ]]
                    , done: function (res, curr, count) {
                        soulTable.render(this);
                        $.each(res.data, function (index, item) {
                            //判断产量汇报临时数据是否已有关联,有则添加背景色标记
                            if (item.HRelationInterID != 0) {
                                //// æ–¹æ³•1(没看到有效果,没有进行调试)
                                //$("#table-id").next().find('tbody tr[data-index="' + index +
                                //    '"]').css("background-color", "#EA08C1");
                                // æ–¹æ³•2(可用)
                                 var i = index + 1;
                                $('tr').eq(i).css("background-color", "#FAAAED");
                            }
                        });
                    }
                };
            }
WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html
@@ -343,8 +343,10 @@
                var AddRow = table.cache['mainTable'];
                var NewRow = {
                    "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                    "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
                    "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
                    "HICMOBillNo": "", "HICMOInterID": "0","HICMOEntryID":"0","HRemark": ""
                };
                switch (obj.event) {
                    //新增一行
                    case 'btn-AddLine': btnAddLine(NewRow);
@@ -428,7 +430,8 @@
                    , btn1: function (index, layero) {
                        option.data = [{
                            "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                            "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
                            "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
                            "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
                        }];
                        table.render(option);
                        //按钮【按钮一】的回调
@@ -458,7 +461,7 @@
                                    //var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": "" };
                                    table.cache["mainTable"].push({
                                        "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                                        "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
                                        "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
                                    });
                                    option.data = table.cache["mainTable"];
                                    table.render(option);
@@ -839,6 +842,10 @@
                    , { field: 'HWorkerName', title: '操作员名称', edit: 'text', width: 100 }
                    , { field: 'HQty', title: '生产数量', edit: 'text', width: 100 }
                    , { field: 'HBadQty', title: '不良数量', edit: 'text', width: 100 }
                    , { field: 'HICMOBillNo', title: '生产订单', edit: 'text', width: 100 }
                    , { field: 'HICMOInterID', title: '生产订单内码', edit: 'text', width: 100, hide: true}
                    , { field: 'HICMOEntryID', title: '生产订单子内码', edit: 'text', width: 100, hide: true}
                    , { field: 'HRemark', title: '表体备注', edit: 'text', width: 100 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 150 }
                ];
@@ -926,7 +933,8 @@
                $('#get_PrintReport').addClass("layui-btn-disabled").attr("disabled", true);
                option.data = [{
                    "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                    "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
                    "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
                    "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
                }];
                table.render(option);
            }
@@ -957,7 +965,8 @@
                                        "HMaterID": data[i].物料ID, "HMaterCode": data[i].物料代码, "HMaterName": data[i].物料名称, "HMaterSpec": data[i].规格型号,
                                        "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": data[i].生产资源ID, "HSourceCode": data[i].生产资源代码,
                                        "HSourceName": data[i].生产资源名称, "HWorkerid": data[i].操作员ID, "HWorkerCode": data[i].操作员代码,
                                        "HWorkerName": data[i].操作员名称, "HQty": data[i].产量, "HBadQty": data[i].不良数量, "HRemark": ""
                                        "HWorkerName": data[i].操作员名称, "HQty": data[i].产量, "HBadQty": data[i].不良数量, "HICMOBillNo": data[i].生产订单号,
                                        "HICMOInterID": data[i].HICMOInterID, "HICMOEntryID": data[i].HICMOEntryID, "HRemark": ""
                                    });
                                }
@@ -979,6 +988,7 @@
                    });
                    option.data = arr;
                    console.log(option.data );
                    table.render(option);
                    option_prodReport.data = arr_detail;
@@ -986,7 +996,8 @@
                } else {
                    option.data = [{
                        "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                        "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
                        "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
                        "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
                    }];
                    table.render(option);
                }
@@ -1000,7 +1011,8 @@
                set_EditGrid(linterid);  //编辑获取表体
                option.data = [{
                    "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                    "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0, "HRemark": ""
                    "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
                    "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": ""
                }];
                table.render(option);
            }
WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_ICMOReportBillList.html
@@ -625,7 +625,7 @@
                        data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                layer.msg(result.Message, { time: 1 * 10000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame