liaodanlong
|
7975fd2bd2
|
CNC回退后需开放送检按钮
|
2025-02-25 16:32:04 +08:00 |
|
liaodanlong
|
d8e8babbd3
|
工单详情添加回退按钮
|
2025-02-21 10:28:12 +08:00 |
|
liaodanlong
|
416a63138a
|
Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2025-02-20 15:48:22 +08:00 |
|
liaodanlong
|
162a1061de
|
制造订单 工单回退
|
2025-02-20 14:08:06 +08:00 |
|
胡尧
|
8095a8a972
|
修改配送类型的字段关联形式，修改工件配送列表页的默认筛选条件
|
2025-02-17 13:23:32 +08:00 |
|
mgw
|
027be2b021
|
调整工单处人工编程可见
|
2025-02-10 13:33:46 +08:00 |
|
mgw
|
44f29d001e
|
调整人工线下加工页面内容
|
2025-02-08 14:08:53 +08:00 |
|
guanhuan
|
5636681ee6
|
CNC工单返工
|
2025-01-23 16:42:16 +08:00 |
|
guanhuan
|
9b49edb290
|
装夹工单返工
|
2025-01-23 13:55:35 +08:00 |
|
yuxianghui
|
a96a9f5b75
|
1、修改工单检测结果只读条件；2、修改质检单完成时同步完成工单判断条件；3、去除只有配置后置三元检测的工单才能看到质检单对应字段、页签的判断条件
|
2025-01-20 12:47:11 +08:00 |
|
yuxianghui
|
9e2704f726
|
新增工单送检按钮显示的时候隐藏完成按钮
|
2025-01-20 10:34:32 +08:00 |
|
mgw
|
f3e64b007e
|
调整扫码字段位置
|
2025-01-17 09:59:46 +08:00 |
|
mgw
|
eed89836e1
|
调整扫码字段位置
|
2025-01-17 09:36:37 +08:00 |
|
mgw
|
0b2b9c2bf5
|
恢复屏蔽
|
2025-01-16 17:39:34 +08:00 |
|
mgw
|
2dc54792f4
|
调整扫码字段的位置
|
2025-01-16 17:10:55 +08:00 |
|
yuxianghui
|
add528f0f3
|
1、质检单有关后置三元检测的字段和页签添加工单没有后置三元检测时隐藏的条件；2、工单添加质检单跳转按钮
|
2025-01-16 14:51:04 +08:00 |
|
mgw
|
ece136e71e
|
解除屏蔽
|
2025-01-15 13:36:05 +08:00 |
|
mgw
|
ca3015600a
|
调整扫码widget
|
2025-01-15 10:18:25 +08:00 |
|
胡尧
|
b9d95c0751
|
解决收藏报错的问题
|
2025-01-14 15:48:49 +08:00 |
|
yuxianghui
|
186dca4618
|
1、取消质量检查页面根据指令检查自动筛选；2、修改送检按钮隐藏条件；3、优化工单后置三元检测page页显示时，检测结果选择返工时制造订单没有生成检测结果记录问题
|
2025-01-13 15:07:08 +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 |
|
yuxianghui
|
05f1f1a983
|
去除工单多余的开始按钮
|
2024-12-25 13:13:38 +08:00 |
|
yuxianghui
|
8bd2250d45
|
Merge branch 'feature/工单rfid优化' into feature/制造、采购、工单优化
|
2024-12-23 13:47:22 +08:00 |
|
yuxianghui
|
0e7e7af85a
|
1、优化销售订单状态；2、优化夹具物料查询的托盘可用状态；3、优化工单开始按键；4、优化采购订单的采购类型，根据销售订单的供货方式和工艺确认时是否外协自动选择对应采购类型；
|
2024-12-23 13:46:30 +08:00 |
|
liaodanlong
|
41096c9c65
|
零件图号零件名称
|
2024-12-20 14:55:04 +08:00 |
|
yuxianghui
|
03dbeaf988
|
1、隐藏返工状态工单的开始按钮；2、优化工单状态方法；3、优化制造订单状态
|
2024-12-19 17:14:48 +08:00 |
|
yuxianghui
|
179ce86bef
|
1、去除工单页面的时效状态自动筛选项；2、坯料制造订单添加批量确认加工工艺功能；3、处理返工新生成的工单工序错误问题；4、采购、销售页面优化
|
2024-12-11 10:33:10 +08:00 |
|
yuxianghui
|
1c4a6ca85e
|
开放返工入口
|
2024-12-09 16:07:34 +08:00 |
|
yuxianghui
|
7025bde56e
|
隐藏手动返工报废入口
|
2024-12-02 13:46:20 +08:00 |
|
jinling.yang
|
a80d498eab
|
修复制造订单-采购单
|
2024-11-28 10:40:48 +08:00 |
|
yuxianghui
|
c215e3dc27
|
Merge branch 'feature/采购优化' into feature/返工优化_5
|
2024-11-26 11:15:56 +08:00 |
|
yuxianghui
|
0a1da79487
|
1、返工向导模型添加新的工单字段；2、工单tree视图添加重新加工分类
|
2024-11-26 11:14:45 +08:00 |
|
jinling.yang
|
cb29baa698
|
还原代码
|
2024-11-25 14:31:02 +08:00 |
|
jinling.yang
|
f01a300aae
|
还原代码
|
2024-11-22 17:56:59 +08:00 |
|
jinling.yang
|
70f8aadd66
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废
|
2024-11-22 09:42:38 +08:00 |
|
jinling.yang
|
dd768e938c
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废
|
2024-11-22 09:41:06 +08:00 |
|
mgw
|
2b3da48e9b
|
调整开料要求展示范围
|
2024-11-22 09:23:36 +08:00 |
|
jinling.yang
|
5cb726bb2d
|
注释代码
|
2024-11-21 17:45:53 +08:00 |
|
jinling.yang
|
c0d520a47f
|
Merge branch 'feature/优化外协采购和出入库单（工艺退回调整）' into develop
|
2024-11-21 17:23:57 +08:00 |
|
杨金灵
|
de11c57800
|
Accept Merge Request #1533: (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/1533
|
2024-11-21 17:23:18 +08:00 |
|
jinling.yang
|
d4ff4be32e
|
还原注释代码
|
2024-11-21 17:19:41 +08:00 |
|
胡尧
|
13d99b1bcc
|
成品的零件图号修改为零件图号
|
2024-11-21 09:49:12 +08:00 |
|
jinling.yang
|
c73706555f
|
优化外协采购和出入库单（工艺退回调整）
|
2024-11-18 17:40:41 +08:00 |
|
jinling.yang
|
a2855f1f08
|
还原代码
|
2024-11-18 11:40:24 +08:00 |
|
jinling.yang
|
a8e9fe40ac
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/views/mrp_production_addional_change.xml
|
2024-11-15 18:08:31 +08:00 |
|
jinling.yang
|
018d51e25f
|
批量处理工艺调整
|
2024-11-14 18:02:24 +08:00 |
|
liaodanlong
|
e38407c0a5
|
交期状态开发
|
2024-11-13 10:37:19 +08:00 |
|
guanhuan
|
3b686a8272
|
新增零件名称
|
2024-11-08 16:56:00 +08:00 |
|
yuxianghui
|
8ea72198ea
|
1、完成报价单优化需求；2、修改制造订单内装夹工单的‘返工’按钮为’异常反馈‘
|
2024-11-05 17:52:18 +08:00 |
|