jinling.yang
|
aadbd80422
|
修改工单重复，业务平台分配工厂自动生成产品部分新增字段
|
2022-11-08 18:36:36 +08:00 |
|
gqh
|
8bb2af1f2a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2022-11-08 17:29:13 +08:00 |
|
gqh
|
822cca9755
|
合并代码
|
2022-11-08 17:28:28 +08:00 |
|
马广威
|
e0a520cb77
|
Accept Merge Request #38: (feature/1103_sf_machine_connect -> develop)
Merge Request: 更新mrs_base_view视图，添加page
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/38
|
2022-11-08 15:04:25 +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
|
88bb5cccb2
|
Merge branch 'feature/工单流程' into develop
|
2022-11-08 10:36:04 +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 |
|
gqh
|
eab76f8b32
|
上传NC文件
|
2022-11-08 10:27:09 +08:00 |
|
jinling.yang
|
1ebfbc07b9
|
修改工序类型
|
2022-11-08 10:16:43 +08:00 |
|
jinling.yang
|
f92c5d5648
|
Merge branch 'feature/1108' into develop
|
2022-11-08 10:02:59 +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
|
a33b16cf78
|
Merge branch 'feature/110301' into develop
|
2022-11-07 10:31:58 +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
|
9e3f17da91
|
Merge branch 'feature/绑定托盘功能' into develop
|
2022-11-03 15:10:07 +08:00 |
|
gqh
|
3dfbd7a1e4
|
新增工单字段
|
2022-11-03 15:09:36 +08:00 |
|
jinling.yang
|
8e337dda97
|
Merge branch 'feature/1025' into develop
|
2022-11-03 15:01: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 |
|
gqh
|
d375787160
|
托盘根据工单绑定制造订单，修改托盘状态
添加解除装夹功能
三元定位增加xy 8个点的字段
|
2022-10-31 17:32:44 +08:00 |
|
jinling.yang
|
002653957e
|
改造制造订单里的生成工单
|
2022-10-27 17:27:40 +08:00 |
|
gqh
|
ccb26bc4ec
|
托盘打印出条形码功能
|
2022-10-27 17:24:08 +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 |
|
gqh
|
9ee33ae0b9
|
Merge branch 'feature/制造订单单一制造' into develop
|
2022-10-24 16:21:00 +08:00 |
|
gqh
|
60bd5002bc
|
解决单一制造出库单bug
|
2022-10-19 17:19:43 +08:00 |
|
jinling.yang
|
33adc646e2
|
智能工厂-制造模块基础设置新增托盘
|
2022-10-19 15:46:07 +08:00 |
|
jinling.yang
|
97527da4d3
|
分配工厂条码字段注释去掉
|
2022-10-19 11:51:46 +08:00 |
|
jinling.yang
|
b24e0e1001
|
Merge branch 'feature/101401' into develop
|
2022-10-19 11:17:07 +08:00 |
|
jinling.yang
|
c2bf0b09a9
|
修改胚料匹配规则
|
2022-10-19 11:16:35 +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 |
|
jinling.yang
|
5a0a727e8c
|
去掉redis等不相关需要的引用
|
2022-10-13 17:00:19 +08:00 |
|
gqh
|
7e98d35f14
|
更新sf
|
2022-10-13 16:43:36 +08:00 |
|