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

205 Commits

Author SHA1 Message Date
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
gqh
a49a24e9e6 合并代码 2022-11-07 10:59:22 +08:00
jinling.yang
65a7d74430 修改匹配加工中心 2022-11-04 16:08:43 +08:00
jinling.yang
14d0d32ab6 匹配加工中心 2022-11-03 17:58:33 +08:00
mgw
99d56cb53e 将采集到的数据添加到机床对象的page中 2022-11-03 17:37:19 +08:00
gqh
671901cb8d 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
 2022-11-03 15:11:09 +08:00
jinling.yang
f2988ddffb 根据工序模板生成工单，及相关页面新增加工面板及重复字段 2022-11-03 15:01:15 +08:00
jinling.yang
ae85009a18 修复模板类型工序 2022-11-01 17:30:25 +08:00
jinling.yang
7067b29735 新增根据模型类型计算出产品的胚料尺寸 2022-10-31 17:34:44 +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
c3a7a6c4d6 工序增加唯一编码,是否重复，排序；用xml代码生成CNC加工的标准工序； 
产品增加模型类型对象和加工的面，包括胚料增加的尺寸
 2022-10-25 17:30:13 +08:00
gqh
0fb751ebbe 托盘绑定工单，托盘生成二维码 2022-10-25 17:19:42 +08:00
jinling.yang
33adc646e2 智能工厂-制造模块基础设置新增托盘 2022-10-19 15:46:07 +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
gqh
5e5d62eabd 制造订单 单个制造 2022-10-14 14:44:05 +08:00
jinling.yang
8611e138b3 新增工厂临时token密钥字段 2022-10-13 17:25:25 +08:00
gqh
7e98d35f14 更新sf 2022-10-13 16:43:36 +08:00
gqh
aebd4d3f32 修复sf同步问题 2022-10-11 16:01:36 +08:00
gqh
6d2292e1d0 合并业务平台 2022-10-10 17:01:22 +08:00
gqh
839de4c95f 更新sf 2022-10-10 10:52:24 +08:00