qihao.gong@jikimo.com
|
b01a5a4216
|
刀把类型新增bt50 修改同步品牌图片报错问题
|
2023-08-23 14:37:02 +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 |
|