guanhuan
|
6a70f3b88a
|
坯料冗余新增描述字段
|
2025-03-26 14:32:53 +08:00 |
|
胡尧
|
7408cc00f9
|
处理订单客供料的问题
|
2024-11-21 15:48:17 +08:00 |
|
胡尧
|
d53f3837c3
|
增加坯料冗余量
|
2024-11-19 08:59:52 +08:00 |
|
胡尧
|
bc0b8bdecb
|
增加坯料冗余量，调整坯料客供料的名称
|
2024-11-18 09:44:50 +08:00 |
|
yuxianghui
|
9a4d7e87ec
|
1、处理销售单的依赖导致的更新报错问题；2、优化客供料单据获取销售单字段信息和成品信息方法；
|
2024-11-07 10:43:08 +08:00 |
|
guanhuan
|
8661dd16c1
|
加工精度同步
|
2024-10-22 15:37:41 +08:00 |
|
guanhuan
|
7157ea1587
|
加工精度同步
|
2024-10-22 15:35:34 +08:00 |
|
guanhuan
|
00a04af94f
|
加工精度
|
2024-10-18 09:30:20 +08:00 |
|
qihao.gong@jikimo.com
|
1a50a8220e
|
处理设备字段类型相关缺陷
|
2024-03-05 16:50:08 +08:00 |
|
yuxianghui
|
077ce6d37f
|
1、删除夹具型号自动更新code值的方法；2、优化功能刀具安全库存创建功能刀具组装单方法；3、优化功能刀具列表中的能力数据的图文展示数据；
|
2024-01-10 17:42:59 +08:00 |
|
qihao.gong@jikimo.com
|
c81dc99aef
|
修改获取CNC程序从工单到制造订单
|
2024-01-05 11:23:27 +08:00 |
|
qihao.gong@jikimo.com
|
2391c08485
|
修改i机床接口同步以及参数
|
2023-12-14 17:33:28 +08:00 |
|
qihao.gong@jikimo.com
|
893aa2111c
|
处理coding报错
|
2023-11-29 17:34:15 +08:00 |
|
qihao.gong@jikimo.com
|
5b1d347fd4
|
增加设备模块权限角色，优化coding代码扫描警告
|
2023-11-28 17:23:49 +08:00 |
|
qihao.gong@jikimo.com
|
6fc735063a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
# Conflicts:
# sf_manufacturing/models/stock.py
|
2023-11-20 15:41:50 +08:00 |
|
qihao.gong@jikimo.com
|
1da7a0195d
|
根据odoo规则修改py文件中得import顺序
|
2023-11-20 14:59:06 +08:00 |
|
mgw
|
718b1f9edf
|
优化代码结构
|
2023-11-20 13:23:37 +08:00 |
|
qihao.gong@jikimo.com
|
e6a68eb1eb
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
|
2023-08-29 15:48:48 +08:00 |
|
qihao.gong@jikimo.com
|
b7f2c4a000
|
sf修改设备table，品牌图片改成图片
|
2023-08-29 15:47:58 +08:00 |
|
yuxianghui
|
39feda07e5
|
自建模块日志警告信息处理
|
2023-08-28 17:31:41 +08:00 |
|
jinling.yang
|
55504c2725
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能
|
2023-08-24 17:32:25 +08:00 |
|
jinling.yang
|
f9e4b73fb0
|
新增上传模型功能
|
2023-08-23 17:34:06 +08:00 |
|
qihao.gong@jikimo.com
|
90868d4a09
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
|
2023-08-23 14:37:20 +08:00 |
|
qihao.gong@jikimo.com
|
b01a5a4216
|
刀把类型新增bt50 修改同步品牌图片报错问题
|
2023-08-23 14:37:02 +08:00 |
|
jinling.yang
|
cd33fb9fb9
|
夹具型号同步修复
|
2023-08-23 10:09:47 +08:00 |
|
jinling.yang
|
97fcf6d91f
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
# Conflicts:
# sf_base/views/base_view.xml
|
2023-08-17 18:03:12 +08:00 |
|
jinling.yang
|
8a99bd8589
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
|
2023-08-15 17:31:49 +08:00 |
|
qihao.gong@jikimo.com
|
e0f43fa9fe
|
修改机床型号参数缺陷
|
2023-08-15 17:31:27 +08:00 |
|
qihao.gong@jikimo.com
|
ce3ffb75ae
|
处理控制系统参数丢失问题
|
2023-08-11 17:06:57 +08:00 |
|
qihao.gong@jikimo.com
|
150c40f9b1
|
处理数控系统同步数据 name缺失问题
|
2023-08-11 16:55:50 +08:00 |
|
qihao.gong@jikimo.com
|
f0e1939b95
|
修改设备参数以及机床型号基础参数以及同步cloud方法
|
2023-08-07 16:00:26 +08:00 |
|
jinling.yang
|
5df00e14da
|
制造模块里的配置内的页面优化
|
2023-08-03 16:57:18 +08:00 |
|
jinling.yang
|
7ee652d021
|
1.夹具物料,联装类型，功能夹具类型的Tree视图去掉删除方法和删除操作;同步的方法里新增active字段
2.品牌模型新增厂家型号字段
3.修复3D模型全屏展示及不显示模型Bug
|
2023-07-26 18:52:27 +08:00 |
|
禹翔辉
|
8c9a211295
|
Accept Merge Request #203: (feature/sf刀具功能分支 -> develop)
Merge Request: 智能工厂类型备注样式调整
Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/203?initial=true
|
2023-06-16 11:13:21 +08:00 |
|
yuxianghui
|
062b50d34c
|
智能工厂类型备注样式调整
|
2023-06-16 11:01:24 +08:00 |
|
qihao.gong@jikimo.com
|
23aba08c87
|
处理bug
|
2023-06-16 10:56:25 +08:00 |
|
qihao.gong@jikimo.com
|
018fecfc59
|
处理冲突
|
2023-06-16 10:02:33 +08:00 |
|
jinling.yang
|
6068a55b79
|
新增sf的刀具模板的相关刀具物料字段
|
2023-06-13 17:30:35 +08:00 |
|
mgw
|
3d04200ca7
|
解决冲突
|
2023-06-12 14:35:14 +08:00 |
|
jinling.yang
|
a812c603ea
|
代码规范整理，产品页面模型和胚料的模型类型字段做显示
|
2023-02-09 15:26:08 +08:00 |
|
gqh
|
d032f89272
|
sf优化绑定托盘，工单form显示开始按钮 加工时间
|
2023-02-01 17:53:32 +08:00 |
|
gqh
|
f5c8623c72
|
sf优化
|
2023-01-30 17:33:38 +08:00 |
|
gqh
|
d0497aa043
|
工单优化
|
2023-01-09 20:40:27 +08:00 |
|
jinling.yang
|
b7723f82d0
|
优化sf获取cnc程序和ftp
|
2023-01-09 19:54:02 +08:00 |
|
jinling.yang
|
5fcb17d048
|
胚料bug修复，销售订单明细行路线修复，编程单下发优化
|
2022-12-27 17:28:47 +08:00 |
|
jinling.yang
|
5e2d75b23e
|
修改胚料部分
|
2022-12-09 17:23:07 +08:00 |
|
gqh
|
4fa8bb964d
|
合并
|
2022-11-30 14:42:52 +08:00 |
|
gqh
|
51ff0dc6ac
|
行业编码注册获取到sf
|
2022-11-23 14:11:59 +08:00 |
|
gqh
|
1582896ac4
|
机床唯一编码生成
|
2022-11-23 11:00:07 +08:00 |
|
jinling.yang
|
830f3bb35e
|
212
|
2022-11-21 20:04:56 +08:00 |
|