liaodanlong
|
9cf70cc54c
|
工艺外协代码回退
|
2025-04-26 14:42:38 +08:00 |
|
yuxianghui
|
d7d094c84d
|
Merge branch 'feature/工单排序' into feature/工单排序_1
|
2025-04-24 15:05:57 +08:00 |
|
yuxianghui
|
a06e24583d
|
添加工单先按工序排序，再按创建时间排序
|
2025-04-24 15:04:04 +08:00 |
|
胡尧
|
d16d47dfbe
|
销售订单，制造订单视图中加入模型id
|
2025-04-24 14:13:10 +08:00 |
|
liaodanlong
|
77478fd173
|
制造订单报错问题
|
2025-04-21 13:16:15 +08:00 |
|
guanhuan
|
9cfc8418ec
|
优化库存排序
|
2025-04-17 13:44:25 +08:00 |
|
mgw
|
2035dd6857
|
切割工单隐藏编程相关
|
2025-02-26 12:42:42 +08:00 |
|
mgw
|
dca6f9fb53
|
sf-工厂取消接单-坯料的制造订单未取消
|
2025-02-26 09:40:18 +08:00 |
|
mgw
|
def9bd2c6e
|
坯料自加工的切割工序状态也判断了编程状态
|
2025-02-26 09:09:26 +08:00 |
|
胡尧
|
16b5ce300a
|
修复库存有两个驾驶舱菜单的bug
|
2025-02-21 14:48:01 +08:00 |
|
mgw
|
88840abf9f
|
制造订单编程状态搜索的优化需求
|
2025-02-08 13:32:40 +08:00 |
|
mgw
|
0a8cc050b8
|
人工线下加工工单也需要走cloud编程流程的优化需求
|
2025-02-05 17:41:52 +08:00 |
|
yuxianghui
|
5297bf05d1
|
1、制造订单返工按钮添加新的显示条件；2、优化返工流程
|
2025-01-15 14:36:49 +08:00 |
|
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 |
|