liaodanlong
|
adbf5a6a0d
|
隐藏欠单
|
2025-01-14 21:03:27 +08:00 |
|
mgw
|
d8a816c90e
|
调整写入编程记录的位置
|
2025-01-13 16:51:25 +08:00 |
|
mgw
|
6a3a739e2c
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-01-13 11:11:33 +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
|
0870bafdb9
|
制造订单、工单页面导航优化
|
2025-01-13 10:41:49 +08:00 |
|
mgw
|
9dfe9ba572
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-01-13 09:08:38 +08:00 |
|
胡尧
|
22bac48a98
|
检测结果增加创建人，时间，处理人，时间
|
2025-01-10 09:57:06 +08:00 |
|
mgw
|
fc16c867aa
|
申请编程需求
|
2025-01-09 14:07:35 +08:00 |
|
yuxianghui
|
c2d346282c
|
1、制造订单隐藏不必的取消按钮、添加取消按钮的隐藏条件；2、添加返工完成后制造订单状态置为加工中
|
2024-12-24 16:47:10 +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 |
|
liaodanlong
|
d1ba2cc3d4
|
Merge branch 'refs/heads/develop' into feature/delivery_status
# Conflicts:
# sf_manufacturing/models/mrp_production.py
|
2024-12-11 10:07:34 +08:00 |
|
liaodanlong
|
4738b03a45
|
销售订单与制造订单关联
|
2024-12-11 10:03:20 +08:00 |
|
guanhuan
|
27ec5b1b74
|
多个制造订单菜单修复
|
2024-12-04 16:13:55 +08:00 |
|
mgw
|
9bfbea11db
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2024-11-28 13:38:43 +08:00 |
|
mgw
|
5eea260618
|
修复仓储岗角色权限问题
|
2024-11-28 13:38:14 +08:00 |
|
杨金灵
|
306d5074f2
|
Accept Merge Request #1563: (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/1563
|
2024-11-28 10:03:05 +08:00 |
|
jinling.yang
|
ecf683e663
|
修复采购
|
2024-11-27 17:54:31 +08:00 |
|
mgw
|
92b924754d
|
修复计划调度岗和生产总监权限问题
|
2024-11-26 16:56:47 +08:00 |
|
jinling.yang
|
321125adf6
|
还原代码
|
2024-11-25 16:18:41 +08:00 |
|
jinling.yang
|
c0d520a47f
|
Merge branch 'feature/优化外协采购和出入库单（工艺退回调整）' into develop
|
2024-11-21 17:23:57 +08:00 |
|
胡尧
|
cc1455b22c
|
修改制造订单中子MO子为子MO
|
2024-11-21 10:21:18 +08:00 |
|
胡尧
|
269be36d86
|
隐藏制造订单待生产按钮，人工线下加工状态下的功能刀具
|
2024-11-21 09:48:26 +08:00 |
|
jinling.yang
|
23da273af1
|
修复bug和优化制造订单报废
|
2024-11-20 16:08:27 +08:00 |
|
jinling.yang
|
e634e9726f
|
优化工艺设计显示
|
2024-11-19 17:56:21 +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
|
8add4b5ad1
|
优化制造订单
|
2024-11-15 17:31:28 +08:00 |
|
胡尧
|
9410ca82db
|
解决冲突
|
2024-11-15 15:30:35 +08:00 |
|
胡尧
|
73c986cd50
|
增加制造类型字段，增加依赖
|
2024-11-15 15:29:04 +08:00 |
|
liaodanlong
|
4787cb451d
|
Merge branch 'refs/heads/develop' into feature/delivery_status
# Conflicts:
# sf_manufacturing/__manifest__.py
|
2024-11-15 10:37:13 +08:00 |
|
liaodanlong
|
811a79c7c1
|
交期状态修改
|
2024-11-15 10:33:47 +08:00 |
|
胡尧
|
f6f9d14f0a
|
给坯料模板增加按订单补给
|
2024-11-15 09:12:34 +08:00 |
|
jinling.yang
|
018d51e25f
|
批量处理工艺调整
|
2024-11-14 18:02:24 +08:00 |
|
胡尧
|
5dc5c814c8
|
增加加工类型
|
2024-11-14 16:52:58 +08:00 |
|
胡尧
|
6e17bb933f
|
增加是否线下加工日志
|
2024-11-14 16:36:02 +08:00 |
|
胡尧
|
a75269b3a3
|
增加制造类型
|
2024-11-14 15:14:57 +08:00 |
|
胡尧
|
daba7d5155
|
将数据初始化由产品辩题改为为模板
|
2024-11-14 15:02:11 +08:00 |
|
liaodanlong
|
e38407c0a5
|
交期状态开发
|
2024-11-13 10:37:19 +08:00 |
|
jinling.yang
|
ff072a32bb
|
添加退回调整
|
2024-11-12 17:53:17 +08:00 |
|
jinling.yang
|
8bbc65ef88
|
新增退回调整
|
2024-11-12 11:43:40 +08:00 |
|
jinling.yang
|
026bf17a68
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整
|
2024-11-12 09:12:37 +08:00 |
|
jinling.yang
|
359fd40ed3
|
添加工艺退回调整
|
2024-11-11 17:55:05 +08:00 |
|
胡尧
|
cd9f485fc0
|
增加零件名称
|
2024-11-11 16:38:28 +08:00 |
|
胡尧
|
d68a9249c6
|
解决冲突
|
2024-11-11 16:32:54 +08:00 |
|
胡尧
|
eebb143778
|
多供货方式选择
|
2024-11-11 16:26:45 +08:00 |
|
jinling.yang
|
e7b18233f0
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作
|
2024-11-11 14:51:11 +08:00 |
|
jinling.yang
|
741f2ad8b2
|
还原代码
|
2024-11-11 14:50:38 +08:00 |
|
胡尧
|
1b87a81a5a
|
多供货方式选择
|
2024-11-11 11:06:56 +08:00 |
|