jinling.yang
|
37b834b3cf
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化
# Conflicts:
# sf_mrs_connect/models/res_config_setting.py
|
2023-06-29 11:15:40 +08:00 |
|
mgw
|
7689701ab1
|
刀具同步优化完成，字段已添加
|
2023-06-28 20:49:16 +08:00 |
|
jinling.yang
|
b02cb16dc9
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化
# Conflicts:
# sf_tool_management/__manifest__.py
# sf_tool_management/views/tool_base_views.xml
|
2023-06-28 18:34:39 +08:00 |
|
jinling.yang
|
eab6f0ceee
|
刀具产品页面刀具物料及型号字段修改
|
2023-06-28 18:32:45 +08:00 |
|
龚启豪
|
ec0da8cf76
|
Merge branch refs/heads/develop into refs/heads/feature/设备维保
|
2023-06-28 10:39:23 +08:00 |
|
jinling.yang
|
aea68f5239
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能
# Conflicts:
# sf_base/__manifest__.py
# sf_base/models/__init__.py
# sf_mrs_connect/data/ir_cron_data.xml
# sf_mrs_connect/models/sync_common.py
|
2023-06-27 16:40:58 +08:00 |
|
jinling.yang
|
d18b1808d9
|
新增同步夹具相关的定时器
|
2023-06-27 16:35:30 +08:00 |
|
jinling.yang
|
87e3f6d04e
|
新增夹具和功能夹具，及同步mrs的夹具和功能夹具
|
2023-06-26 18:07:44 +08:00 |
|
qihao.gong@jikimo.com
|
8b227d9ac9
|
设备维保
|
2023-06-25 17:37:55 +08:00 |
|
mgw
|
65c8d4a4e9
|
sf刀具重构完成，同步方法测试完成
|
2023-06-25 16:44:10 +08:00 |
|
jinling.yang
|
8a0d89161b
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板
|
2023-06-15 16:15:28 +08:00 |
|
jinling.yang
|
c7ec8be141
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板
|
2023-06-15 16:14:50 +08:00 |
|
mgw
|
ba93adfb7b
|
修复同步bug（刀片类型字段无值）
|
2023-06-15 15:40:23 +08:00 |
|
jinling.yang
|
34cc5bf125
|
新增刀具及刀具型号联动展示相关字段并显示对应信息，不同刀具的页面布局
|
2023-06-14 19:22:52 +08:00 |
|
mgw
|
93c5bcebe1
|
增加刀具物料同步功能
|
2023-06-14 16:33:53 +08:00 |
|
jinling.yang
|
6068a55b79
|
新增sf的刀具模板的相关刀具物料字段
|
2023-06-13 17:30:35 +08:00 |
|
yuxianghui
|
3a8c65c8d1
|
解决sf代码冲突问题
|
2023-06-13 11:19:06 +08:00 |
|
qihao.gong@jikimo.com
|
3baa438c2b
|
每日同步刀具定时器
|
2023-06-12 16:17:42 +08:00 |
|
mgw
|
06f907ba00
|
更正图片无法同步的bug
|
2023-06-12 15:09:30 +08:00 |
|
mgw
|
56580fa22a
|
同步方法已完成，合并
|
2023-06-12 14:48:06 +08:00 |
|
mgw
|
3d04200ca7
|
解决冲突
|
2023-06-12 14:35:14 +08:00 |
|
mgw
|
a1678f76c2
|
同步方法基本完成，优化图片展示
|
2023-06-12 13:17:52 +08:00 |
|
mgw
|
f95e04afc9
|
刀具同步方法（cloud >>> sf）基本完成，待测试
|
2023-06-12 09:24:33 +08:00 |
|
mgw
|
ac66e15d7a
|
部分cloud>sf同步接口已完成并测试
|
2023-06-09 18:15:12 +08:00 |
|
qihao.gong@jikimo.com
|
55129666c3
|
测试
|
2023-04-24 11:02:49 +08:00 |
|
qihao.gong@jikimo.com
|
38b383ec29
|
解决bug
|
2023-04-24 10:57:44 +08:00 |
|
qihao.gong@jikimo.com
|
b999e9f065
|
解决报错
|
2023-04-24 10:42:29 +08:00 |
|
jinling.yang
|
20d9e469f5
|
表面工艺类别拖动排序
|
2023-03-29 17:48:03 +08:00 |
|
jinling.yang
|
bf010e2cca
|
去掉警告及开发表面工艺相关需求
|
2023-03-27 21:04:33 +08:00 |
|
jinling.yang
|
446bd04a9d
|
新增同步mrs的表面工艺类别接口
|
2023-03-23 18:18:57 +08:00 |
|
龚启豪
|
bfd4f3c592
|
Accept Merge Request #149: (feature/一键打印功能 -> develop)
Merge Request: sf更新代码
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/149?initial=true
|
2023-03-14 14:58:10 +08:00 |
|
gqh
|
84ef243b9f
|
sf新增表面工艺参数同步接口和基础对象，新增dockerfile和requirements.txt文件
|
2023-03-14 14:56:18 +08:00 |
|
jinling.yang
|
dfeeed7b59
|
制造订单，产品，工单上进行3d模型展示
|
2023-03-09 17:34:44 +08:00 |
|
jinling.yang
|
a812c603ea
|
代码规范整理，产品页面模型和胚料的模型类型字段做显示
|
2023-02-09 15:26:08 +08:00 |
|
gqh
|
bdae9d9f95
|
恢复代码
|
2023-01-29 15:42:33 +08:00 |
|
gqh
|
9c473e6f32
|
优化sf
|
2023-01-23 20:21:00 +08:00 |
|
jinling.yang
|
5492d4f2fa
|
修复工作中心绑定机床和胚料外协供应商是否外包未勾选bug修复
|
2023-01-13 16:43:30 +08:00 |
|
jinling.yang
|
39136bb137
|
新增依赖
|
2023-01-11 15:25:49 +08:00 |
|
gqh
|
381d6ca9a5
|
更新mrs_connect
|
2023-01-11 15:04:37 +08:00 |
|
gqh
|
eb162cb416
|
合并工单优化
|
2023-01-11 11:13:52 +08:00 |
|
jinling.yang
|
01cf30b03f
|
优化涉及到的接口
|
2023-01-11 11:05:06 +08:00 |
|
gqh
|
311c7c723a
|
sf1.0
|
2023-01-09 23:04:53 +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
|
a4be58098e
|
创建胚料的bug修复
|
2022-12-26 10:25:16 +08:00 |
|
jinling.yang
|
5e2d75b23e
|
修改胚料部分
|
2022-12-09 17:23:07 +08:00 |
|
jinling.yang
|
a18d55850a
|
优化文件内容
|
2022-12-01 17:18:49 +08:00 |
|
jinling.yang
|
096cd44b9c
|
Merge branch 'feature/从ftp获取cnc程序文件' into develop
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2022-11-30 17:27:47 +08:00 |
|
jinling.yang
|
1bf8e8a268
|
文件写入cnc关联的attach里面
|
2022-11-30 17:19:46 +08:00 |
|