Commit Graph

Select branches

Hide Pull Requests

base

gzerp

master

scui

2.6.2025031916

2.6.2025040209

Mono Color

• c59c15167d 原料废品库展示 master shijing 2025-12-08 14:16:18 +0800
• 8142fbf43a fix:未定义字段添加 shijing 2025-12-08 14:15:52 +0800
• 34a80119e6 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-12-08 14:15:18 +0800
• a6ac97a906 fix:工序带板段号打印模板添加切片总数 shijing 2025-12-08 14:15:16 +0800
• d2b0ed6f67 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web TianyangZhang 2025-12-08 10:03:29 +0800
• d4416d7c6e fix:修改tkx 各个模块的环比增长率 TianyangZhang 2025-12-08 10:03:26 +0800
• 75fbd857e7 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-12-05 18:35:31 +0800
• 400b41ba87 feat: 调整主页配置 caoqianming 2025-12-05 18:35:30 +0800
• ee65f15665 fix:库存统计变更接口materialCount2 shijing 2025-12-05 15:09:56 +0800
• 086c7a2a6b fix:禅道218 shijing 2025-12-05 14:18:02 +0800
• 1e4e7c0459 fix:禅道219 shijing 2025-12-05 13:44:13 +0800
• b52b99e122 fix:检验表列宽度调整 shijing 2025-12-05 13:39:28 +0800
• d79283f41e fix:12.04光芯改动 shijing 2025-12-05 11:25:21 +0800
• 8c712acfd9 fix:外协工段生产领料展示按钮 shijing 2025-12-05 09:35:40 +0800
• ea8b468da2 fix:出入库记录表单中选择添加筛选 shijing 2025-12-05 09:22:07 +0800
• 1a323e7326 fix:inm库管人员查询条件更改 shijing 2025-12-04 16:29:26 +0800
• 0fe3e273ae fix:废品库使用工段模板 shijing 2025-12-04 15:39:45 +0800
• 410e48a5d3 fix:玻纤日志中子工序问题修改 shijing 2025-12-04 15:39:10 +0800
• 7d3b8d3b46 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-12-04 15:33:58 +0800
• 52cfa8db22 fix:禅道175 shijing 2025-12-04 15:33:56 +0800
• 2e54a33aaf fix:修改凌源能管大屏 资源泄露问题 TianyangZhang 2025-12-04 15:29:40 +0800
• 8ed0bd9d29 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web TianyangZhang 2025-12-04 10:25:08 +0800
• b2ddc57179 fix:仓库执行人查询posts__code__contains: "inm" shijing 2025-12-04 09:47:08 +0800
• 04a468ee7e fix:yuanliaofeipinku shijing 2025-12-04 09:18:44 +0800
• 554031e0bf Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-12-03 15:08:12 +0800
• f558d282b7 fix:禅道198 shijing 2025-12-03 15:08:10 +0800
• 33094c8161 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-12-03 13:25:09 +0800
• d817601437 feat: base 优化工作流配置的参与人选择等 caoqianming 2025-12-03 13:25:08 +0800
• 69c63eea06 fix:生产执行出入库记录 shijing 2025-12-03 13:17:27 +0800
• b25d87ea89 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web TianyangZhang 2025-12-03 09:37:58 +0800
• d4f884b3b5 fix: 修改 专利 论文 平台 反存功能 TianyangZhang 2025-12-03 09:37:57 +0800
• bedc4b0d45 fix:玻纤日志子工序新增时报错修正 shijing 2025-12-03 09:32:20 +0800
• 0708b2a2fa Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-12-03 09:31:13 +0800
• d17c602384 fix:玻纤日志输入详情扭转工段可新增wpr shijing 2025-12-03 09:31:11 +0800
• d2f41f69ab Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-12-02 18:38:27 +0800
• 988d693678 feat: base scTable queryData不clearSelection caoqianming 2025-12-02 18:38:26 +0800
• 76d3cc25cc fix:库存统计修正 shijing 2025-12-02 17:02:13 +0800
• 84562cfb37 fix:表格优化 shijing 2025-12-02 16:16:01 +0800
• aff4bcc201 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-12-02 16:15:45 +0800
• d346ee1598 fix:玻纤交接问题修改 shijing 2025-12-02 16:15:43 +0800
• 815ba44b77 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web TianyangZhang 2025-12-02 14:48:05 +0800
• 5f57220a71 fix: 修改tkx precen && consume_precen 存在的bug TianyangZhang 2025-12-02 14:48:02 +0800
• 4f2162d496 fix:mioitem统计修正 shijing 2025-12-02 11:06:29 +0800
• 13e32911ac fix:表格优化 shijing 2025-12-02 11:03:53 +0800
• b2f0a4f74a fix:喷码时可以选择设备 shijing 2025-12-02 11:01:26 +0800
• 99f6c740c8 fix: 子工序操作记录更改 shijing 2025-12-01 16:49:27 +0800
• 97c7172306 fix:玻纤勾选后点击“合批”后获取wpr列表展示 shijing 2025-12-01 14:33:21 +0800
• 973d3485ed Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-12-01 14:23:20 +0800
• ccad811e32 fix:玻纤混批加料原理为改版，撤销变动（有可能是不同工段的板段合批） shijing 2025-12-01 14:23:18 +0800
• 61bfe8c21c Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-12-01 13:49:04 +0800
• 15d3e64f02 fix: mroombooking在初始状态编辑时slot问题 caoqianming 2025-12-01 13:49:03 +0800
• 22c8f79cc3 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-12-01 13:14:58 +0800
• 5d4300fcb6 fix:玻纤混批加料 shijing 2025-12-01 13:14:56 +0800
• c1c5968875 feat: base ticketd_b先创建再提交防止连续接口报错 caoqianming 2025-12-01 10:50:08 +0800
• c037c56347 fix:禅道199 shijing 2025-11-28 17:10:56 +0800
• 7ecafc6495 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-11-28 16:15:58 +0800
• 682f5a2052 fix:工艺路线变更组件 shijing 2025-11-28 16:15:56 +0800
• 1d27409939 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-11-28 15:37:15 +0800
• fbd3fd5ad0 feat: materials列表去除总库存列 caoqianming 2025-11-28 15:37:14 +0800
• e18a9544dc fix:玻纤日志输入物料列表隐藏刷新按钮 shijing 2025-11-28 14:35:49 +0800
• 39f080a629 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-11-28 14:25:54 +0800
• 49b18aa41e fix:玻纤日志输出物料展示table改为原生 shijing 2025-11-28 14:25:52 +0800
• 94066ee14d feat: resignatioin添加查询条件 caoqianming 2025-11-28 10:08:18 +0800
• c603210fdb feat: handover_form优化 caoqianming 2025-11-28 10:06:18 +0800
• 9d25731707 feat: 优化sc-upload-file caoqianming 2025-11-28 10:02:57 +0800
• da21d42968 feat: 黑化大屏统计修改为7:00 caoqianming 2025-11-28 08:43:24 +0800
• f1889ac062 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-11-26 16:47:29 +0800
• fe3b653890 fix:玻纤输出物料表单元格宽度调整 shijing 2025-11-26 16:47:26 +0800
• 5eeb4fd498 fix : srm 修改论文审批 反存 论文台账 TianyangZhang 2025-11-26 09:35:46 +0800
• 00dd3473dc Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web TianyangZhang 2025-11-25 16:47:12 +0800
• 4a6b604e88 fix : srm 修改 提交专利审批和论文同时生成台账 TianyangZhang 2025-11-25 16:47:10 +0800
• 98886813e1 fix:禅道205 shijing 2025-11-25 15:41:41 +0800
• 906f59aa52 fix:光芯日志oinfo_json保存 shijing 2025-11-25 14:05:27 +0800
• 4b361a734c fix:光芯车间看板车间库存展示前100条，并传入query shijing 2025-11-25 13:47:58 +0800
• 5f00dc2b0c fix:光芯黑化、退火日志reminder_interval_list列表 shijing 2025-11-25 13:33:24 +0800
• 3538d68c9c Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-11-25 13:19:03 +0800
• 30cd56f6fc fix:光芯退火日志结束时间 shijing 2025-11-25 13:19:01 +0800
• 8794e6a4b4 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-11-25 11:00:03 +0800
• febde751c3 fix: base user界面显示优化 caoqianming 2025-11-25 11:00:02 +0800
• 6a64f944ff fix:输出手动添加bw shijing 2025-11-25 10:36:06 +0800
• faacaa8d8e Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-11-24 16:02:26 +0800
• f25380f64b fix:光芯采购入库时数量max不能为0 shijing 2025-11-24 16:02:24 +0800
• 3dca361325 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-11-24 14:26:40 +0800
• 544c5f2b43 feat: resignation改成ticketmixin形式 caoqianming 2025-11-24 14:26:39 +0800
• 1049053a82 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-11-24 11:06:11 +0800
• 3f86291791 fix:工艺路线中params_json复现 shijing 2025-11-24 11:06:07 +0800
• b56f1e9b32 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-11-24 09:00:34 +0800
• bc9effd983 feat: base ticket_b退化到setTimeout后执行 caoqianming 2025-11-24 09:00:33 +0800
• ade3cb8398 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-11-21 16:51:25 +0800
• 3ec61d3bd3 fix:禅道183 shijing 2025-11-21 16:51:23 +0800
• 2b63930012 fix: base ticketd_b 非操作人也显示出按钮 caoqianming 2025-11-21 16:41:35 +0800
• a3b2913e1e feat: base ticketd添加提交人 caoqianming 2025-11-21 16:25:08 +0800
• 606bc5e9a7 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-11-21 16:09:42 +0800
• 8b2bd9adff feat: mroombooking wf_key caoqianming 2025-11-21 16:09:41 +0800
• e92d35ee52 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-11-21 14:38:01 +0800
• 60ed2579d6 feat:光芯成品出库mioitem列表底部添加统计行 shijing 2025-11-21 14:37:25 +0800
• 4bd3007e0d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web TianyangZhang 2025-11-21 14:33:21 +0800
• af82feb7dc add : ofm -vehicle 修改车辆信息 TianyangZhang 2025-11-21 14:33:19 +0800
• 171545b918 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-11-21 14:27:55 +0800
• 0f0bd39e7b feat: 修改mroombooking表单名称 caoqianming 2025-11-21 14:27:33 +0800