胡尧
|
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
|
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
|
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
|
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 |
|
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 |
|
guanhuan
|
b4fbbd48fb
|
精度显示修改
|
2024-10-28 11:46:36 +08:00 |
|
guanhuan
|
3559d67c05
|
精度显示修改
|
2024-10-28 11:43:10 +08:00 |
|
guanhuan
|
18a7dbbff9
|
辅助文件上传
|
2024-10-28 10:21:33 +08:00 |
|
jinling.yang
|
537fbf7e14
|
添加注释
|
2024-10-25 17:19:10 +08:00 |
|
jinling.yang
|
7227e1e59c
|
注释occ代码
|
2024-10-25 14:58:29 +08:00 |
|
guanhuan
|
519ce0d5bb
|
工单下发调整
|
2024-10-25 11:29:13 +08:00 |
|
jinling.yang
|
30e8d04b70
|
添加销售订单是否完成并恢复正常时效定时器
|
2024-10-24 16:50:27 +08:00 |
|
mgw
|
39f99d6ce7
|
处理工单的组件不存在时报错的问题
|
2024-10-24 16:04:38 +08:00 |
|
管欢
|
f366b650d0
|
Accept Merge Request #1444: (feature/auxiliary_files_upload -> 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/1444
|
2024-10-23 17:54:42 +08:00 |
|
guanhuan
|
6054ce39f3
|
附件文件名
|
2024-10-23 17:43:03 +08:00 |
|
yuxianghui
|
bf9d848f10
|
1、工单状态优化
|
2024-10-23 17:04:35 +08:00 |
|
liaodanlong
|
0d512e2e43
|
制造订单添加订单交期字段信息
|
2024-10-22 13:55:24 +08:00 |
|
liaodanlong
|
da38d24111
|
制造订单添加订单交期字段信息
|
2024-10-22 13:33:53 +08:00 |
|
liaodanlong
|
f897955f68
|
制造订单添加订单交期字段信息
|
2024-10-22 11:45:08 +08:00 |
|
liaodanlong
|
736a18518c
|
制造订单添加订单交期字段信息
|
2024-10-21 16:07:43 +08:00 |
|
liaodanlong
|
41b287d559
|
制造订单添加订单交期字段信息
|
2024-10-21 16:06:03 +08:00 |
|
liaodanlong
|
c01e9a4d39
|
制造订单添加订单交期字段信息
|
2024-10-21 14:18:53 +08:00 |
|
liaodanlong
|
f62c70d354
|
Merge branch 'refs/heads/develop' into feature/销售和排程添加消息推送
|
2024-10-21 13:57:24 +08:00 |
|
liaodanlong
|
22c9de86f6
|
制造订单添加订单交期字段信息
|
2024-10-21 13:56:34 +08:00 |
|
guanhuan
|
124bc8478e
|
辅助文件上传
|
2024-10-21 10:09:19 +08:00 |
|
guanhuan
|
1a3a178ec6
|
Revert "辅助文件上传"
This reverts commit cae5149fba.
|
2024-10-21 10:08:35 +08:00 |
|
guanhuan
|
cae5149fba
|
辅助文件上传
|
2024-10-21 10:07:49 +08:00 |
|
guanhuan
|
4003d6a652
|
Merge branch 'refs/heads/develop' into feature/auxiliary_files_upload
# Conflicts:
# sf_dlm_management/views/product_template_management_view.xml
|
2024-10-21 09:50:09 +08:00 |
|
yuxianghui
|
763009a3c0
|
1、优化手动返工时，cnc用刀校验逻辑
|
2024-10-17 17:01:20 +08:00 |
|
guanhuan
|
cf34ac5bbc
|
辅助文件上传
|
2024-10-17 16:31:13 +08:00 |
|
yuxianghui
|
1245323b9d
|
1、优化手动获取编程的接口，添加获取编程完成之后进行用刀校验；2、处理 权限问题-工单详情缺少【时间跟踪】tab；3、用刀校验方法添加日志
|
2024-10-17 14:22:09 +08:00 |
|
杨金灵
|
9b275536e9
|
Accept Merge Request #1406: (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/1406?initial=true
|
2024-10-17 10:10:51 +08:00 |
|
jinling.yang
|
bf39ed10b4
|
还原代码
|
2024-10-17 10:03:45 +08:00 |
|