Commit Graph

3640 Commits

Author SHA1 Message Date
shijing bea55dbe1b fix:下拉选项与表单数量统一用count_canmio 2025-10-20 16:38:29 +08:00
shijing 7509fa7b2a fix:玻纤陶瓷工艺步骤追踪方式新增编辑默认单个 2025-10-20 15:32:58 +08:00
shijing 1ce40eed02 fix:禅道130131 2025-10-20 14:54:02 +08:00
shijing 73d96c57da feat:统计分析->
库存统计 添加物料查询条件,以及右侧物料出入库记录的联动
2025-10-20 11:23:41 +08:00
caoqianming 354f82bd36 feat: base 优化ticket组件3 2025-10-17 16:35:54 +08:00
caoqianming 2996a6b2e6 feat: booking审批表单更改2 2025-10-17 13:57:40 +08:00
caoqianming 316776845e feat: base 优化ticket组件2 2025-10-17 13:57:23 +08:00
caoqianming ce728f0d07 feat: 相关审批表单更改 2025-10-17 13:19:05 +08:00
caoqianming 462cd5cede feat: base 优化ticket组件 2025-10-17 13:17:07 +08:00
caoqianming 20adbc9377 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-10-16 16:31:16 +08:00
caoqianming faaf0da208 feat: base workflow添加view_path2 2025-10-16 16:31:15 +08:00
zty e0469a388b Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-10-16 16:09:34 +08:00
zty 035230bddd feat:ofm 修改驳回到开始继续编辑 2025-10-16 16:09:33 +08:00
caoqianming fdd91f9cde fix: 合批后鼠标不聚焦了 2025-10-16 14:36:42 +08:00
zty 0cc43d62e0 feat: base submit_b_func需要在add和edit都能调用 2025-10-16 10:52:15 +08:00
zty c90321a264 feat: mlogbw_check_table 缺陷项保存不上 2025-10-16 08:55:44 +08:00
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
caoqianming 64a32fde2d feat: 优化工作流及相关组件 2025-09-28 15:54:22 +08:00
shijing c67bb938de fix:自动选中查询的行 2025-09-28 15:51:34 +08:00
shijing dd2d9466c3 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-28 15:37:15 +08:00
shijing 066e62a4c8 fix:sc-form-table完善 2025-09-28 15:37:13 +08:00
caoqianming 4a24198c43 feat: ticketd_b_start按钮颜色 2025-09-28 11:35:58 +08:00
caoqianming f1d6d717c4 feat: 对应修改routepack和handoverform 2025-09-28 10:22:07 +08:00
caoqianming 36d72090e2 feat: ticketd优化 2025-09-28 10:21:11 +08:00
caoqianming ddb620a2f0 feat: 传入ticket_ 2025-09-28 09:02:09 +08:00
caoqianming f10ab753e2 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-28 09:01:31 +08:00
caoqianming 680425be8a feat: 修改ticketd传入ticket_full_data 2025-09-28 09:01:30 +08:00
zty 4877082104 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-28 08:52:51 +08:00
zty cc0d813ae1 feat:印章管理 —增加审批 2025-09-28 08:52:49 +08:00
caoqianming bb992adbfe Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-26 16:57:51 +08:00
caoqianming bd46cb9eb7 feat: ticket_b_start优化submit_b_func的异常处理 2025-09-26 16:57:50 +08:00
shijing f802f71800 fix:预定修改 2025-09-26 16:30:53 +08:00
shijing 5d26c5fee5 fix:预定修改 2025-09-26 16:30:40 +08:00
shijing 8fae78121d fix:日志提交时传递wprs_id 2025-09-26 16:29:21 +08:00
zty eda14df89c Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-26 14:49:51 +08:00
shijing c49d086970 fix:日志提交后刷新列表 2025-09-26 14:03:16 +08:00
shijing 4b50910cdd fix:预定页面调整 2025-09-26 14:00:57 +08:00
shijing db46b1d878 fix:预定页面提取 2025-09-25 17:19:08 +08:00
shijing c1fbda96f0 fix:改版交接微调 2025-09-25 15:31:37 +08:00
shijing 67b517d4f8 fix:检测数据默认置空 2025-09-25 09:28:48 +08:00
shijing ff210937e9 fix:交接表单调整 2025-09-25 09:28:19 +08:00
shijing a842a1a358 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-25 08:54:43 +08:00
shijing b412841492 fix:会议室预约 2025-09-25 08:54:41 +08:00
zty cfc8529681 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-24 14:32:39 +08:00
zty 6fe7d72986 add: ofm-新增 车辆等信息 2025-09-24 14:19:06 +08:00
caoqianming 53ce3694be feat: 优化handover_form 2025-09-24 14:14:48 +08:00
caoqianming d445981929 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-24 14:14:27 +08:00
caoqianming 43d0223fa6 feat: base 优化ticket组件 2025-09-24 14:14:26 +08:00
shijing 8922fb610d fix:交接表单标题,改版默认更改批次号,原批次号+g 2025-09-24 13:05:18 +08:00
shijing 5166ee2b68 fix:完善页面 2025-09-24 09:39:37 +08:00
shijing eed04718d2 fix:声明mroom的update接口 2025-09-24 09:38:27 +08:00
shijing 4c0d3f0ba6 fix:会议室调整 2025-09-24 09:06:10 +08:00
shijing 402e30744e fix:毛坯检测汇总查询条件改动 2025-09-23 16:34:16 +08:00
caoqianming ca99eb54b3 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-23 15:11:48 +08:00
caoqianming 5b5ca62742 feat: 优化routepack_form 2025-09-23 15:11:47 +08:00
caoqianming 9ebf3e232b feat: base 优化ticket_b_start 2025-09-23 15:11:24 +08:00
shijing 641731dceb fix:工艺步骤序号自动填充 2025-09-23 14:27:11 +08:00
shijing 371326913e fix:毛坯检测汇总调整 2025-09-23 14:24:56 +08:00
caoqianming 83edbad12d feat: 优化routepack 添加wf组件 2025-09-23 13:24:15 +08:00
caoqianming a293bfe1ae Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-23 13:23:29 +08:00
caoqianming 8dab72dbcd feat: base 增加wf ticketd组件可在业务组件里加载 2025-09-23 13:23:28 +08:00
shijing bc873ccb66 fix:日志报错修正 2025-09-22 15:12:58 +08:00
shijing 5ce3889f3d fix:脱模测量日志详情获取板段滚圆的切片数 2025-09-22 14:40:17 +08:00
shijing 4deeb0fc54 fix:标签中的切片数量展示 2025-09-19 13:40:30 +08:00
shijing 6b05f21ce6 fix:标签中的切片数量展示 2025-09-19 11:27:21 +08:00
shijing d353df9c1d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-19 11:23:45 +08:00
shijing 67b6678033 fix:温度监测数据图表y轴从最小值开始 2025-09-19 11:23:43 +08:00
caoqianming 94516f4b47 feat: base wf添加myticket页面 2025-09-19 09:21:31 +08:00
caoqianming 2a3fa5b96f Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-19 09:21:08 +08:00
caoqianming d1d4c6e7f1 feat: base 完善原有wf页面 2025-09-19 09:21:06 +08:00
shijing 422bb84990 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-18 15:21:56 +08:00
shijing 89bd60c547 fix:去除冗余依赖 2025-09-18 15:21:54 +08:00
shijing 235e221606 fix:光芯大屏定时刷新页面 2025-09-18 13:54:22 +08:00
shijing 4984c6a9a4 fix:routepack方便以后修改 2025-09-18 10:11:20 +08:00
shijing cefd2173ff fix:快速创建调整 2025-09-18 09:30:44 +08:00
shijing 9f66afc6b2 fix:已提交日志详情关闭时,不刷新日志列表 2025-09-18 09:06:36 +08:00
shijing d108437769 fix:光芯质量统计添加两列班次 2025-09-17 16:58:29 +08:00
shijing c11ef69667 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-17 13:37:06 +08:00
shijing 368f080981 fix:日志详情按钮调整,wpr列表工序字段更新 2025-09-17 13:37:04 +08:00
caoqianming 2f1910fed6 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-17 11:02:01 +08:00
caoqianming 575a120e56 feat: base log添加耗时列 2025-09-17 11:02:00 +08:00
shijing 24104ca69c fix:日志输出物料编辑后只更新当前行 2025-09-17 10:18:46 +08:00
shijing 7abdfc7fc1 fix:日志输入物料表格高度自适应 2025-09-17 10:10:19 +08:00
shijing a32a4be6fa fix:已完成、未完成物料列表工序展示字段变更 2025-09-17 09:50:54 +08:00
shijing d7cc7a9065 fix:输出详情列表采集数据报错调整 2025-09-17 09:49:46 +08:00
shijing b128751889 fix:清除多余请求 2025-09-17 09:25:14 +08:00
shijing a49ea52d90 fix:输入物料详情table高度调整 2025-09-16 15:18:52 +08:00
shijing b31a325e1a fix:禅道65初步页面 2025-09-16 15:18:03 +08:00
shijing 6ff7e79c22 fix:排一次棒日志展示棒号 2025-09-16 10:08:01 +08:00
shijing 8c885e4cfc fix:监测数据测点展示nickname,坐标轴从小到大 2025-09-15 16:38:37 +08:00
shijing 34b2d4b4f0 fix:光子采购入库时批次默认为“无” 2025-09-15 16:27:15 +08:00
shijing f95fcaed90 fix:测点表单改变设备选择组件 2025-09-15 15:31:21 +08:00
shijing 8147af1d3c fix:玻纤9.13问题修改 2025-09-15 14:11:40 +08:00
shijing b363333029 fix:设备数据采集问题 2025-09-15 10:57:11 +08:00
shijing abaff8fe20 fix:选项检验提交时缺陷项的规则验证 2025-09-15 10:27:18 +08:00
shijing 96d0202421 fix:bx日志新增时工艺路线必选,日志提交可以没有结束时间 2025-09-12 15:03:33 +08:00
shijing 54e4732483 fix:交接总数计算 2025-09-12 10:10:54 +08:00
shijing 56489db00e fix:快速报工提交后操作微调 2025-09-12 10:10:24 +08:00
shijing 68d346bc42 fix:bug修正 2025-09-12 09:25:41 +08:00
shijing 6981147670 fix:日志提交时若无结束时间,则获取服务器当前时间,更新后再提交日志 2025-09-11 15:23:10 +08:00
shijing 3d53796fa5 fix:wpr抽屉先清空,再获取 2025-09-11 14:09:06 +08:00
shijing a30e7e0dcc fix:车间物料可以批次&板段切换查询 2025-09-11 14:08:26 +08:00
shijing 5d4b61e893 fix:防止网络慢时扫码乱批处理 2025-09-11 14:07:24 +08:00
shijing 4b27653e18 fix:更新结束时间后再执行提交 2025-09-11 14:06:25 +08:00
shijing 8a81741716 fix:特殊switch颜色 2025-09-11 14:05:23 +08:00
shijing 9c9a96a499 fix:交接记录显示接收工段 2025-09-10 14:08:35 +08:00
shijing 830f414c8c fix:日志列表中设备只在固定几个工段显示 2025-09-10 14:05:39 +08:00
shijing 0626b52641 fix:交接记录可多选 2025-09-10 09:56:06 +08:00
shijing 718660faaf fix:交接记录调整 2025-09-10 09:55:31 +08:00
shijing 333fbfaf84 fix:玻纤日志列表展示板段号 2025-09-09 14:58:18 +08:00
shijing b20337454c fix:只有合批才展示更改批次 2025-09-09 14:57:47 +08:00
shijing c85bac30e4 fix:模板添加横压 2025-09-09 13:27:01 +08:00
shijing 0c7fe5bfed fix:若无结束日期日志提交前,先保存结束时间 2025-09-09 13:26:07 +08:00
shijing eef14ca7eb fix:玻纤工段列表显示班次规则 2025-09-09 13:25:06 +08:00
shijing 67794e1669 fix:日志中主要批次和次要批次展示问题修改 2025-09-08 17:02:45 +08:00
shijing e092dacb4d fix:交接中数量延时统计 2025-09-08 17:01:51 +08:00
shijing 29f67226fa fix:批次统计中生产日志以工序排序 2025-09-08 17:01:00 +08:00
shijing 44d7a0856f fix:点击批次号分批只在光锥一体刀可以 2025-09-08 16:44:11 +08:00
shijing 03b386d6fe fix:若日志没有结束时间,提交时间作为结束时间和处理时间 2025-09-08 09:46:18 +08:00
shijing a3711e577f fix:日志展示原料棒号 2025-09-08 08:58:06 +08:00
shijing aea714bca7 fix:玻纤输出物料编号可编辑 2025-09-08 08:54:38 +08:00
shijing 460a69efee fix:玻纤日志设备获取班组设备 2025-09-08 08:53:01 +08:00
shijing abdf6c64ec fix:光芯原料库去掉检验 2025-09-05 15:11:30 +08:00
shijing 519c370cee fix:辅料库物料名称只显示name 2025-09-05 14:52:02 +08:00
shijing fa1265f100 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web 2025-09-05 14:34:38 +08:00
shijing cd918e0e11 fix:默认参数null 2025-09-05 14:34:36 +08:00
zty c87363a58a Merge branch 'master' of http://10.0.11.51:3000/zcdsj/factory_web 2025-09-05 10:47:15 +08:00
zty adeacb865e fix: merge 2025-09-05 10:47:10 +08:00
zty b0063b6052 feat: 添加会议预定相关页面 2025-09-05 10:44:15 +08:00
shijing b37296f460 fix:辅料库出入库明细筛选修正 2025-09-04 14:42:28 +08:00
shijing 4784a996f5 fix:员工工时统计 2025-09-04 14:01:39 +08:00
shijing 60f00d62de fix:监测数据图表中数字保留三位小数 2025-09-04 11:08:24 +08:00
shijing 9040ed8f8e fix:车间物料筛选 2025-09-04 08:42:55 +08:00
shijing 392d6129d1 feat:iqc检验列表 2025-09-03 17:05:25 +08:00
shijing 8c545f3705 fix: 检验大表需按照班次筛选 2025-09-03 16:29:40 +08:00
shijing bb67831a61 fix:禅道85、86 2025-09-03 11:28:35 +08:00
shijing 1d9fa46ba9 fix:禅道85、86 2025-09-03 10:55:15 +08:00
shijing 5f8886265d fix:统计页面 2025-09-02 16:27:22 +08:00
shijing 71638d4fc4 fix:routec查询参数变动 2025-09-02 16:26:53 +08:00
shijing 64dc7ccfea fix:fmlog->mlog创建时batch传参 2025-09-02 11:22:08 +08:00
shijing 66204d79ff fix:展示字段引用错误修正 2025-09-02 09:48:31 +08:00
shijing 546a51fd2d fix:光芯日志中工作开始时间必传 2025-09-02 09:33:47 +08:00
shijing dc5c0ebd49 fix:原料检验提交 2025-09-02 09:01:31 +08:00
shijing ec2310b821 fix:原料库添加检验 2025-09-01 16:53:41 +08:00
shijing 1332fed2c9 fix:陶瓷放开追踪方式 2025-09-01 16:51:39 +08:00
shijing 5823759669 fix:光芯车间库存物料状态筛选传参问题修正 2025-09-01 13:12:44 +08:00
shijing 0443ee42e9 fix:输出物料检验为空白数据时提示报错的修改 2025-09-01 10:40:12 +08:00
shijing 9b43129147 fix:that替换 2025-09-01 09:14:53 +08:00
shijing e5b80c3c8c fix:bx大箱标签控制显示 2025-09-01 09:12:57 +08:00
shijing 8624657790 fix:出版毛坯检测统计 2025-08-29 14:56:10 +08:00
shijing 8cee440559 fix:光芯交接记录编辑按钮错误修改 2025-08-29 14:55:51 +08:00