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 |
|
jinling.yang
|
aeb9b0f796
|
新增获得mrs下发编程单
|
2022-11-20 19:44:31 +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 |
|
gqh
|
edd6c30176
|
合并代码
|
2022-11-08 11:44:37 +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
|
1ebfbc07b9
|
修改工序类型
|
2022-11-08 10:16:43 +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
|
1cafd2c309
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单流程
|
2022-11-07 16:43:45 +08:00 |
|
gqh
|
7118596e1c
|
工单流程代码合并
|
2022-11-07 16:42:49 +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 |
|
gqh
|
3dfbd7a1e4
|
新增工单字段
|
2022-11-03 15:09:36 +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 |
|
jinling.yang
|
153abaab2d
|
Merge commit 'd24ade9e55501e74591717f8938ac35f5089eca2' into develop
|
2022-10-11 22:02:32 +08:00 |
|
jinling.yang
|
d24ade9e55
|
智能工厂API接口创建销售订单
|
2022-10-11 21:54:44 +08:00 |
|
gqh
|
f671896219
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2022-10-11 16:02:07 +08:00 |
|
gqh
|
aebd4d3f32
|
修复sf同步问题
|
2022-10-11 16:01:36 +08:00 |
|
jinling.yang
|
f632dca7d9
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2022-10-10 23:13:56 +08:00 |
|
jinling.yang
|
e86a82c4b9
|
智能工厂接口新增相关字段
|
2022-10-10 23:13:35 +08:00 |
|
gqh
|
6d2292e1d0
|
合并业务平台
|
2022-10-10 17:01:22 +08:00 |
|
gqh
|
839de4c95f
|
更新sf
|
2022-10-10 10:52:24 +08:00 |
|