Commit Graph

21 Commits

Author SHA1 Message Date
jinling.yang
f68dce9ee2 修复产品模板中产品类别为刀具和夹具时,根据产品类别为刀具和夹具时,新增的page页面里的字段显示及回显Bug 2023-07-17 16:46:01 +08:00
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
jinling.yang
6068a55b79 新增sf的刀具模板的相关刀具物料字段 2023-06-13 17:30:35 +08:00
mgw
3d04200ca7 解决冲突 2023-06-12 14:35:14 +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
jinling.yang
2df811d4ce 产品新增3d模型展示 2023-03-06 17:02:21 +08:00
gqh
59cb6e5def 优化工单界面,新增物料page,修复工单按钮bug,隐藏权限字段 2023-02-02 14:59:39 +08:00
gqh
eb162cb416 合并工单优化 2023-01-11 11:13:52 +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
a3e39d4fac 产品和制造订单新增模型和occ查看模型模块 2022-12-30 10:00:17 +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
11a360222e cnc获取 2022-11-22 21:18:15 +08:00
jinling.yang
12615b3dba 销售和产品代码整合 2022-11-22 11:08:07 +08:00
jinling.yang
3cbd1140bb mrs为名的更改为sf 2022-11-22 10:20:18 +08:00
jinling.yang
e12d3acf4d 修改模块分类名称 2022-11-22 09:56:29 +08:00
jinling.yang
830f3bb35e 212 2022-11-21 20:04:56 +08:00