jinling.yang
|
321125adf6
|
还原代码
|
2024-11-25 16:18:41 +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 |
|
胡尧
|
cc1455b22c
|
修改制造订单中子MO子为子MO
|
2024-11-21 10:21:18 +08:00 |
|
胡尧
|
13d99b1bcc
|
成品的零件图号修改为零件图号
|
2024-11-21 09:49:12 +08:00 |
|
胡尧
|
269be36d86
|
隐藏制造订单待生产按钮，人工线下加工状态下的功能刀具
|
2024-11-21 09:48:26 +08:00 |
|
jinling.yang
|
fe4346b802
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整）
|
2024-11-20 16:08:54 +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 |
|
胡尧
|
f99a35932f
|
修改坯料冗余
|
2024-11-19 11:56:49 +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
|
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 |
|
胡尧
|
975ced08cb
|
增加成品工序模板（人工线下加工）
|
2024-11-12 14:00:27 +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 |
|
杨金灵
|
a12eb12678
|
Accept Merge Request #1495: (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/1495
|
2024-11-11 15:41:36 +08:00 |
|
yuxianghui
|
3df2306e1b
|
Merge branch 'feature/客供料入库单优化_1' into feature/sf视图展示界面优化
|
2024-11-11 14:55:23 +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 |
|
jinling.yang
|
38c4aba45c
|
根据工序生成工单
|
2024-11-08 18:01:23 +08:00 |
|
guanhuan
|
3b686a8272
|
新增零件名称
|
2024-11-08 16:56:00 +08:00 |
|
jinling.yang
|
d419efa3c3
|
优化工艺确认
|
2024-11-07 17:59:28 +08:00 |
|
yuxianghui
|
330726007d
|
1、添加只有客供料入库单才能看见收货人/联系地址/电话号码等字段;
|
2024-11-07 16:26:48 +08:00 |
|
jinling.yang
|
01df55ef35
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作
# Conflicts:
# sf_manufacturing/security/ir.model.access.csv
|
2024-11-06 17:54:29 +08:00 |
|