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
|
ec9f82f09c
|
工作中心概述看板视图
|
2022-11-16 09:41:34 +08:00 |
|
gqh
|
ba92f616a0
|
工单优化更新
|
2022-11-15 16:16:21 +08:00 |
|
jinling.yang
|
aadbd80422
|
修改工单重复，业务平台分配工厂自动生成产品部分新增字段
|
2022-11-08 18:36:36 +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 |
|
gqh
|
eab76f8b32
|
上传NC文件
|
2022-11-08 10:27:09 +08:00 |
|
jinling.yang
|
1ebfbc07b9
|
修改工序类型
|
2022-11-08 10:16:43 +08:00 |
|
jinling.yang
|
c1d6a24cd9
|
去掉非相关代码
|
2022-11-08 10:01:53 +08:00 |
|
gqh
|
7118596e1c
|
工单流程代码合并
|
2022-11-07 16:42:49 +08:00 |
|
jinling.yang
|
65a7d74430
|
修改匹配加工中心
|
2022-11-04 16:08:43 +08:00 |
|
jinling.yang
|
14d0d32ab6
|
匹配加工中心
|
2022-11-03 17:58:33 +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 |
|
gqh
|
60bd5002bc
|
解决单一制造出库单bug
|
2022-10-19 17:19:43 +08:00 |
|
gqh
|
5e5d62eabd
|
制造订单 单个制造
|
2022-10-14 14:44:05 +08:00 |
|