 shijing
|
306564d106
|
fix:质检统计底部合计行底色明显，字体加粗
|
2025-11-14 16:32:28 +08:00 |
|
shijing
|
194901d536
|
fix:质检统计（简）统计错误修改
|
2025-11-14 15:51:19 +08:00 |
|
shijing
|
2ae9ccf974
|
fix:禅道110
|
2025-11-14 15:25:31 +08:00 |
|
shijing
|
fb42cc177a
|
feat:禅道152辅料库添加待采购列
|
2025-11-14 13:44:44 +08:00 |
|
shijing
|
1e639ac5ff
|
fix:外观检验已完成添加检验
|
2025-11-14 09:29:42 +08:00 |
|
shijing
|
d15b34d050
|
fix:玻纤物料报废可选任何状态的物料
|
2025-11-14 09:26:17 +08:00 |
|
shijing
|
e057678be3
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-13 16:44:59 +08:00 |
|
shijing
|
22ea2230c8
|
feat:光芯交接记录筛选添加”合批“
|
2025-11-13 16:44:57 +08:00 |
 caoqianming
|
c8e1b732bc
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-13 16:43:24 +08:00 |
|
caoqianming
|
98a8b1fe24
|
feat: 修改supplieraudit为新的工单绑定流程2
|
2025-11-13 16:43:23 +08:00 |
|
shijing
|
9cd9137431
|
fix:禅道163
|
2025-11-13 16:02:24 +08:00 |
|
shijing
|
f0cfcbaf9f
|
fix:按钮颜色位置调整
|
2025-11-13 15:48:35 +08:00 |
|
shijing
|
0cbbb46957
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-13 15:29:25 +08:00 |
|
shijing
|
282e41809e
|
fix:合批时新批次号不能扫批次码，需手动录入
|
2025-11-13 15:29:23 +08:00 |
|
caoqianming
|
8a8a70b439
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-13 14:05:33 +08:00 |
|
caoqianming
|
304dcf0fa2
|
feat: 修改supplieraudit为新的工单绑定流程
|
2025-11-13 14:05:33 +08:00 |
|
shijing
|
fa182745a3
|
feat:交接记录添加expend展开收起按钮
|
2025-11-13 13:48:53 +08:00 |
|
shijing
|
10988dae96
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-13 13:48:00 +08:00 |
|
shijing
|
6d5bca7978
|
feat:scTable添加expend展开收起功能
|
2025-11-13 13:47:58 +08:00 |
|
caoqianming
|
a64c0f1f69
|
feat: base 创建工单后跳转至我的界面
|
2025-11-13 13:47:42 +08:00 |
|
caoqianming
|
740743ea2e
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-13 13:39:00 +08:00 |
|
caoqianming
|
d4dffdb47b
|
feat: base scTable添加滚动到顶部操作
|
2025-11-13 13:38:59 +08:00 |
|
shijing
|
dce60da8f2
|
fix:库存统计调整
|
2025-11-13 11:20:05 +08:00 |
|
shijing
|
ac0ea5f63f
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-13 11:09:11 +08:00 |
|
shijing
|
f3e83de73f
|
fix:库存统计调整
|
2025-11-13 11:09:09 +08:00 |
 TianyangZhang
