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
|
cbf8366cc3
|
工单开始需要完成上一步
|
2022-11-20 19:05:00 +08:00 |
|
jinling.yang
|
a0b7b13c5e
|
优化获得cnc程序代码
|
2022-11-19 22:52:47 +08:00 |
|
jinling.yang
|
dadd2e03da
|
获得cnc代码
|
2022-11-18 18:08:53 +08:00 |
|
gqh
|
057ec915d9
|
更新制造订单生成工单时的工序字段
|
2022-11-17 17:27:05 +08:00 |
|
jinling.yang
|
191bd65d69
|
接收从智能工厂传过来的订单等数据并创建编程单
|
2022-11-16 17:39:42 +08:00 |
|
gqh
|
4f0df9f2bd
|
制造订单工序自动生成规则
|
2022-11-16 17:35:42 +08:00 |
|
gqh
|
ec9f82f09c
|
工作中心概述看板视图
|
2022-11-16 09:41:34 +08:00 |
|
gqh
|
ba92f616a0
|
工单优化更新
|
2022-11-15 16:16:21 +08:00 |
|
gqh
|
e23548a0d3
|
cnc程序上传
|
2022-11-11 10:31:37 +08:00 |
|
gqh
|
822cca9755
|
合并代码
|
2022-11-08 17:28:28 +08:00 |
|
gqh
|
edd6c30176
|
合并代码
|
2022-11-08 11:44:37 +08:00 |
|
gqh
|
eab76f8b32
|
上传NC文件
|
2022-11-08 10:27:09 +08:00 |
|
gqh
|
7118596e1c
|
工单流程代码合并
|
2022-11-07 16:42:49 +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
|
14d0d32ab6
|
匹配加工中心
|
2022-11-03 17:58:33 +08:00 |
|
gqh
|
3dfbd7a1e4
|
新增工单字段
|
2022-11-03 15:09:36 +08:00 |
|
gqh
|
d375787160
|
托盘根据工单绑定制造订单，修改托盘状态
添加解除装夹功能
三元定位增加xy 8个点的字段
|
2022-10-31 17:32:44 +08:00 |
|
gqh
|
ccb26bc4ec
|
托盘打印出条形码功能
|
2022-10-27 17:24:08 +08:00 |
|
gqh
|
0fb751ebbe
|
托盘绑定工单，托盘生成二维码
|
2022-10-25 17:19:42 +08:00 |
|