jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,944 Commits 134 Branches 31 Tags
a1d4e7405690c10d26638599382e2fa6599626e8
Commit Graph

57 Commits

Author SHA1 Message Date
胡尧
a767c6491f 增加移除焦点的controller 2024-08-20 14:05:05 +08:00
mgw
c788392b36 打印配置初步优化并测试成功，自测流程成功 2024-03-20 16:58:57 +08:00
mgw
b9bb528db0 客户列表公司类型卡片增加税ID，计划处tree视图增加批量排程button 2024-01-03 23:03:08 +08:00
jinling.yang
93ce482d40 优化采购和销售 2023-12-22 17:43:25 +08:00
jinling.yang
f0e66c6d90 新增销售权限 2023-11-21 17:30:07 +08:00
jinling.yang
108cb96ca5 修复刀具产品及同步刀具标准库 2023-11-01 17:45:54 +08:00
jinling.yang
093724a277 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） 
# Conflicts:
#	sf_sale/models/quick_easy_order.py
 2023-10-24 09:45:35 +08:00
mgw
587e2a4e3e 修复sequence导致字段值移动位置的bug 2023-10-20 10:50:35 +08:00
jinling.yang
d83255cc67 优化同步刀具标准库接口（包含全部合并每日） 2023-10-19 17:23:53 +08:00
jinling.yang
e7df6c14b1 同步刀具标准库 2023-10-19 10:49:54 +08:00
jinling.yang
9acdcc0429 新增同步cloud的刀具标准库接口 2023-10-13 17:29:34 +08:00
jinling.yang
6b7b536236 1.优化同步cloud的静态资源库的定时器的代码 
2.新增能力特征库的接口
 2023-10-10 17:19:11 +08:00
yuxianghui
35afdd3b2a 刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块；新增每齿走刀量模型；整体式刀具物料新增关联每齿走刀量对象字段； 2023-09-08 10:20:52 +08:00
yuxianghui
c8129478d5 新增加工方式、刀尖特征、柄部类型、走刀方向、适合冷却液五个模型对象；刀具物料查询新增上述五个关联对象；对产品的整体式刀具物料能力参数进行补充。 2023-09-04 17:29:20 +08:00
jinling.yang
7174de3de6 产品模板的型号手动输入时型号对象的编码，联装类型，夹具物料字段的值显示 2023-08-25 15:46: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
qihao.gong@jikimo.com
06de46c084 修改设备模块 2023-07-28 15:33:31 +08:00
jinling.yang
b1da9ff18b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面展示优化 2023-07-17 16:48:44 +08:00
jinling.yang
5beb7b3417 优化装夹工单，新增工件装夹page，名字为组件的page名称改为物料，去掉单独的工件装夹功能 2023-07-13 16:57:48 +08:00
jinling.yang
66cd682f7d 优化工件装夹 2023-07-05 17:34:43 +08:00
jinling.yang
0f7f67aade Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能 2023-06-29 17:14:48 +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
马广威
8b94696dc3 Accept Merge Request #205: (feature/sf刀具基础信息管理 -> develop) 
Merge Request: sf刀具重构完成，同步方法测试完成


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/205?initial=true
 2023-06-27 16:27:32 +08:00
jinling.yang
87e3f6d04e 新增夹具和功能夹具，及同步mrs的夹具和功能夹具 2023-06-26 18:07:44 +08:00
mgw
65c8d4a4e9 sf刀具重构完成，同步方法测试完成 2023-06-25 16:44:10 +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
yuxianghui
3a8c65c8d1 解决sf代码冲突问题 2023-06-13 11:19:06 +08:00
mgw
a1678f76c2 同步方法基本完成，优化图片展示 2023-06-12 13:17:52 +08:00
mgw
bf3c7e2b4d sf刀具基础信息已初步建立 2023-06-08 14:58:40 +08:00
jinling.yang
bf010e2cca 去掉警告及开发表面工艺相关需求 2023-03-27 21:04:33 +08:00
jinling.yang
a18d55850a 优化文件内容 2022-12-01 17:18:49 +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
jinling.yang
c4876e9631 Merge branch 'feature/修改产品等信息' into develop 
# Conflicts:
#	sf_base/models/product_template.py
#	sf_route_workcenter/models/workcenter.py
 2022-11-20 20:11:21 +08:00
gqh
057ec915d9 更新制造订单生成工单时的工序字段 2022-11-17 17:27:05 +08:00
jinling.yang
98c3f868e9 123 2022-11-16 09:42:33 +08:00
gqh
dc24df19c2 修改 2022-11-08 10:39:45 +08:00
gqh
dcbf38c039 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单流程 
# Conflicts:
#	sf_base/__manifest__.py
#	sf_bpm_api/__manifest__.py
#	sf_manufacturing_orders/models/sf_production.py
 2022-11-08 10:30:00 +08:00
jinling.yang
c0d8fe0f6f 新增模块引用 2022-11-08 10:02:41 +08:00
jinling.yang
c1d6a24cd9 去掉非相关代码 2022-11-08 10:01:53 +08:00
gqh
7118596e1c 工单流程代码合并 2022-11-07 16:42:49 +08:00
gqh
a49a24e9e6 合并代码 2022-11-07 10:59:22 +08:00
jinling.yang
ae85009a18 修复模板类型工序 2022-11-01 17:30:25 +08:00
jinling.yang
002653957e 改造制造订单里的生成工单 2022-10-27 17:27:40 +08:00
jinling.yang
71a925334e 生成产品的BOM上的加工工序 2022-10-26 17:27:32 +08:00
jinling.yang
5b75e5423a 生成bom 2022-10-18 18:36:41 +08:00
jinling.yang
c06fec0e74 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 
# Conflicts:
#	sf_base/views/menu_view.xml
#	sf_base/views/mrs_common_view.xml
 2022-10-14 16:41:22 +08:00
jinling.yang
b4aa6b61ed 智能工厂去掉工厂token等信息 2022-10-14 16:36:45 +08:00