|
ab3ce755a5
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-13 09:52:51 +08:00 |
|
TianyangZhang
|
a8d2e46e68
|
feat: fix srm ofm 修改审批信息
|
2025-11-13 09:52:48 +08:00 |
|
shijing
|
a7b874dcf4
|
fix:人员工时统计-冷加工统计去除index列
|
2025-11-12 15:50:13 +08:00 |
|
shijing
|
9a727978ad
|
feat:人员工时统计-冷加工统计,添加第一行系数
|
2025-11-12 15:08:39 +08:00 |
|
shijing
|
77806aa776
|
feat:人员工时统计-冷加工统计,数据处理，工段与物料呈二级表头
|
2025-11-12 13:50:30 +08:00 |
|
shijing
|
88c0be7b60
|
feat:查询->产品库存：固定产品列
|
2025-11-12 13:15:52 +08:00 |
|
shijing
|
ae171564f8
|
feat:统计分析->成品内外初检数据修正
|
2025-11-12 10:58:39 +08:00 |
|
shijing
|
8d7af25b8e
|
feat:统计分析->成品内质复检
|
2025-11-12 10:58:04 +08:00 |
|
shijing
|
6a73dedbb8
|
feat:统计分析->光锥成品检测
|
2025-11-12 10:55:26 +08:00 |
|
shijing
|
ac8fe25ea2
|
fix:物料交接时扫批次号问题修正
|
2025-11-12 09:00:27 +08:00 |
|
shijing
|
63f4a02d9a
|
fix:route编辑时排序自动生成
|
2025-11-12 08:59:24 +08:00 |
|
shijing
|
26cb93052d
|
feat:统计分析：生产缺陷统计和各工序物料统计初版
|
2025-11-11 15:46:29 +08:00 |
|
shijing
|
cf0088c515
|
feat:-优化员工工作量统计
|
2025-11-11 13:51:36 +08:00 |
|
shijing
|
1a68fb56d8
|
fix：交接记录展示补全
|
2025-11-11 11:20:12 +08:00 |
|
shijing
|
23d0df54ca
|
fix：交接记录类型展示补全
|
2025-11-11 09:55:13 +08:00 |
|
shijing
|
41929415aa
|
fix：扫描物料识别修改
|
2025-11-11 09:34:09 +08:00 |
|
caoqianming
|
7d9f86a8ab
|
feat: 添加供应商审核
|
2025-11-10 14:08:09 +08:00 |
|
caoqianming
|
b41412390c
|
feat: base 提交时调用clearable
|
2025-11-10 14:08:00 +08:00 |
|
caoqianming
|
f44e1c65fe
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-10 14:07:35 +08:00 |
|
caoqianming
|
dd61792170
|
feat: base 添加scuploadfiled组件
|
2025-11-10 14:07:34 +08:00 |
|
TianyangZhang
|
a7cd474940
|
feat: ofm-- 修改form 表单
|
2025-11-10 10:56:06 +08:00 |
|
TianyangZhang
|
b52985a844
|
feat: add ofm and srm 增加 localmode
|
2025-11-10 09:56:50 +08:00 |
|
TianyangZhang
|
0c46fda197
|
feat：ofm and srm 修改 workflow_key 增加 wf_
|
2025-11-10 08:56:40 +08:00 |
|
TianyangZhang
|
24e42930e5
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-10 08:52:07 +08:00 |
|
caoqianming
|
a44a07154d
|
feat: 完善离职申请页面
|
2025-11-09 23:29:19 +08:00 |
|
caoqianming
|
21d0ec18ff
|
feat: base myticket变更drawerName
|
2025-11-09 23:15:56 +08:00 |
|
caoqianming
|
83fe31b76a
|
feat: resignation支持删除操作
|
2025-11-09 23:15:36 +08:00 |
|
caoqianming
|
84e447527a
|
feat: 添加离职申请表
|
2025-11-09 22:37:18 +08:00 |
|
caoqianming
|
714ab23cd6
|
feat: base myticket创建时返回我的
|
2025-11-09 22:36:58 +08:00 |
|
caoqianming
|
84f0cef581
|
feat: 优化会议室预定页面
|
2025-11-09 12:33:34 +08:00 |
|
caoqianming
|
def8713e8e
|
feat: myticket不传入mode
|
2025-11-07 23:24:11 +08:00 |
|
caoqianming
|
7db573871d
|
feat: 添加离职申请表
|
2025-11-07 17:05:47 +08:00 |
|
caoqianming
|
48fd229a69
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-07 17:01:17 +08:00 |
|
caoqianming
|
e11e683ee8
|
feat: base 我的审批页面添加发起流程按钮
|
2025-11-07 17:01:16 +08:00 |
|
TianyangZhang
|
60c3a6320e
|
feat: index_enm_ly 修改凌源大屏内容
|
2025-11-07 16:52:29 +08:00 |
|
TianyangZhang
|
3863159a3b
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-07 15:40:37 +08:00 |
|
TianyangZhang
|
80f329c617
|
feat: srm 科研管理审批修改 bug
|
2025-11-07 15:40:35 +08:00 |
|
shijing
|
1836b7b84b
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-07 15:08:53 +08:00 |
|
shijing
|
02e849bdba
|
feat:统计分析bx
|
2025-11-07 15:08:51 +08:00 |
|
TianyangZhang
|
11d019bb1e
|
feat: ofm - fix bug
|
2025-11-07 09:26:35 +08:00 |
|
TianyangZhang
|
0d48b923f7
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-06 11:07:26 +08:00 |
|
TianyangZhang
|
0febf3f507
|
feat: base xtSelect支持延迟加载
|
2025-11-06 11:07:24 +08:00 |
|
shijing
|
5799a3680b
|
fix:玻纤交接记录expend展开
|
2025-11-06 09:13:39 +08:00 |
|
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 |
|
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 |