mgw
|
5d2cadc3d0
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-17 15:37:58 +08:00 |
|
mgw
|
567ea84b00
|
完善人工编程功能
|
2025-02-17 15:37:30 +08:00 |
|
yuxianghui
|
60f525e228
|
Merge branch 'feature/库存优化_1' into feature/库存优化_2
|
2025-02-17 15:18:49 +08:00 |
|
yuxianghui
|
3d2e383330
|
1、处理 sf-制造订单-通过质量检查对装夹预调进行返工-制造订单未记录检测结果 问题；2、处理 手动创建调拨单右上角会关联坯料采购单和坯料委外单 问题
|
2025-02-17 15:17:54 +08:00 |
|
胡尧
|
32ead7fa07
|
去掉设置tree字段为隐藏的代码
|
2025-02-13 13:29:54 +08:00 |
|
胡尧
|
827311a146
|
质量检查列表修改3个字段的隐藏默认值
|
2025-02-13 13:04:16 +08:00 |
|
胡尧
|
941b8c0be7
|
增加测试数据清理模块
|
2025-02-13 11:31:35 +08:00 |
|
胡尧
|
bb1012a15d
|
质量检查列表增加默认筛选项
|
2025-02-13 10:26:58 +08:00 |
|
胡尧
|
b7a2a763ac
|
修改质量检查列表页
|
2025-02-12 15:14:27 +08:00 |
|
yuxianghui
|
0bf701e743
|
质检单状态优化
|
2025-01-20 12:55:12 +08:00 |
|
yuxianghui
|
a96a9f5b75
|
1、修改工单检测结果只读条件；2、修改质检单完成时同步完成工单判断条件；3、去除只有配置后置三元检测的工单才能看到质检单对应字段、页签的判断条件
|
2025-01-20 12:47:11 +08:00 |
|
yuxianghui
|
6bff1f2f64
|
优化工单的质量检查跳转按钮
|
2025-01-16 15:56:11 +08:00 |
|
yuxianghui
|
add528f0f3
|
1、质检单有关后置三元检测的字段和页签添加工单没有后置三元检测时隐藏的条件；2、工单添加质检单跳转按钮
|
2025-01-16 14:51:04 +08:00 |
|
yuxianghui
|
8d5d19ec69
|
1、质检单通过、失败按钮添加工单为返工时隐藏条件；2、处理夹具入库到夹具房时，夹具查询中夹具可用状态没有变更为可用问题；3、处理后置三元检测选择返工后制造订单状态没有变更为返工的问题
|
2025-01-15 11:25:00 +08:00 |
|
yuxianghui
|
eae310ddad
|
1、工单、质检单优化
|
2025-01-14 15:07:53 +08:00 |
|
管欢
|
a78b1c7eaf
|
Accept Merge Request #1729: (feature/零件图号名称优化需求 -> develop)
Merge Request: 制造订单、工单页面导航优化
Created By: @管欢
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1729
|
2025-01-13 10:56:28 +08:00 |
|
guanhuan
|
5aca6d0685
|
屏蔽报废
|
2025-01-13 10:48:01 +08:00 |
|
yuxianghui
|
629995ad9c
|
1、完成<工单>通用调整配置优化；2、完成<工单>后置三元检测和质检单逻辑判断及结果同步优化；3、工单新增【送检】功能按钮；
|
2025-01-10 17:25:19 +08:00 |
|
yuxianghui
|
8d0e993d1a
|
1、取消工单点击开始按钮二次确认；2、优化质量控制标准模型；3、完成<质量_质量检查>通用调整优化，
|
2025-01-09 17:20:18 +08:00 |
|
guanhuan
|
4fc0eab513
|
修复报废没有生成调拨单
|
2025-01-08 10:58:56 +08:00 |
|
yuxianghui
|
94b1c7d258
|
关闭报废入口
|
2024-12-31 15:50:51 +08:00 |
|
liaodanlong
|
6532af500f
|
质量检测添加零件图号与零件名称
|
2024-12-26 08:57:31 +08:00 |
|
liaodanlong
|
41096c9c65
|
零件图号零件名称
|
2024-12-20 14:55:04 +08:00 |
|
yuxianghui
|
1c4a6ca85e
|
开放返工入口
|
2024-12-09 16:07:34 +08:00 |
|
yuxianghui
|
7025bde56e
|
隐藏手动返工报废入口
|
2024-12-02 13:46:20 +08:00 |
|
mgw
|
5eea260618
|
修复仓储岗角色权限问题
|
2024-11-28 13:38:14 +08:00 |
|
yuxianghui
|
ac2708404a
|
处理sf工厂单据页面优化需求
|
2024-11-13 13:39:41 +08:00 |
|
yuxianghui
|
3df2306e1b
|
Merge branch 'feature/客供料入库单优化_1' into feature/sf视图展示界面优化
|
2024-11-11 14:55:23 +08:00 |
|
yuxianghui
|
5dae0ea973
|
1、sf视图展示界面优化
|
2024-11-11 14:52:44 +08:00 |
|
guanhuan
|
3b686a8272
|
新增零件名称
|
2024-11-08 16:56:00 +08:00 |
|
guanhuan
|
18a7dbbff9
|
辅助文件上传
|
2024-10-28 10:21:33 +08:00 |
|
jinling.yang
|
de8ba77bef
|
优化加工质检页面
|
2024-10-24 09:22:35 +08:00 |
|
jinling.yang
|
7bc7d2059c
|
还原代码
|
2024-10-17 14:06:16 +08:00 |
|
jinling.yang
|
9177acf277
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/加工质检添加权限
# Conflicts:
# sf_quality/views/quality_cnc_test_view.xml
|
2024-10-17 11:03:08 +08:00 |
|
jinling.yang
|
94b1551de2
|
加工质检添加权限
|
2024-10-17 11:01:42 +08:00 |
|
杨金灵
|
9b275536e9
|
Accept Merge Request #1406: (feature/优化加工质检 -> develop)
Merge Request: 修复加工质检
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1406?initial=true
|
2024-10-17 10:10:51 +08:00 |
|
jinling.yang
|
0e8bda3369
|
修复加工质检
|
2024-10-17 09:58:24 +08:00 |
|
jinling.yang
|
9cd8d9d823
|
修复验证
|
2024-10-16 17:59:34 +08:00 |
|
jinling.yang
|
9b1b6e2b72
|
修复工单修改方法
|
2024-10-16 14:49:54 +08:00 |
|
jinling.yang
|
37217b0dd9
|
修复工单write方法
|
2024-10-16 14:46:31 +08:00 |
|
jinling.yang
|
f4f7087465
|
添加2D图纸和质量标准2个字段
|
2024-10-16 14:06:18 +08:00 |
|
jinling.yang
|
020da1d510
|
Merge branch 'feature/auxiliary_files_upload' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化加工质检
|
2024-10-16 11:49:37 +08:00 |
|
jinling.yang
|
2956f13ee7
|
优化加工质检
|
2024-10-16 11:49:05 +08:00 |
|
jinling.yang
|
79a753b609
|
优化质检生产仓看板
|
2024-10-15 11:55:10 +08:00 |
|
jinling.yang
|
761e8d4579
|
还原代码
|
2024-10-15 09:26:55 +08:00 |
|
jinling.yang
|
6c7c10924a
|
还原注释代码
|
2024-10-15 09:07:11 +08:00 |
|
jinling.yang
|
2a067778bc
|
优化质量检测(加工检测)及消息推送
|
2024-10-14 17:53:38 +08:00 |
|
jinling.yang
|
d8bade64e1
|
优化质量：添加加工质检
|
2024-10-11 17:52:33 +08:00 |
|
yuxianghui
|
9d96e0681c
|
1、注释MES装刀指令接口，删除所以该接口的调用；注释质量检测失败时对零件特采接口的调用；2、序列号模型from界面临时添加按钮，解决工厂录入的有些刀柄序列号存在位数少于10的问题（通过SQL在左侧补零）（已隐藏）；
|
2024-04-25 14:02:51 +08:00 |
|
yuxianghui
|
6f2043e7e7
|
1、工单tree视图、from视图添加人工编程字段，及人工编程筛选项；2、序列号模型添加根据Rfid搜索的选项；3、修改零件特采接口，优化MES装刀申请接口、优化机床刀库接口；
|
2024-04-24 18:33:15 +08:00 |
|