 shijing
|
e92d35ee52
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-21 14:38:01 +08:00 |
|
shijing
|
60ed2579d6
|
feat:光芯成品出库mioitem列表底部添加统计行
|
2025-11-21 14:37:25 +08:00 |
 TianyangZhang
|
4bd3007e0d
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-21 14:33:21 +08:00 |
|
TianyangZhang
|
af82feb7dc
|
add : ofm -vehicle 修改车辆信息
|
2025-11-21 14:33:19 +08:00 |
 caoqianming
|
171545b918
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-21 14:27:55 +08:00 |
|
caoqianming
|
0f0bd39e7b
|
feat: 修改mroombooking表单名称
|
2025-11-21 14:27:33 +08:00 |
|
TianyangZhang
|
f0b4d5f0bf
|
fix: ofm 修改form name
|
2025-11-21 14:19:11 +08:00 |
|
TianyangZhang
|
46fbdef199
|
fix: ofm && srm 修改 form 名称
|
2025-11-21 14:10:24 +08:00 |
|
shijing
|
74cea98572
|
feat:光芯成品出库添加几个字段
|
2025-11-21 10:43:06 +08:00 |
|
shijing
|
102c03b1e9
|
fix:禅道187
|
2025-11-21 10:40:57 +08:00 |
|
shijing
|
76f2dcac81
|
fix:禅道196
|
2025-11-20 15:16:40 +08:00 |
|
shijing
|
870049f6ff
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-20 14:55:47 +08:00 |
|
shijing
|
9b3f504a82
|
fix:禅道195
|
2025-11-20 14:55:45 +08:00 |
|
caoqianming
|
274b8125a0
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-20 11:09:49 +08:00 |
|
caoqianming
|
b778ab7574
|
feat: 库存统计里添加饼图配置
|
2025-11-20 11:09:47 +08:00 |
|
shijing
|
83dbf67911
|
fix:成品库可打印成品标签
|
2025-11-20 10:46:11 +08:00 |
|
shijing
|
13007d7642
|
fix:禅道177
|
2025-11-20 10:26:04 +08:00 |
|
shijing
|
2a839d0803
|
fix:禅道177
|
2025-11-20 10:25:51 +08:00 |
|
shijing
|
e673838e36
|
fix:bug 修正
|
2025-11-20 09:41:30 +08:00 |
|
shijing
|
15a4ac27d6
|
fix:placeholder错误修正
|
2025-11-19 16:00:52 +08:00 |
|
shijing
|
f6c24f3902
|
feat：某批次物料加入wpr(改版)
|
2025-11-19 15:30:22 +08:00 |
|
TianyangZhang
|
a0189dbe95
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-19 13:49:35 +08:00 |
|
TianyangZhang
|
ae8bd96320
|
fix: ofm 模块bug 修改已经功能完善
|
2025-11-19 13:49:33 +08:00 |
|
shijing
|
6186f8b2f8
|
feat:光芯车间看板其他车间看板调整
|
2025-11-19 11:08:54 +08:00 |
|
shijing
|
5718e20d7a
|
fix:光芯质检统计外径发货片(B)不显示修改
|
2025-11-19 10:14:18 +08:00 |
|
shijing
|
10d6519568
|
feat:分批时，复制板段号进去的时候，将不在本批次的号提示出来
|
2025-11-19 09:07:50 +08:00 |
|
shijing
|
98e610113c
|
feat:上盘平魔合批时，handoverbw列表展示格式改成多选形式
|
2025-11-19 09:06:10 +08:00 |
|
shijing
|
9ed081e5be
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-18 13:41:27 +08:00 |
|
shijing
|
2d64e3baeb
|
fix:玻纤检验设备名称没有带出来修改
|
2025-11-18 13:41:24 +08:00 |
|
caoqianming
|
0567d98b93
|
feat: base 添加工作流分组select
|
2025-11-18 11:24:58 +08:00 |
|
caoqianming
|
cea821e592
|
feat: base 发起流程分组
|
2025-11-18 11:13:25 +08:00 |
|
caoqianming
|
8fa81f1f76
|
Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
|
2025-11-18 09:47:51 +08:00 |
|
caoqianming
|
2408903b95
|
feat: base myticket获取权限内的流程
|
2025-11-18 09:47:50 +08:00 |
|
shijing
|
3a317a03d3
|
feat:玻纤后面的几个成品检验工序添加出入库记录
|
2025-11-17 17:09:17 +08:00 |
|
shijing
|
153ccb2cf3
|
fix玻纤交接弹窗标题
|
2025-11-17 17:08:11 +08:00 |
|
shijing
|
a2acf33d3f
|
fix玻纤未完成合批修整
|
2025-11-17 16:48:35 +08:00 |
|
shijing
|
82b6d7ced1
|
feat:光芯剩余车间看板页面文件（待调）
|
2025-11-17 16:18:48 +08:00 |
|
shijing
|
6d3d0403cb
|
fix:光芯销售发货时，仓库已有批次可以查询筛选
|
2025-11-17 16:17:39 +08:00 |
|
shijing
|
369af3a3ab
|
fix:玻纤统计分析页面进入报错修改
|
2025-11-17 09:42:25 +08:00 |
|
shijing
|
07e4c2749b
|
feat:分检汇总页面
|
2025-11-17 08:45:41 +08:00 |
|
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 |