Commit Graph

Select branches

Hide Pull Requests

base

gzerp

master

scui

2.6.2025031916

2.6.2025040209

Mono Color

• 79fc4201fd Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web master TianyangZhang 2026-03-31 11:08:45 +0800
• a3fe47384b feat:修改光芯人员导入功能 TianyangZhang 2026-03-31 11:08:44 +0800
• 9e3ebb5a46 fix: 修复手动来料物料选择和 mgroup 传递问题 caoqianming 2026-03-27 16:41:24 +0800
• 5e77d575b8 feat: 来料未完成界面添加手动来料和删除功能 caoqianming 2026-03-27 10:28:00 +0800
• 33eb661295 feat:光子性能检验添加两个字段（中温粘度规格、结论），修改两个文案 shijing 2026-03-27 09:44:26 +0800
• 0f46fb6b53 fix:6车间新增报工时，无法多次修改领用数量问题修改 shijing 2026-03-26 17:06:01 +0800
• be10887892 fix:统计分析-管综合统计中，六车间中检会出现有合格率，但是没有检验数，字段引用错了，已纠正 shijing 2026-03-26 16:37:19 +0800
• 17b4a16def fix:有时出现加工-发货合格率有数，但发货数为0的情况问题修改为当有发货数的时候再计算两个合格率 shijing 2026-03-26 16:26:14 +0800
• a035cf979b fix:7车间生产大屏：本月生产统计横坐标改成1-10炉号 shijing 2026-03-26 15:49:21 +0800
• 0b4ae3d042 feat:10车间看板：人员到岗模块删除，不需要了 shijing 2026-03-26 15:34:00 +0800
• 0f680491a3 feat:扭转统计 shijing 2026-03-26 10:02:49 +0800
• 7dd188ce94 fix:文件名修改 shijing 2026-03-25 13:25:21 +0800
• b3c42b5876 fix:日志中针对扭转的检验表（用material_in）做特殊处理 shijing 2026-03-25 13:24:14 +0800
• 9023d3b34a fix:禅道359 shijing 2026-03-25 11:15:34 +0800
• 4565b7ccca fix:禅道361 shijing 2026-03-24 14:55:09 +0800
• f47bcebbbb fix:禅道353 shijing 2026-03-24 14:07:50 +0800
• 3643a2a95c fix:禅道362 shijing 2026-03-23 15:40:28 +0800
• d1f7209469 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2026-03-23 14:49:24 +0800
• afb86b1cec fix:热压统计（毛）检测数据修正 shijing 2026-03-23 14:47:49 +0800
• a994cbc10d feat: 修改光芯OA审批的BUG与新增导出功能 TianyangZhang 2026-03-23 09:50:09 +0800
• 12b0f280d9 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web TianyangZhang 2026-03-23 09:48:11 +0800
• 29263a4f1b fix:禅道356点击数据没有显示列表 shijing 2026-03-20 14:47:11 +0800
• a5b124576e fix:禅道360工艺编辑的时候输入输出物料没有显示 shijing 2026-03-20 13:40:51 +0800
• 493a9289fe fix:输出检验表固定前几列和操作列 shijing 2026-03-20 11:11:08 +0800
• b0e4dc830a Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web TianyangZhang 2026-03-20 09:21:07 +0800
• 0a27aa67ff fix:版本号更新 shijing 2026-03-18 14:43:37 +0800
• ab030d2487 feat:mpr-物资管理前端（申购单、入库单、物料库存、领用记录） TianyangZhang 2026-03-12 16:57:12 +0800
• d2befea659 fix:玻纤输出检验表格表头文案靠左对齐 shijing 2026-03-12 09:08:16 +0800
• 122e73fee2 fix：玻纤排板统计2添加物料名 shijing 2026-03-12 09:07:26 +0800
• 0a9b1bdf1f Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2026-03-12 09:05:58 +0800
• 31df2e12a8 fix:光芯返工检测表修正 shijing 2026-03-12 09:05:54 +0800
• a80f3b69ac feat:hrm-增加前端路由 TianyangZhang 2026-03-12 08:58:11 +0800
• 35d105baf8 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web TianyangZhang 2026-03-11 13:31:31 +0800
• 48be57422a feat: hrm-empcontract 劳动合同 TianyangZhang 2026-03-11 13:31:30 +0800
• 809c14c123 fix:光芯日志选择物料组件更换成el-select shijing 2026-03-06 16:27:44 +0800
• 2aec38201a fix:禅道312开台人拆头人显示问题 shijing 2026-03-06 14:35:03 +0800
• bc15b06fa4 fix:禅道298 shijing 2026-03-06 14:32:34 +0800
• 061af195ec fix:光芯改版时不合批，不传new_batch shijing 2026-03-06 10:58:57 +0800
• ed4feb2f0c fix:交接类别完善 shijing 2026-03-06 09:09:23 +0800
• 281ff811c8 fix:禅道341 shijing 2026-03-05 14:11:13 +0800
• fdacb84301 fix:光芯已完成退火检验恢复 shijing 2026-03-05 09:03:32 +0800
• 04ae10aa40 fix:质检统计查询问题修复 shijing 2026-03-04 16:52:35 +0800
• 625df22d50 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2026-03-04 16:40:08 +0800
• 1e0c88639f fix:光芯本工段检验表和加工前检验表getQct获取时传入type:'in'/'out' shijing 2026-03-04 16:40:06 +0800
• 42bc028585 feat:gx-hrm 人员转正等修改 TianyangZhang 2026-03-04 16:36:57 +0800
• 17bc6c8428 fix:排扳统计查询条件文案提示 shijing 2026-03-04 10:50:55 +0800
• 6df332211c fix:禅道350 shijing 2026-03-04 10:50:17 +0800
• f22632090b fix:禅道344 shijing 2026-03-03 13:54:50 +0800
• 5a09b121fb fix:禅道348 shijing 2026-03-03 13:54:08 +0800
• 747b095995 fix:工时统计中热压相关表整合到一个页面 shijing 2026-03-02 16:50:11 +0800
• 33a45de918 fix:原料入库检验时导入报错提示展示返回信息 shijing 2026-03-02 15:16:12 +0800
• 3e9fc7f2c8 fix:禅道349 shijing 2026-02-27 11:14:51 +0800
• 33c97c1bd9 fix:光芯configData中columnWidth调整 shijing 2026-02-27 10:26:10 +0800
• fb3a821673 fix:禅道343 shijing 2026-02-27 09:05:22 +0800
• 7cb32833f1 fix:禅道347 shijing 2026-02-27 08:53:42 +0800
• f3021a2357 fix:禅道346 shijing 2026-02-27 08:52:36 +0800
• fe96ccde0f fix:禅道343 shijing 2026-02-10 14:23:29 +0800
• 2f2928fcb0 fix:日志物料根据route的material_in筛选 shijing 2026-02-10 13:51:44 +0800
• 41db9a55f1 fix:排板统计和热压统计合并 shijing 2026-02-10 09:49:01 +0800
• ba988d0fd1 fix:产品库存查询按工序统计 shijing 2026-02-09 13:14:20 +0800
• fb196d1d9e fix:模具号统计有横压的将横压数据展示在模具号后面 shijing 2026-02-06 14:09:14 +0800
• c679907c31 fix:毛坯检测板段统计只展示有检测日期的 shijing 2026-02-06 14:07:55 +0800
• 95450d39ad feat:禅道331 shijing 2026-02-05 16:38:13 +0800
• 922492f590 fix:板段查询默认显示一条数据 shijing 2026-02-05 15:23:52 +0800
• 5a4c50e8e7 fix:热压检测数据 shijing 2026-02-05 14:05:38 +0800
• 0e0e25492c fix:检测统计报表板段统计日期倒置 shijing 2026-02-05 10:59:47 +0800
• f2ad7ca5e0 fix:热压生产数据板号展示 shijing 2026-02-05 10:24:36 +0800
• f8ef6300b3 fix:this指向问题修正 shijing 2026-02-05 10:23:38 +0800
• 0b60a04b76 fix:表头颜色调整 shijing 2026-02-05 10:23:03 +0800
• f144bfd627 feat:凹面检测统计 shijing 2026-02-05 10:18:22 +0800
• f363821228 fix:样式变动 shijing 2026-02-05 10:14:11 +0800
• 0617dce254 feat:板段查询页面添加最新日志和最近交接 shijing 2026-02-05 10:13:45 +0800
• 0faf237e43 fix:扭转日期变动时添加是否为空的判断 shijing 2026-02-04 10:38:06 +0800
• d21cc6bdf2 fix:工时统计->热压生产数据：列宽度调整 shijing 2026-02-04 09:54:03 +0800
• 29adfe2d7d fix:工时统计->热压生产数据：列宽度调整 shijing 2026-02-04 09:46:58 +0800
• 9c28cfff84 fix:工时统计->热压生产数据：对应字段调正 shijing 2026-02-04 09:41:17 +0800
• ca696a0685 fix: hrm-人员调岗 修改人员申请 TianyangZhang 2026-01-29 10:45:17 +0800
• 74daa6094b Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web TianyangZhang 2026-01-28 10:30:12 +0800
• b0cffc1777 feat: hrm-人员调岗申请 表单 TianyangZhang 2026-01-28 10:30:09 +0800
• e483f2c06c fix: shijing 2026-01-26 15:02:20 +0800
• c03e46b3a1 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2026-01-26 15:01:13 +0800
• 0b5542c95c feat: 禅道330 shijing 2026-01-26 15:01:10 +0800
• 993e46e21e Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web TianyangZhang 2026-01-26 14:13:26 +0800
• 46d6820575 feat: 新增hrm 人员调岗 TianyangZhang 2026-01-26 14:13:24 +0800
• 843113b7eb feat: 禅道312 shijing 2026-01-23 16:12:01 +0800
• 82f4b5aaa4 fix: 禅道329 shijing 2026-01-23 16:11:01 +0800
• 9147e6cd86 feat：上盘平磨合批时批次号默认：HP+模板+年月日 shijing 2026-01-23 10:55:00 +0800
• 2225d79500 fix: 排一次棒日志详情中oinfo_json中imageUrl不显示 shijing 2026-01-23 10:52:33 +0800
• fe05b22972 feat： 禅道320 shijing 2026-01-22 16:27:50 +0800
• c19540d9f5 fix: 查询修正 shijing 2026-01-22 16:25:54 +0800
• 931c45da11 feat: 禅道296 shijing 2026-01-22 15:53:12 +0800
• ca6b14c2fd feat: 禅道279 shijing 2026-01-21 16:50:34 +0800
• 2f192f4107 feat: 禅道321 shijing 2026-01-21 15:51:49 +0800
• 0f0620e8db feat: 禅道323 shijing 2026-01-21 15:27:48 +0800
• f93f7d3095 fix: 扭转输出中时间列调宽 shijing 2026-01-21 14:48:17 +0800
• c9b6e7bb31 feat: 禅道324 shijing 2026-01-21 14:32:19 +0800
• dfedb67cb8 feat: 禅道310 shijing 2026-01-21 11:22:27 +0800
• adbd936382 fix: 工艺路线排一次棒上传图片问题 shijing 2026-01-20 11:20:26 +0800
• 4d23c5467a fix: 数据集form名称、编号独占一行 shijing 2026-01-20 10:32:48 +0800
• ffdb8e10b1 feat: 禅道314 shijing 2026-01-19 14:28:15 +0800