yuxianghui
|
15eb36a5bc
|
1、优化销售订单列表页、详情页字段显示；2、优化新增采购订单列表页、详情页字段显示；
|
2024-12-18 16:39:54 +08:00 |
|
yuxianghui
|
202fafac84
|
采购模块界面优化、采购类型新增【工序外协】、【外购订单】选项
|
2024-12-16 17:22:39 +08:00 |
|
yuxianghui
|
2b9a44761f
|
1、采购单详情页添加销售订单号关联字段，关联跳转至对应销售订单；2、采购页面优化
|
2024-12-13 17:03:45 +08:00 |
|
yuxianghui
|
3253b26818
|
1、报价、销售订单列表视图添加平台订单号字段。2、销售订单详情的采购链接按采购类型拆分为委外加工和采购的跳转链接；
|
2024-12-13 13:38:22 +08:00 |
|
mgw
|
08e4541a96
|
特殊表面工艺采购单还是有合并的情况-且重复了
|
2024-12-05 17:01:10 +08:00 |
|
胡尧
|
52ab962ace
|
解决删除表面工艺，多增加了采购单的bug
|
2024-12-05 15:09:04 +08:00 |
|
胡尧
|
e011e4cfd6
|
解决表面工艺工单完成后，生产入库单未就绪的问题
|
2024-12-05 09:31:06 +08:00 |
|
liaodanlong
|
9a1cde6abc
|
表面工艺采购单与调拨单拆分
|
2024-12-04 10:45:46 +08:00 |
|
jinling.yang
|
deb2f6ca64
|
修复采购
|
2024-11-28 18:01:29 +08:00 |
|
jinling.yang
|
c22b91f9d9
|
优化采购：一个制造订单对应一个采购单
|
2024-11-28 09:59:01 +08:00 |
|
廖丹龙
|
ed3ea32f45
|
Accept Merge Request #1543: (feature/delivery_status -> 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/1543
|
2024-11-25 11:52:20 +08:00 |
|
liaodanlong
|
84ebce0786
|
智能工厂空模型处理
|
2024-11-25 11:40:01 +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 |
|
胡尧
|
7408cc00f9
|
处理订单客供料的问题
|
2024-11-21 15:48:17 +08:00 |
|
胡尧
|
a7ed317b09
|
修改订单客供料显示，修改内部调拨、生产发料合并单据
|
2024-11-20 16:53:15 +08:00 |
|
jinling.yang
|
1cb646ec48
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整）
|
2024-11-18 17:41:10 +08:00 |
|
jinling.yang
|
c73706555f
|
优化外协采购和出入库单（工艺退回调整）
|
2024-11-18 17:40:41 +08:00 |
|
胡尧
|
21f961d893
|
Accept Merge Request #1519: (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/1519
|
2024-11-18 15:00:56 +08:00 |
|
胡尧
|
08a682143f
|
增加坯料冗余量
|
2024-11-18 15:00:05 +08:00 |
|
jinling.yang
|
5c5606749a
|
优化制造订单
|
2024-11-15 18:06:32 +08:00 |
|
jinling.yang
|
33a1837274
|
优化工单
|
2024-11-13 17:59:47 +08:00 |
|
胡尧
|
d68a9249c6
|
解决冲突
|
2024-11-11 16:32:54 +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
|
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 |
|
yuxianghui
|
9a4d7e87ec
|
1、处理销售单的依赖导致的更新报错问题；2、优化客供料单据获取销售单字段信息和成品信息方法；
|
2024-11-07 10:43:08 +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 |
|
胡尧
|
d2b028ed4e
|
Merge branch 'develop' into feature/sale_order_route_pick
|
2024-11-06 17:53:52 +08:00 |
|
胡尧
|
111c0f6dae
|
开发
|
2024-11-06 17:53:33 +08:00 |
|
yuxianghui
|
6c0d9486fc
|
Merge branch 'feature/报价单优化' into feature/客供料入库单优化
|
2024-11-06 17:24:57 +08:00 |
|
yuxianghui
|
211d74d9ff
|
处理 客供料入库单优化 需求
|
2024-11-06 17:24:10 +08:00 |
|
jinling.yang
|
84db3a92be
|
表面工艺外协采购单添加“采购类型",默认consignment（委外加工）
|
2024-11-06 10:46:21 +08:00 |
|
mgw
|
106945fba7
|
添加采购类型字段
|
2024-11-06 09:23:14 +08:00 |
|
guanhuan
|
3559d67c05
|
精度显示修改
|
2024-10-28 11:43:10 +08:00 |
|
jinling.yang
|
30e8d04b70
|
添加销售订单是否完成并恢复正常时效定时器
|
2024-10-24 16:50:27 +08:00 |
|
hujiaying
|
8cff3d8377
|
sf销售订单详情新增是否带料，带料尺寸，修改bfm分配工厂，sf接收订单生成销售订单新增两个字段，并修改订单详情及订单详情表单新增字段显示
|
2024-10-18 16:39:15 +08:00 |
|
jinling.yang
|
a00f4af923
|
优化销售订单逾期
|
2024-10-08 17:50:59 +08:00 |
|
jinling.yang
|
804bdb60e8
|
修复外协采购单
|
2024-08-29 14:21:18 +08:00 |
|
jinling.yang
|
f1780181fa
|
修复报废向导
|
2024-08-25 17:36:07 +08:00 |
|
yuxianghui
|
03cfc00be5
|
Merge branch 'feature/销售单优化' into feature/销售、刀具模块优化
|
2024-08-16 16:02:19 +08:00 |
|
yuxianghui
|
36fd17b6c7
|
1、处理 智能工厂，销售角色与采购角色权限更新 需求
|
2024-08-08 17:03:36 +08:00 |
|
杨金灵
|
d333621c7a
|
Accept Merge Request #1216: (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/1216
|
2024-08-08 15:07:37 +08:00 |
|
jinling.yang
|
aaa19b96fd
|
还原注释代码
|
2024-08-08 14:57:55 +08:00 |
|
jinling.yang
|
1547a6064f
|
优化表面工艺
|
2024-08-07 17:30:29 +08:00 |
|
jinling.yang
|
5393ef686a
|
优化表面工艺
|
2024-08-05 17:28:48 +08:00 |
|
liaodanlong
|
81dbbf980c
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync
|
2024-07-29 15:09:37 +08:00 |
|
jinling.yang
|
a5d8e88f1d
|
注释OCC代码
|
2024-07-24 16:33:47 +08:00 |
|
jinling.yang
|
da8e543819
|
修复返工向导
|
2024-07-23 17:18:31 +08:00 |
|
jinling.yang
|
8a0c968b10
|
修复返工bug
|
2024-07-19 17:25:51 +08:00 |
|
liaodanlong
|
dfba055019
|
添加bfm同步时产品创建填充税值
|
2024-07-19 16:45:46 +08:00 |
|