Commit Graph

166 Commits

Author SHA1 Message Date
yuxianghui
573b50da68 销售订单添加合同字段,销售订单form页面新增合同page页,优化/api/bfm_process_order/list接口添加合同信息处理。 2025-06-04 11:31:28 +08:00
胡尧
40137ba69c 去掉产品form重复的字段 2025-04-24 14:31:22 +08:00
胡尧
d16d47dfbe 销售订单,制造订单视图中加入模型id 2025-04-24 14:13:10 +08:00
guanhuan
9cfc8418ec 优化库存排序 2025-04-17 13:44:25 +08:00
hyyy
1c57ee0be1 修复没加引号字段 2025-04-02 09:04:38 +08:00
hyyy
5b9dc05653 还原代码 2025-04-02 08:48:27 +08:00
胡尧
0347eb48e4 销售订单行增加交期字段,销售订单列表默认值修改为供货方式待确认 2025-03-25 13:48:17 +08:00
胡尧
a864845d2b 解决销售订单form中,tree内显示模型的问题 2025-03-14 16:06:33 +08:00
胡尧
ad8ec770b6 Merge branch 'develop' into feature/commercially_launched 2025-03-13 09:17:33 +08:00
胡尧
f5da36a82c 修改销售订单模型显示 2025-03-12 17:26:19 +08:00
胡尧
29337bfceb 调整模型显示 2025-03-12 17:05:29 +08:00
guanhuan
0d7f348194 调拨列表采购订单询价单页面优化 2025-03-07 11:29:32 +08:00
胡尧
e8fc38e6ed Merge branch 'develop' into feature/commercially_launched 2025-03-04 09:32:07 +08:00
yuxianghui
7ecb28382a 1、库存序列号的更新序列号功能按钮优化;2、销售单默认显示字段优化; 2025-02-25 10:28:51 +08:00
胡尧
52e585e637 解决冲突 2025-02-20 13:51:24 +08:00
胡尧
05dac9fb0c 调整模型上传的流程 2025-02-20 13:36:05 +08:00
管欢
85f19defa8 Accept Merge Request #1820: (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/1820
2025-02-19 14:50:15 +08:00
guanhuan
bdccce07d4 采购协议 2025-02-19 11:31:46 +08:00
guanhuan
4dc19cab81 采购协议 2025-02-19 10:42:48 +08:00
hyyy
69c5996db7 合并销售订单列,修改必填*展示方法, 2025-02-17 16:03:14 +08:00
hyyy
b117fde8c3 删除模块,移到efms里面,修改样式 2025-02-14 17:31:19 +08:00
yuxianghui
bc4806b303 1、销售订单详情界面列表优化;2、完成 人工线下加工制造订单提交返工时-建议隐藏【保留装夹预调测量数据】 需求 2025-02-08 16:47:06 +08:00
胡尧
b9d95c0751 解决收藏报错的问题 2025-01-14 15:48:49 +08:00
yuxianghui
4902fc5d9a 1、采购订单的关联销售订单字段从销售模块搬迁到制造模块,并新增一个many2many类型字段,且对字段的自动计算方法进行优化。 2024-12-31 10:56:07 +08:00
yuxianghui
32e3c2f79f 采购订单源文档字段名称改为源单据 2024-12-31 08:56:41 +08:00
yuxianghui
acee32cc39 1、采购订单form页买家改名为采购员;2、优化成品入库单的的坯料委外加工链接; 2024-12-31 08:47:44 +08:00
yuxianghui
d7ce69f474 1、询价单的确认按钮权限添加;2、成品调拨单添加对应的坯料采购单和坯料外协单跳转链接 2024-12-30 17:04:59 +08:00
mgw
a3a2c96d00 添加紧急采购字段 2024-12-30 08:57:05 +08:00
yuxianghui
1b278a1432 1、订单详情字段显示优化;2、采购单页面优化 2024-12-26 16:28:39 +08:00
yuxianghui
82983871fc Merge branch 'feature/制造订单优化' into feature/制造、采购优化 2024-12-25 13:03:44 +08:00
yuxianghui
7f17ff8b78 1、处理制造订单返工确认后,状态还是返工的bug;2、隐藏已取消状态的采购单【确认订单】按钮 2024-12-25 13:02:49 +08:00
mgw
aaf3b20e65 询价单字段排版及增加逻辑验证 2024-12-24 17:27:08 +08:00
yuxianghui
fe5990ff9a Merge branch 'feature/制造、采购、工单优化' into feature/采购、外协优化 2024-12-23 17:14:00 +08:00
yuxianghui
6db5e72752 1、采购单的采购类型优化,外协优化 2024-12-23 17:13:12 +08:00
guanhuan
88f3155132 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/消息提醒优化
# Conflicts:
#	sf_sale/views/purchase_order_view.xml
2024-12-23 14:06:11 +08:00
liaodanlong
41096c9c65 零件图号零件名称 2024-12-20 14:55:04 +08:00
guanhuan
bf227e3e92 交期状态 2024-12-20 14:33:23 +08:00
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
yuxianghui
179ce86bef 1、去除工单页面的时效状态自动筛选项;2、坯料制造订单添加批量确认加工工艺功能;3、处理返工新生成的工单工序错误问题;4、采购、销售页面优化 2024-12-11 10:33:10 +08:00
yuxianghui
e260ef01f0 隐藏销售模块的 快速订单 菜单 2024-12-04 11:43:02 +08:00
胡尧
a7ed317b09 修改订单客供料显示,修改内部调拨、生产发料合并单据 2024-11-20 16:53:15 +08:00
胡尧
08a682143f 增加坯料冗余量 2024-11-18 15:00:05 +08:00
胡尧
d68a9249c6 解决冲突 2024-11-11 16:32:54 +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
5dae0ea973 1、sf视图展示界面优化 2024-11-11 14:52:44 +08:00
胡尧
0f37b45b30 开发 2024-11-11 10:22:53 +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