胡尧
|
13ef106c0e
|
Accept Merge Request #1501: (feature/sale_order_route_pick -> develop)
Merge Request: 修改工艺工程师菜单权限
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1501?initial=true
|
2024-11-13 09:08:01 +08:00 |
|
胡尧
|
433f3bd2dc
|
修改工艺工程师菜单权限
|
2024-11-13 09:07:14 +08:00 |
|
jinling.yang
|
ff072a32bb
|
添加退回调整
|
2024-11-12 17:53:17 +08:00 |
|
胡尧
|
de7098a7d4
|
Accept Merge Request #1500: (feature/sale_order_route_pick -> develop)
Merge Request: 多供货路线选择提交
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1500?initial=true
|
2024-11-12 15:21:06 +08:00 |
|
胡尧
|
205bfd0538
|
修改人工线下加工工序domain
|
2024-11-12 15:19:57 +08:00 |
|
胡尧
|
37538141bf
|
修改材料型号获取方式名称
|
2024-11-12 14:57:59 +08:00 |
|
胡尧
|
975ced08cb
|
增加成品工序模板（人工线下加工）
|
2024-11-12 14:00:27 +08:00 |
|
jinling.yang
|
d646019c93
|
修复表面工艺
|
2024-11-12 13:56:40 +08:00 |
|
jinling.yang
|
efa1e2b60f
|
表面工艺生成采购单
|
2024-11-12 11:51:18 +08:00 |
|
jinling.yang
|
8bbc65ef88
|
新增退回调整
|
2024-11-12 11:43:40 +08:00 |
|
胡尧
|
e1121cc3b5
|
增加快速订单逻辑，修改报价筛选逻辑
|
2024-11-12 11:16:42 +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 |
|
马广威
|
fdcd825142
|
Accept Merge Request #1499: (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/1499
|
2024-11-12 09:02:39 +08:00 |
|
jinling.yang
|
317f44d6c2
|
修复工艺设计
|
2024-11-12 09:00:45 +08:00 |
|
jinling.yang
|
7d5c7bceb1
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2024-11-12 08:59:47 +08:00 |
|
jinling.yang
|
359fd40ed3
|
添加工艺退回调整
|
2024-11-11 17:55:05 +08:00 |
|
禹翔辉
|
13a930b59c
|
Accept Merge Request #1497: (feature/工单工序优化_y -> 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/1497
|
2024-11-11 16:53:50 +08:00 |
|
jinling.yang
|
359a246793
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2024-11-11 16:42:30 +08:00 |
|
胡尧
|
2b658d7be0
|
Accept Merge Request #1498: (feature/sale_order_route_pick -> develop)
Merge Request: 多供货方式选择
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1498?initial=true
|
2024-11-11 16:40:49 +08:00 |
|
胡尧
|
cd9f485fc0
|
增加零件名称
|
2024-11-11 16:38:28 +08:00 |
|
yuxianghui
|
dda627f20a
|
工单工序排序方法重构
|
2024-11-11 16:38:06 +08:00 |
|
jinling.yang
|
e8858559f6
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2024-11-11 16:35:41 +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 |
|
禹翔辉
|
f5f67c52af
|
Accept Merge Request #1496: (feature/sf视图展示界面优化 -> develop)
Merge Request: sf视图展示界面优化
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1496
|
2024-11-11 14:58:07 +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 |
|
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
|
e55e42fe6b
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2024-11-11 14:50:52 +08:00 |
|
jinling.yang
|
741f2ad8b2
|
还原代码
|
2024-11-11 14:50:38 +08:00 |
|
胡尧
|
1b87a81a5a
|
多供货方式选择
|
2024-11-11 11:06:56 +08:00 |
|
管欢
|
7042eb0d7b
|
Accept Merge Request #1494: (feature/10月迭代优化 -> 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/1494
|
2024-11-11 10:32:21 +08:00 |
|
胡尧
|
28788e2a81
|
Merge branch 'develop' into feature/sale_order_route_pick
|
2024-11-11 10:24:14 +08:00 |
|
胡尧
|
0f37b45b30
|
开发
|
2024-11-11 10:22:53 +08:00 |
|
jinling.yang
|
38c4aba45c
|
根据工序生成工单
|
2024-11-08 18:01:23 +08:00 |
|
guanhuan
|
3b686a8272
|
新增零件名称
|
2024-11-08 16:56:00 +08:00 |
|
胡尧
|
2798ce6183
|
开发
|
2024-11-08 16:23:34 +08:00 |
|
jinling.yang
|
e981d68805
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作
# Conflicts:
# sf_manufacturing/models/stock.py
# sf_manufacturing/security/ir.model.access.csv
|
2024-11-08 09:27:45 +08:00 |
|
jinling.yang
|
cd3ab04728
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2024-11-08 09:26:14 +08:00 |
|
jinling.yang
|
d419efa3c3
|
优化工艺确认
|
2024-11-07 17:59:28 +08:00 |
|
马广威
|
8b4eb325ef
|
Accept Merge Request #1493: (feature/制造功能优化 -> develop)
Merge Request: 询价单区分类型
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1493?initial=true
|
2024-11-07 16:40:11 +08:00 |
|
yuxianghui
|
330726007d
|
1、添加只有客供料入库单才能看见收货人/联系地址/电话号码等字段;
|
2024-11-07 16:26:48 +08:00 |
|
mgw
|
4d7b1f557b
|
询价单区分类型
|
2024-11-07 14:26:33 +08:00 |
|
禹翔辉
|
1699f61d3f
|
Accept Merge Request #1492: (feature/客供料入库单优化_1 -> 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/1492?initial=true
|
2024-11-07 11:24:19 +08:00 |
|
yuxianghui
|
a0eec00749
|
暂时删除权限
|
2024-11-07 11:22:31 +08:00 |
|
禹翔辉
|
f5365b4a3a
|
Accept Merge Request #1491: (feature/客供料入库单优化_1 -> develop)
Merge Request: 1、处理销售单的依赖导致的更新报错问题；2、优化客供料单据获取销售单字段信息和成品信息方法；
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1491?initial=true
|
2024-11-07 10:45:30 +08:00 |
|
yuxianghui
|
8b9aa1c454
|
Merge branch 'feature/客供料入库单优化' into feature/客供料入库单优化_1
|
2024-11-07 10:43:58 +08:00 |
|
yuxianghui
|
9a4d7e87ec
|
1、处理销售单的依赖导致的更新报错问题；2、优化客供料单据获取销售单字段信息和成品信息方法；
|
2024-11-07 10:43:08 +08:00 |
|
胡尧
|
6679c200e1
|
开发
|
2024-11-07 08:41:25 +08:00 |
|