Commit Graph

2020 Commits (cf87c7b7ec212e05f89008cb1b1f08eee42a57f3)

Author SHA1 Message Date
Caozhenhui bf9e256d39 fixd pep8 2021-03-04 20:46:50 +08:00
tianlinzhong 80601589eb Implemented the combinedequipmentcost Excel export 2021-03-04 20:44:38 +08:00
YangZhang-GitHub 22ba6615f4 Added 'excelexporters.spaceoutput.export()' method 2021-03-04 20:34:03 +08:00
YangZhang-GitHub 7796eeed5f Implemented the SpaceOutput Excel Exporter 2021-03-04 20:31:13 +08:00
Caozhenhui 9048dac16c Implemented the combinedequipmentload Excel Exporter 2021-03-04 20:25:32 +08:00
YangZhang-GitHub 1d2923e915 Change the cell name 'consume' to 'output' 2021-03-04 20:18:38 +08:00
YangZhang-GitHub 413077a6ee Implemented the CombinedEquipmentOutput Excel Exporter 2021-03-04 19:57:00 +08:00
YangZhang-GitHub 2f5c9673de Added 'excelexporters.combinedequipmentoutput.export()' method 2021-03-04 19:55:57 +08:00
13621160019@163.com 0846f410af added excel exporter of equipmentoutput report
Merge branch 'develop'
2021-03-04 19:00:14 +08:00
13621160019@163.com 76b83136a2 added excel exporter of equipmentoutput report
Merge branch 'PR60' into develop
2021-03-04 18:58:53 +08:00
13621160019@163.com 50cf15a1fa added excel exporter of shopfloorcost report
Merge branch 'develop'
2021-03-04 18:36:32 +08:00
13621160019@163.com 187f1d33a0 added excel exporter of shopfloorcost report 2021-03-04 18:34:52 +08:00
13621160019@163.com 59db05182b added excel exporter of shopfloorcost report
Merge branch 'PR52' into develop
2021-03-04 18:33:07 +08:00
13621160019@163.com 1b604745bf added excel exporter of shopfloorload report
Merge branch 'develop'
2021-03-04 18:16:30 +08:00
13621160019@163.com 4d9e31276e added excel exporter of shopfloorload report
Merge branch 'PR1' into develop
2021-03-04 18:14:55 +08:00
tianlinzhong 14bfb16cda Fix some errors and add data ratio 2021-03-04 15:55:01 +08:00
YangZhang-GitHub c9fad53977 Implemented the EquipmentOutput Excel Exporter 2021-03-04 14:54:38 +08:00
YangZhang-GitHub 18a3e8e7d8 Added 'excelexporters.equipmentoutput.export()' method 2021-03-04 14:53:50 +08:00
Caozhenhui 9134e88153 Remove the load factor per unit area[B 2021-03-04 14:35:27 +08:00
tianlinzhong 78f02914dc 更改完成 2021-03-04 12:03:10 +08:00
tianlinzhong 8bebedf6f1 added shopfloorcost master 2021-03-03 16:38:12 +08:00
Caozhenhui 25a96729ae 2021/3/3 2021-03-03 16:04:49 +08:00
Caozhenhui d719e95ab0 Merge remote-tracking branch 'upstream/develop' into develop 2021-03-03 15:47:45 +08:00
hyh123a 5be55c2922 add the de translation 2021-03-03 15:28:03 +08:00
13621160019@163.com ae5231f12b added excel exporter of combinedequipmentenergycategory report
Merge branch 'develop'
2021-03-03 14:12:57 +08:00
13621160019@163.com f1d95e3037 added excel exporter of combinedequipmentenergycategory report 2021-03-03 14:11:22 +08:00
13621160019@163.com e717b23bde added excel exporter of combinedequipmentenergycategory report
Merge branch 'PR58' into develop
2021-03-03 14:08:50 +08:00
13621160019@163.com 55334906fb added excel exporter of combinedequipmentitem report
Merge branch 'develop'
2021-03-03 13:25:42 +08:00
13621160019@163.com 43a18a6046 added excel exporter of combinedequipmentitem report 2021-03-03 13:24:46 +08:00
13621160019@163.com 76139d6645 added excel exporter of combinedequipmentitem report
Merge branch 'PR57' into develop
2021-03-03 13:23:36 +08:00
hyh123a 83e8c27d36 add the excel report of combined equipment energy category 2021-03-03 11:52:12 +08:00
YangZhang-GitHub f0589cbb97 Implemented the CombinedEquipmentEnergyItem Excel Exporter 2021-03-03 11:48:07 +08:00
YangZhang-GitHub 0d6c14b999 Added 'excelexporters.combinedequipmentenergyitem.export()' method 2021-03-03 11:47:26 +08:00
hyh123a 29dc12913f revert the commit 2021-03-03 11:35:17 +08:00
hyh123a 2f391800bb Merge remote-tracking branch 'origin_myems/develop' into develop 2021-03-03 11:10:04 +08:00
hyh123a 7ca12b43cd add the de translation 2021-03-03 10:57:35 +08:00
Caozhenhui c493c797ad 2021/3/2 2021-03-02 20:25:48 +08:00
13621160019@163.com 71fcd79a6b added excel exporter of equipmentenergyitem report
Merge branch 'develop'
2021-03-02 17:56:43 +08:00
13621160019@163.com 0123167b58 added excel exporter of equipmentenergyitem report 2021-03-02 17:55:02 +08:00
13621160019@163.com 6375d7893a added excel exporter of equipmentenergyitem report
Merge branch 'PR54' into develop
2021-03-02 17:52:58 +08:00
YangZhang-GitHub 46dedb15b4 Added 'excelexporters.equipmentenergyitem.export()' method 2021-03-02 17:31:09 +08:00
YangZhang-GitHub 16d38614b2 Implemented the EquipmentEnergyItem Excel Exporter 2021-03-02 17:30:05 +08:00
13621160019@163.com e55e674297 added excel exporter of equipmentenergycategory report
Merge branch 'develop'
2021-03-02 17:07:14 +08:00
13621160019@163.com 61e8006a5e added excel exporter of equipmentenergycategory report 2021-03-02 17:06:08 +08:00
13621160019@163.com ef77bc21de added excel exporter of equipmentenergycategory report
Merge branch 'PR51' into develop
2021-03-02 17:05:50 +08:00
hyh123a 736bd111ff Merge remote-tracking branch 'origin_myems/develop' into develop 2021-03-02 16:56:04 +08:00
hyh123a 12eab9741f modify the data format 2021-03-02 16:55:37 +08:00
13621160019@163.com 9e90627055 Merge branch 'develop' 2021-03-02 16:46:07 +08:00
13621160019@163.com 2790e6e5c3 added excel exporter of shopfloorenergyitem report 2021-03-02 16:45:12 +08:00
13621160019@163.com 5d043c4b71 Merge branch 'PR53' into develop 2021-03-02 16:44:11 +08:00