yuxianghui
|
be0f62ffe0
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理
# Conflicts:
# sf_base/models/fixture.py
# sf_manufacturing/models/model_type.py
# sf_manufacturing/models/product_template.py
# sf_sale/models/quick_easy_order.py
|
2023-08-29 11:21:13 +08:00 |
|
jinling.yang
|
fb717c22ad
|
1.模型为上色Bug修复（cloud代码注释引起）
2.创建产品和订单未成功Bug修复
|
2023-08-28 17:40:19 +08:00 |
|
yuxianghui
|
39feda07e5
|
自建模块日志警告信息处理
|
2023-08-28 17:31:41 +08:00 |
|
jinling.yang
|
7174de3de6
|
产品模板的型号手动输入时型号对象的编码，联装类型，夹具物料字段的值显示
|
2023-08-25 15:46:41 +08:00 |
|
jinling.yang
|
5de04449e4
|
对模型进行上色和特征识别及自动报价
|
2023-08-25 10:39:31 +08:00 |
|
jinling.yang
|
55504c2725
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能
|
2023-08-24 17:32:25 +08:00 |
|
jinling.yang
|
f9e4b73fb0
|
新增上传模型功能
|
2023-08-23 17:34:06 +08:00 |
|