jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
436 Commits 134 Branches 0 Tags
aea68f5239970957d8eab6368f305ddd2c5ead26
Commit Graph

77 Commits

Author SHA1 Message Date
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
马广威
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
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
mgw
b1da7a8fda 型号对象增加搜索视图 2023-06-15 12:20:26 +08:00
jinling.yang
34cc5bf125 新增刀具及刀具型号联动展示相关字段并显示对应信息，不同刀具的页面布局 2023-06-14 19:22:52 +08:00
mgw
f6651ffffb 删除测试模型 2023-06-14 17:36:39 +08:00
mgw
93c5bcebe1 增加刀具物料同步功能 2023-06-14 16:33:53 +08:00
qihao.gong@jikimo.com
c919dac8cb 刀具管理 2023-06-13 17:33:38 +08:00
jinling.yang
6068a55b79 新增sf的刀具模板的相关刀具物料字段 2023-06-13 17:30:35 +08:00
mgw
3d1d5e6ef3 智能工厂刀具物料模型、关联关系及其界面已建立 2023-06-13 14:13:15 +08:00
yuxianghui
3a8c65c8d1 解决sf代码冲突问题 2023-06-13 11:19:06 +08:00
mgw
3d04200ca7 解决冲突 2023-06-12 14:35:14 +08:00
mgw
ac66e15d7a 部分cloud>sf同步接口已完成并测试 2023-06-09 18:15:12 +08:00
mgw
bf3c7e2b4d sf刀具基础信息已初步建立 2023-06-08 14:58:40 +08:00
jinling.yang
e1a8f68eea Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单行新增模型展示 2023-05-15 17:02:01 +08:00
qihao.gong@jikimo.com
f7e234e1b9 devops测试部署 2023-04-27 15:19:03 +08:00
qihao.gong@jikimo.com
ca8b4c6086 测试dev 2023-04-27 14:46:57 +08:00
qihao.gong@jikimo.com
f85c9166f1 devops流程部署测试 2023-04-26 10:33:03 +08:00
qihao.gong@jikimo.com
ad8651aa11 测试dev 2023-04-26 10:10:06 +08:00
jinling.yang
b942696c69 1.销售模块的销售页面的订单行展示模型 
2.表面工艺及类别菜单的排序
 2023-04-24 17:09:16 +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
jinling.yang
740df7c99a 新增表面工艺外协需求 2023-03-20 17:37:23 +08:00
gqh
84ef243b9f sf新增表面工艺参数同步接口和基础对象，新增dockerfile和requirements.txt文件 2023-03-14 14:56:18 +08:00
gqh
f5c8623c72 sf优化 2023-01-30 17:33:38 +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
5e2d75b23e 修改胚料部分 2022-12-09 17:23:07 +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
191bd65d69 接收从智能工厂传过来的订单等数据并创建编程单 2022-11-16 17:39:42 +08:00
jinling.yang
4ce0a7670c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 
# Conflicts:
#	sf_base/models/sf_base.py
#	sf_manufacturing_orders/__manifest__.py
#	sf_route_workcenter/models/workcenter.py
 2022-11-16 09:43:10 +08:00
jinling.yang
98c3f868e9 123 2022-11-16 09:42:33 +08:00
gqh
ba92f616a0 工单优化更新 2022-11-15 16:16:21 +08:00
gqh
e23548a0d3 cnc程序上传 2022-11-11 10:31:37 +08:00
jinling.yang
aadbd80422 修改工单重复，业务平台分配工厂自动生成产品部分新增字段 2022-11-08 18:36:36 +08:00
马广威
65b46249e8 Merge branch develop into feature/1103_sf_machine_connect 2022-11-08 15:03:55 +08:00
jinling.yang
c1d6a24cd9 去掉非相关代码 2022-11-08 10:01:53 +08:00
jinling.yang
cbf1cd8b0b 工序增加工序类型字段 2022-11-07 15:39:26 +08:00
gqh
8776fc7d6c 合并代码 2022-11-07 11:21:31 +08:00
gqh
84cf25f39d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 
# Conflicts:
#	sf_base/security/ir.model.access.csv
#	sf_base/views/mrs_common_view.xml
#	sf_route_workcenter/models/workcenter.py
 2022-11-07 11:00:14 +08:00