wtt
2025-07-09 4994a573f6044dd9fa73ef61d728e91fbe2e7d28
工艺路线导出报错,三升排产调整
1个文件已添加
4个文件已修改
365 ■■■■■ 已修改文件
WebTM/layuiadmin/Scripts/webConfig.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/grf/物料条码_海诚(蓝牙).grf 351 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,7 +7,7 @@
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
WebTM/views/grf/ÎïÁÏÌõÂë_º£³Ï£¨À¶ÑÀ£©.grf
New file
@@ -0,0 +1,351 @@
Object Report
    Version='6.8.9.1'
    Title='生产任务单'
    PrintAsDesignPaper=F
    Object Font
        Name='宋体'
        Size=135000,0
        Weight=400
        Charset=134
    End
    Object Printer
        Size=256
        Width=9.5
        Height=10
        LeftMargin=0
        TopMargin=0
        RightMargin=0
        BottomMargin=0
    End
    Object DetailGrid
        CenterView=T
        ShowColLine=F
        ShowRowLine=F
        Object Border
            Styles=[]
        End
        Object Recordset
            Items Field
                Item
                    Name='供应商'
                End
                Item
                    Name='物料名称'
                End
                Item
                    Name='物料代码'
                End
                Item
                    Name='数量'
                End
                Item
                    Name='出厂日期'
                End
                Item
                    Name='规格型号'
                End
                Item
                    Name='计划跟踪号'
                End
                Item
                    Name='检验员'
                End
                    End
    End
    Items Column
        Item
            Name='Column3'
            Width=9.49854
        End
    End
Object ColumnContent
    Height=10.0013
    RowsPerPage=1
    Items ColumnContentCell
        Item
            Column='Column3'
            FreeCell=T
            CanGrow=T
            Items Control
                Item
                    Type=FieldBox
                    Name='FieldBox1'
                    Left=6.40292
                    Top=5.00063
                    Width=2.59292
                    Height=0.582083
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='计划跟踪号'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox2'
                    Left=2.80458
                    Top=2.40771
                    Width=3.99521
                    Height=0.502708
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='物料名称'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox3'
                    Left=2.80458
                    Top=2.98979
                    Width=3.99521
                    Height=0.502708
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='物料代码'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox4'
                    Left=2.80458
                    Top=3.59833
                    Width=3.99521
                    Height=0.502708
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='规格型号'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox5'
                    Left=2.19604
                    Top=4.39208
                    Width=1.79917
                    Height=0.502708
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='数量'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox6'
                    Left=6.19125
                    Top=4.39208
                    Width=2.80458
                    Height=0.502708
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='出厂日期'
                End
                Item
                    Type=Barcode
                    Name='Barcode1'
                    Left=6.79979
                    Top=2.19604
                    Width=2.25
                    Height=2.01083
                    BarcodeType=QRCode
                    CaptionPosition=None
                    Text='[#订单号#]'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox9'
                    Left=3
                    Top=1.5
                    Width=5.82083
                    Height=0.608542
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    DataField='供应商'
                End
                Item
                    Type=MemoBox
                    Name='MemoBox1'
                    Left=0.608542
                    Top=1.5
                    Width=2.38125
                    Height=0.582083
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    Text='供应商:'
                End
                Item
                    Type=FieldBox
                    Name='FieldBox10'
                    Left=2.19604
                    Top=5.00063
                    Width=1.79917
                    Height=0.5
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    WordWrap=T
                    TextAlign=TopLeft
                    DataField='检验员'
                End
                Item
                    Type=MemoBox
                    Name='MemoBox3'
                    Left=0.608542
                    Top=2.40771
                    Width=2.19604
                    Height=0.5
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    Text='物料编码:'
                End
                Item
                    Type=MemoBox
                    Name='MemoBox4'
                    Left=3.99521
                    Top=4.39208
                    Width=2.2
                    Height=0.5
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    Text='出厂日期:'
                End
                Item
                    Type=MemoBox
                    Name='MemoBox5'
                    Left=0.608542
                    Top=2.98979
                    Width=2.19604
                    Height=0.5
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    Text='物料名称:'
                End
                Item
                    Type=MemoBox
                    Name='MemoBox6'
                    Left=0.608542
                    Top=3.59833
                    Width=2.19604
                    Height=0.5
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    Text='规格型号:'
                End
                Item
                    Type=MemoBox
                    Name='MemoBox7'
                    Left=0.608542
                    Top=4.39208
                    Width=1.5875
                    Height=0.5
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    Text='数量:'
                End
                Item
                    Type=MemoBox
                    Name='MemoBox8'
                    Left=0.608542
                    Top=5.00063
                    Width=1.5875
                    Height=0.5
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    Text='检验员:'
                End
                Item
                    Type=MemoBox
                    Name='MemoBox9'
                    Left=3.99521
                    Top=5.00063
                    Width=2.40771
                    Height=0.5
                    Object Font
                        Name='宋体'
                        Size=105000,0
                        Bold=T
                        Charset=134
                    End
                    Text='计划跟踪号:'
                End
                    End
    End
End
End
Object ColumnTitle
    Height=0
    Items ColumnTitleCell
        Item
            GroupTitle=F
            Column='Column3'
            Text='Column1'
        End
    End
End
End
Items ReportHeader
    Item
        Name='ReportHeader1'
        Height=0
        RepeatOnPage=T
    End
End
Items ReportFooter
    Item
        Name='ReportFooter1'
        Height=0
    End
End
End
WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html
@@ -87,13 +87,13 @@
                                                        <option value="1">生产订单</option>
                                                        <option value="2">生产汇报单</option>
                                                        <option value="3">采购订单</option>
                                                        <!--<option value="4">收料通知单</option>
                                                        <option value="4">收料通知单</option>
                                                        <option value="5">委外订单</option>
                                                        <option value="6">生产入库单</option>
                                                        <option value="7">采购入库单</option>
                                                        <option value="8">销售退货单</option>
                                                        <option value="9">生产退料单</option>
                                                        <option value="10">工序流转卡</option>-->
                                                        <option value="10">工序流转卡</option>
                                                        <option value="11">销售出库单</option>
                                                        <option value="12">领料出库单</option>
                                                    </select>
WebTM/views/Éú²ú¹ÜÀí/ÈýÉýÅŲú/JIT_DayPlanPlatForm.html
@@ -2898,7 +2898,10 @@
                        SDSum += TableData[i][option.cols[0][j].field];
                    }
                }
                //跳过 é”å®šå·¥å•
                if (option.data[i].锁定工单 == "是") {
                    continue;
                }
                //找到本任务单 å¯ç”¨ç”Ÿäº§èµ„源
                lMainID = option.data[i]["HICMOInterID"];
                sICMOBillNo = option.data[i]["生产订单号"];
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -522,6 +522,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-150'
                    , title: '工艺路线'
                    , page: false
                    , limit: 50
                    , done: function (res, curr, count) {
@@ -1627,7 +1628,7 @@
                            }
                        });
                        if (result.count == 1) {
                            table.exportFile(ins.config.id, data, "xls");
                            table.exportFile('mainTable', data, "xls");
                            layer.close(wait);
                        } else {
                            layer.alert("当前模块没有导出权限!", { icon: 5 });