 TianyangZhang
|
a40dd9079a
|
feat: ofm-veicle 修改车辆审批
|
2025-11-05 17:41:42 +08:00 |
|
TianyangZhang
|
be9db47732
|
feat: ofm-seal 修改form 表单
|
2025-11-05 16:58:57 +08:00 |
|
TianyangZhang
|
3af6cba243
|
feat: ofm-seal bug fix
|
2025-11-05 16:10:12 +08:00 |
|
TianyangZhang
|
dae7fe36c4
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-05 15:54:49 +08:00 |
|
TianyangZhang
|
3faf0fd760
|
feat: base 优化ticketd
|
2025-11-05 15:54:48 +08:00 |
 shijing
|
087bd5c50e
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-05 13:21:46 +08:00 |
|
shijing
|
14a41a29f0
|
feat:禅道149，黑化车间看板变更
|
2025-11-05 13:21:44 +08:00 |
|
TianyangZhang
|
fbad9178ff
|
feat: booking 优化
|
2025-11-05 11:10:37 +08:00 |
|
shijing
|
3ae9e207f3
|
fix:玻纤原料单件打印时添加材料名称
|
2025-11-05 09:38:58 +08:00 |
|
shijing
|
3164bca91a
|
fix:玻纤单件打印时添加材料名称
|
2025-11-05 09:22:15 +08:00 |
|
shijing
|
8a33f72193
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-04 16:42:25 +08:00 |
|
shijing
|
296fdfb165
|
fix:会议室预定调整
|
2025-11-04 16:42:22 +08:00 |
|
TianyangZhang
|
041b1108ec
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-04 13:40:04 +08:00 |
|
TianyangZhang
|
2d6e8ad5a6
|
feat: srm- 增加科研管理审批模块
|
2025-11-04 13:40:00 +08:00 |
|
shijing
|
de715b4ae3
|
feat:禅道148减薄车间看板变动
|
2025-11-04 11:19:01 +08:00 |
|
shijing
|
9b73e7eb32
|
fix:defect调整
|
2025-11-04 11:08:32 +08:00 |
|
shijing
|
50ef851482
|
fix:玻纤工艺界面把分页去掉
|
2025-11-04 11:00:51 +08:00 |
|
shijing
|
ea830b5246
|
feat:玻纤排一次棒，输出的物料编号，点击编辑做成可以修改的
|
2025-11-04 10:59:40 +08:00 |
|
shijing
|
a4402edf92
|
fix:库存辅助材料下载
|
2025-11-04 09:19:27 +08:00 |
|
shijing
|
b181a3717e
|
fix:玻纤检验批量操作问题修正
|
2025-11-04 09:04:35 +08:00 |
|
shijing
|
adef92c959
|
fix:光芯库存统计问题修正
|
2025-11-04 09:00:44 +08:00 |
 caoqianming
|
d3d35950ee
|
feat: 成品库导出修改
|
2025-11-02 00:52:17 +08:00 |
|
caoqianming
|
c8bd8fa2c4
|
feat: scTable优化表格导出
|
2025-11-02 00:51:15 +08:00 |
|
caoqianming
|
176ad3e233
|
feat: worktask修改引入文件
|
2025-11-02 00:23:26 +08:00 |
|
caoqianming
|
dce7e72d8f
|
feat: 成品库导出功能
|
2025-11-02 00:23:02 +08:00 |
|
caoqianming
|
48ea04138b
|
feat: base 所有表格增加通用导出方法
|
2025-11-02 00:22:29 +08:00 |
|
shijing
|
a0814191a7
|
fix:员工生产及缺陷统计初版页面
|
2025-10-31 10:53:47 +08:00 |
|
shijing
|
e3a5eb9567
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-10-30 16:59:18 +08:00 |
|
shijing
|
de77eeb687
|
fix:毛坯检测修正
|
2025-10-30 16:59:16 +08:00 |
|
TianyangZhang
|
b37c020482
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-10-30 15:39:28 +08:00 |
|
TianyangZhang
|
6a9cc84577
|
feat:ofm 增加论文申密
|
2025-10-30 15:39:27 +08:00 |
|
shijing
|
c73df6ffa2
|
fix:毛坯检测修正
|
2025-10-30 14:17:05 +08:00 |
|
shijing
|
33040f0ccc
|
fix:员工工时统计
|
2025-10-29 16:28:00 +08:00 |
|
shijing
|
da13175ebb
|
fix:毛坯检测改动
|
2025-10-29 16:27:34 +08:00 |
|
shijing
|
c4adfa8680
|
fix:禅道142
|
2025-10-28 15:36:23 +08:00 |
|
shijing
|
f9694f0466
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-10-28 15:34:41 +08:00 |
|
shijing
|
980feee20b
|
fix:禅道139配置工艺，新增的时候，如果是切分工艺就让他编辑切分数量，如果是常规工艺就不让编辑
|
2025-10-28 15:34:39 +08:00 |
|
caoqianming
|
360277ea5b
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-10-28 14:36:15 +08:00 |
|
caoqianming
|
2d4b09c207
|
feat: base 优化ticketd组件
|
2025-10-28 14:36:15 +08:00 |
|
shijing
|
5d5b091ed8
|
feat:日志添加处理人搜索
|
2025-10-28 14:30:37 +08:00 |
|
shijing
|
048a00b916
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-10-28 14:28:20 +08:00 |
|
shijing
|
e3721d91ea
|
feat:输入物料详情添加搜素查询（提到第一行并可编辑）
|
2025-10-28 14:28:18 +08:00 |
|
TianyangZhang
|
78e42d14fb
|
feat: ofm--add 增加专利模块
|
2025-10-28 14:24:49 +08:00 |
|
caoqianming
|
454294302d
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-10-28 12:59:43 +08:00 |
|
caoqianming
|
4d88ce0636
|
feat: base 优化ticketd
|
2025-10-28 12:59:42 +08:00 |
|
shijing
|
7f21f2209f
|
fix:玻纤分批时非完整板段号判断
|
2025-10-23 15:56:36 +08:00 |
|
shijing
|
4ffb9df5c2
|
fix:点击提交按钮后不再进行缺陷项判断
|
2025-10-22 15:32:57 +08:00 |
|
shijing
|
d43c63e085
|
fix:玻纤分批和检验表判断问题
|
2025-10-22 14:09:04 +08:00 |
|
shijing
|
29f986b5e0
|
fix:禅道133成品检测问题
|
2025-10-21 15:26:57 +08:00 |
|
shijing
|
ecae48fe14
|
feat:子工序填写时只有喷码需要设备
|
2025-10-21 09:02:04 +08:00 |
|
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 |