胡尧
|
9d723c5e00
|
修改人工线下加工状态的继承位置
|
2024-11-15 15:03:06 +08:00 |
|
胡尧
|
f6f9d14f0a
|
给坯料模板增加按订单补给
|
2024-11-15 09:12:34 +08:00 |
|
胡尧
|
b8d5d655ea
|
增加依赖
|
2024-11-14 16:59:18 +08:00 |
|
胡尧
|
5dc5c814c8
|
增加加工类型
|
2024-11-14 16:52:58 +08:00 |
|
胡尧
|
6e17bb933f
|
增加是否线下加工日志
|
2024-11-14 16:36:02 +08:00 |
|
胡尧
|
ed641c85b3
|
修改注释
|
2024-11-14 15:36:01 +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 |
|
胡尧
|
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 |
|
胡尧
|
975ced08cb
|
增加成品工序模板（人工线下加工）
|
2024-11-12 14:00:27 +08:00 |
|
jinling.yang
|
317f44d6c2
|
修复工艺设计
|
2024-11-12 09:00:45 +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 |
|
胡尧
|
cd9f485fc0
|
增加零件名称
|
2024-11-11 16:38:28 +08:00 |
|
yuxianghui
|
dda627f20a
|
工单工序排序方法重构
|
2024-11-11 16:38:06 +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 |
|
胡尧
|
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 |
|
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
|
d419efa3c3
|
优化工艺确认
|
2024-11-07 17:59:28 +08:00 |
|
yuxianghui
|
330726007d
|
1、添加只有客供料入库单才能看见收货人/联系地址/电话号码等字段;
|
2024-11-07 16:26:48 +08:00 |
|
yuxianghui
|
a0eec00749
|
暂时删除权限
|
2024-11-07 11:22:31 +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 |
|
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 |
|
jinling.yang
|
72998f04c6
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/添加工艺工程师权限组
|
2024-11-06 17:49:01 +08:00 |
|
jinling.yang
|
23db164452
|
制造模块添加工艺工程师权限组
|
2024-11-06 17:48:27 +08:00 |
|
jinling.yang
|
fa30e0c1da
|
添加工艺设计
|
2024-11-06 17:44:13 +08:00 |
|
yuxianghui
|
211d74d9ff
|
处理 客供料入库单优化 需求
|
2024-11-06 17:24:10 +08:00 |
|
jinling.yang
|
aa9bdfe372
|
添加工艺设计
|
2024-11-06 10:40:11 +08:00 |
|
yuxianghui
|
8ea72198ea
|
1、完成报价单优化需求；2、修改制造订单内装夹工单的‘返工’按钮为’异常反馈‘
|
2024-11-05 17:52:18 +08:00 |
|
jinling.yang
|
7d6699fe7a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作
|
2024-11-01 16:00:53 +08:00 |
|
胡尧
|
76597f6ccb
|
在下发编程单时，如果已经排程，在修改工单起止时间时先设置大的结束时间，避免设置时间出错
|
2024-10-31 11:15:06 +08:00 |
|
mgw
|
3bc33fe2fc
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2024-10-29 14:28:44 +08:00 |
|
mgw
|
c21319a127
|
rfid手动输入推送
|
2024-10-29 14:28:24 +08:00 |
|
管欢
|
9bac3675f6
|
Accept Merge Request #1475: (feature/message_update -> 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/1475
|
2024-10-28 11:54:04 +08:00 |
|
guanhuan
|
b4fbbd48fb
|
精度显示修改
|
2024-10-28 11:46:36 +08:00 |
|
guanhuan
|
3559d67c05
|
精度显示修改
|
2024-10-28 11:43:10 +08:00 |
|
管欢
|
06d061165b
|
Accept Merge Request #1473: (feature/message_update -> 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/1473
|
2024-10-28 10:30:02 +08:00 |
|
guanhuan
|
18a7dbbff9
|
辅助文件上传
|
2024-10-28 10:21:33 +08:00 |
|
jinling.yang
|
537fbf7e14
|
添加注释
|
2024-10-25 17:19:10 +08:00 |
|