Commit Graph

Select branches

Hide Pull Requests

base

gzerp

master

scui

2.6.2025031916

2.6.2025040209

Mono Color

• bea55dbe1b fix:下拉选项与表单数量统一用count_canmio master shijing 2025-10-20 16:38:29 +0800
• 7509fa7b2a fix:玻纤陶瓷工艺步骤追踪方式新增编辑默认单个 shijing 2025-10-20 15:32:58 +0800
• 1ce40eed02 fix:禅道130131 shijing 2025-10-20 14:54:02 +0800
• 73d96c57da feat:统计分析-> 库存统计 添加物料查询条件，以及右侧物料出入库记录的联动 shijing 2025-10-20 11:23:41 +0800
• 354f82bd36 feat: base 优化ticket组件3 caoqianming 2025-10-17 16:35:54 +0800
• 2996a6b2e6 feat: booking审批表单更改2 caoqianming 2025-10-17 13:57:40 +0800
• 316776845e feat: base 优化ticket组件2 caoqianming 2025-10-17 13:57:23 +0800
• ce728f0d07 feat: 相关审批表单更改 caoqianming 2025-10-17 13:19:05 +0800
• 462cd5cede feat: base 优化ticket组件 caoqianming 2025-10-17 13:17:07 +0800
• 20adbc9377 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-10-16 16:31:16 +0800
• faaf0da208 feat: base workflow添加view_path2 caoqianming 2025-10-16 16:31:15 +0800
• e0469a388b Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web zty 2025-10-16 16:09:34 +0800
• 035230bddd feat:ofm 修改驳回到开始继续编辑 zty 2025-10-16 16:09:33 +0800
• fdd91f9cde fix: 合批后鼠标不聚焦了 caoqianming 2025-10-16 14:36:42 +0800
• 0cc43d62e0 feat: base submit_b_func需要在add和edit都能调用 zty 2025-10-16 10:52:15 +0800
• c90321a264 feat: mlogbw_check_table 缺陷项保存不上 zty 2025-10-16 08:55:44 +0800
• 3da6e02814 feat: ofm-borrow 修改档案借阅审批流 zty 2025-10-15 15:43:02 +0800
• f3b24924f3 Revert "fix:预定功能完善" 恢复到当前最新版本 zty 2025-10-15 15:18:54 +0800
• 4bb288cc16 Revert "fix:问题修正" 回退到 10-11 日最后一次提交 zty 2025-10-15 13:40:21 +0800
• b4b1f92c9a Revert "fix:检验设备默认上一次的设备" zty 2025-10-15 13:15:30 +0800
• c33a1e3c80 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web zty 2025-10-14 16:48:25 +0800
• a1444ca06f feat: ofm 修改车辆 印章的审批管理 以及 反存ticket_data zty 2025-10-14 16:48:23 +0800
• ed4c915125 fix:禅道124 shijing 2025-10-14 14:21:38 +0800
• 7fd149693e fix:禅道125 shijing 2025-10-14 13:45:51 +0800
• 79cec10102 fix：新增辅料时传参type：40 shijing 2025-10-14 11:20:32 +0800
• 1c87245eb8 fix:光芯辅料出入库详情撤回并删除 shijing 2025-10-14 11:11:23 +0800
• 233c178480 fix:物料清单辅料展示是否入车间库存 shijing 2025-10-14 10:45:23 +0800
• ed6501057b fix：审批详情处理 shijing 2025-10-14 10:31:57 +0800
• f968b951f4 fix:检验设备默认上一次的设备 shijing 2025-10-13 16:19:39 +0800
• f7ab449054 fix:工艺路线输入物料按-create_time排序 shijing 2025-10-13 16:13:31 +0800
• d99f14d543 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-10-13 15:03:48 +0800
• e9cf1db534 fix:针对剪切值18mm的判定条件更改 shijing 2025-10-13 15:03:46 +0800
• 8382275e67 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web zty 2025-10-13 14:30:28 +0800
• c68ce9998f feat: gx-ofm- 行政管理 + 宣传报道模块 zty 2025-10-13 14:30:26 +0800
• 1f63a0741d fix:预定功能完善 shijing 2025-10-13 10:15:41 +0800
• 8722d6de5d fix:问题修正 shijing 2025-10-11 15:05:39 +0800
• 7f9cd6dbc1 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-10-11 15:04:34 +0800
• 805ff13f79 fix:日志获取服务器时间 shijing 2025-10-11 15:04:32 +0800
• f1020a3f48 fix:更新版本号 gzerp shijing 2025-10-11 10:20:30 +0800
• b6f7509362 fix:光子日志回退到不需要传work_start_time shijing 2025-10-11 10:05:49 +0800
• 469d9ca3de fix:光子日志添加work_start_time shijing 2025-10-10 16:54:53 +0800
• 205a5ddf4e fix:光子日志添加work_start_time shijing 2025-10-10 16:16:17 +0800
• 62ed6a66bb fix:性能检验修正 shijing 2025-10-10 09:37:51 +0800
• a4bdf76840 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web zty 2025-10-10 09:19:53 +0800
• b2b6346a9b feat: 光芯-行政管理 zty 2025-10-10 09:19:50 +0800
• 9b7df41a5a Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-10-10 08:57:55 +0800
• 426a43b80e fix: 移除handover_form中的ticketd_b_start init caoqianming 2025-10-10 08:57:54 +0800
• 410fb7f34a fix:光芯质量查询查询条件修正 shijing 2025-10-10 08:42:46 +0800
• de016d48bf Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-10-09 16:08:33 +0800
• ea1824295a feat: base submit_b_func只在t_id不存在时调用 caoqianming 2025-10-09 16:08:32 +0800
• e962b9661c Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web zty 2025-10-09 13:43:00 +0800
• 8c66b11b9e feat: enm-修改tkx 水泥包装的单位电耗 zty 2025-10-09 13:42:57 +0800
• 9c46866c81 fix:毛坯检测_缺陷_变更为_含缺陷_ shijing 2025-10-09 10:45:44 +0800
• c741ced8ee fix:光芯交接记录展示文件 shijing 2025-10-09 10:03:49 +0800
• 9ce4971ec7 fix:光芯辅料库添加导出 shijing 2025-10-09 09:51:55 +0800
• 1c61925eac fix:预定页面调整 shijing 2025-10-09 09:03:20 +0800
• 9763429d23 fix:毛坯检测统计板段排序 shijing 2025-09-30 09:23:56 +0800
• 595de779e1 fix:禅道112 shijing 2025-09-30 08:44:16 +0800
• 96689b7274 feat:设备打签 shijing 2025-09-30 08:42:51 +0800
• 38b6c60b96 fix:分批只在一体刀工段展示 shijing 2025-09-29 11:24:18 +0800
• 7882e9ddb8 feat: base 自适应容器和自动缩放2 caoqianming 2025-09-29 11:18:55 +0800
• 9bf8b968fc feat: 对应的修改 caoqianming 2025-09-29 10:47:19 +0800
• f84cfb334e feat: base 自适应容器和自动缩放 caoqianming 2025-09-29 10:46:07 +0800
• 3706d30b82 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-09-29 09:43:37 +0800
• a212337b3a feat: base 流程图边的处理 caoqianming 2025-09-29 09:43:36 +0800
• 59b35b10f3 fix:析晶状态默认为空 shijing 2025-09-28 17:18:27 +0800
• a722292c57 fix:更改版本号 shijing 2025-09-28 16:47:56 +0800
• d470bad81b fix:成品入库时需要库存人员点击接收 shijing 2025-09-28 16:47:16 +0800
• 0e7260e653 fix:光芯辅料改为辅材 shijing 2025-09-28 16:46:22 +0800
• 853d1bc760 fix:禅道111 shijing 2025-09-28 16:07:13 +0800
• 72339aa0f4 feat: 优化routepack_form caoqianming 2025-09-28 15:54:35 +0800
• 80c07d6ac6 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-09-28 15:54:23 +0800
• 64a32fde2d feat: 优化工作流及相关组件 caoqianming 2025-09-28 15:54:22 +0800
• c67bb938de fix:自动选中查询的行 shijing 2025-09-28 15:51:34 +0800
• dd2d9466c3 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-09-28 15:37:15 +0800
• 066e62a4c8 fix:sc-form-table完善 shijing 2025-09-28 15:37:13 +0800
• 4a24198c43 feat: ticketd_b_start按钮颜色 caoqianming 2025-09-28 11:35:58 +0800
• f1d6d717c4 feat: 对应修改routepack和handoverform caoqianming 2025-09-28 10:22:07 +0800
• 36d72090e2 feat: ticketd优化 caoqianming 2025-09-28 10:21:11 +0800
• ddb620a2f0 feat: 传入ticket_ caoqianming 2025-09-28 09:02:09 +0800
• f10ab753e2 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-09-28 09:01:31 +0800
• 680425be8a feat: 修改ticketd传入ticket_full_data caoqianming 2025-09-28 09:01:30 +0800
• 4877082104 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web zty 2025-09-28 08:52:51 +0800
• cc0d813ae1 feat:印章管理 —增加审批 zty 2025-09-28 08:52:49 +0800
• bb992adbfe Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web caoqianming 2025-09-26 16:57:51 +0800
• bd46cb9eb7 feat: ticket_b_start优化submit_b_func的异常处理 caoqianming 2025-09-26 16:57:50 +0800
• f802f71800 fix:预定修改 shijing 2025-09-26 16:30:53 +0800
• 5d26c5fee5 fix:预定修改 shijing 2025-09-26 16:30:40 +0800
• 8fae78121d fix:日志提交时传递wprs_id shijing 2025-09-26 16:29:21 +0800
• eda14df89c Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web zty 2025-09-26 14:49:51 +0800
• c49d086970 fix:日志提交后刷新列表 shijing 2025-09-26 14:03:16 +0800
• 4b50910cdd fix:预定页面调整 shijing 2025-09-26 14:00:57 +0800
• db46b1d878 fix:预定页面提取 shijing 2025-09-25 17:19:08 +0800
• c1fbda96f0 fix:改版交接微调 shijing 2025-09-25 15:31:37 +0800
• 67b517d4f8 fix:检测数据默认置空 shijing 2025-09-25 09:28:48 +0800
• ff210937e9 fix:交接表单调整 shijing 2025-09-25 09:28:19 +0800
• a842a1a358 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web shijing 2025-09-25 08:54:43 +0800
• b412841492 fix:会议室预约 shijing 2025-09-25 08:54:41 +0800
• cfc8529681 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web zty 2025-09-24 14:32:39 +0800
• 6fe7d72986 add: ofm-新增 车辆等信息 zty 2025-09-24 14:19:06 +0800