Commit Graph

3587 Commits

Author SHA1 Message Date
zty 3da6e02814 feat: ofm-borrow 修改档案借阅审批流 2025-10-15 15:43:02 +08:00
zty f3b24924f3 Revert "fix:预定功能完善" 恢复到当前最新版本
This reverts commit 1f63a0741d.
2025-10-15 15:18:54 +08:00
zty 4bb288cc16 Revert "fix:问题修正" 回退到 10-11 日最后一次提交
This reverts commit 8722d6de5d.
2025-10-15 13:40:21 +08:00
zty b4b1f92c9a Revert "fix:检验设备默认上一次的设备"
This reverts commit f968b951f4.
2025-10-15 13:15:30 +08:00
zty c33a1e3c80 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-10-14 16:48:25 +08:00
zty a1444ca06f feat: ofm 修改车辆 印章的审批管理 以及 反存ticket_data 2025-10-14 16:48:23 +08:00
shijing ed4c915125 fix:禅道124 2025-10-14 14:21:38 +08:00
shijing 7fd149693e fix:禅道125 2025-10-14 13:45:51 +08:00
shijing 79cec10102 fix:新增辅料时传参type:40 2025-10-14 11:20:32 +08:00
shijing 1c87245eb8 fix:光芯辅料出入库详情撤回并删除 2025-10-14 11:11:23 +08:00
shijing 233c178480 fix:物料清单辅料展示是否入车间库存 2025-10-14 10:45:23 +08:00
shijing ed6501057b fix:审批详情处理 2025-10-14 10:31:57 +08:00
shijing f968b951f4 fix:检验设备默认上一次的设备 2025-10-13 16:19:39 +08:00
shijing f7ab449054 fix:工艺路线输入物料按-create_time排序 2025-10-13 16:13:31 +08:00
shijing d99f14d543 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-10-13 15:03:48 +08:00
shijing e9cf1db534 fix:针对剪切值18mm的判定条件更改 2025-10-13 15:03:46 +08:00
zty 8382275e67 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-10-13 14:30:28 +08:00
zty c68ce9998f feat: gx-ofm- 行政管理 + 宣传报道模块 2025-10-13 14:30:26 +08:00
shijing 1f63a0741d fix:预定功能完善 2025-10-13 10:15:41 +08:00
shijing 8722d6de5d fix:问题修正 2025-10-11 15:05:39 +08:00
shijing 7f9cd6dbc1 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-10-11 15:04:34 +08:00
shijing 805ff13f79 fix:日志获取服务器时间 2025-10-11 15:04:32 +08:00
zty a4bdf76840 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-10-10 09:19:53 +08:00
zty b2b6346a9b feat: 光芯-行政管理 2025-10-10 09:19:50 +08:00
caoqianming 9b7df41a5a Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-10-10 08:57:55 +08:00
caoqianming 426a43b80e fix: 移除handover_form中的ticketd_b_start init 2025-10-10 08:57:54 +08:00
shijing 410fb7f34a fix:光芯质量查询查询条件修正 2025-10-10 08:42:46 +08:00
caoqianming de016d48bf Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-10-09 16:08:33 +08:00
caoqianming ea1824295a feat: base submit_b_func只在t_id不存在时调用 2025-10-09 16:08:32 +08:00
zty e962b9661c Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-10-09 13:43:00 +08:00
zty 8c66b11b9e feat: enm-修改tkx 水泥包装的单位电耗 2025-10-09 13:42:57 +08:00
shijing 9c46866c81 fix:毛坯检测_缺陷_变更为_含缺陷_ 2025-10-09 10:45:44 +08:00
shijing c741ced8ee fix:光芯交接记录展示文件 2025-10-09 10:03:49 +08:00
shijing 9ce4971ec7 fix:光芯辅料库添加导出 2025-10-09 09:51:55 +08:00
shijing 1c61925eac fix:预定页面调整 2025-10-09 09:03:20 +08:00
shijing 9763429d23 fix:毛坯检测统计板段排序 2025-09-30 09:23:56 +08:00
shijing 595de779e1 fix:禅道112 2025-09-30 08:44:16 +08:00
shijing 96689b7274 feat:设备打签 2025-09-30 08:42:51 +08:00
shijing 38b6c60b96 fix:分批只在一体刀工段展示 2025-09-29 11:24:18 +08:00
caoqianming 7882e9ddb8 feat: base 自适应容器和自动缩放2 2025-09-29 11:18:55 +08:00
caoqianming 9bf8b968fc feat: 对应的修改 2025-09-29 10:47:19 +08:00
caoqianming f84cfb334e feat: base 自适应容器和自动缩放 2025-09-29 10:46:07 +08:00
caoqianming 3706d30b82 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-29 09:43:37 +08:00
caoqianming a212337b3a feat: base 流程图边的处理 2025-09-29 09:43:36 +08:00
shijing a722292c57 fix:更改版本号 2025-09-28 16:47:56 +08:00
shijing d470bad81b fix:成品入库时需要库存人员点击接收 2025-09-28 16:47:16 +08:00
shijing 0e7260e653 fix:光芯辅料改为辅材 2025-09-28 16:46:22 +08:00
shijing 853d1bc760 fix:禅道111 2025-09-28 16:07:13 +08:00
caoqianming 72339aa0f4 feat: 优化routepack_form 2025-09-28 15:54:35 +08:00
caoqianming 80c07d6ac6 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-28 15:54:23 +08:00