jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,079 Commits 134 Branches 31 Tags
e8512b23e46c2d7742953f3e2301d823dc768e14
Commit Graph

51 Commits

Author SHA1 Message Date
mgw
187495eb67 Merge branch 'master' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release1.0 
# Conflicts:
#	sf_base/__init__.py
#	sf_base/__manifest__.py
#	sf_base/commons/__init__.py
#	sf_base/commons/common.py
#	sf_base/models/__init__.py
#	sf_base/models/base.py
#	sf_base/models/common.py
#	sf_base/security/group_security.xml
#	sf_base/security/ir.model.access.csv
#	sf_base/views/base_view.xml
#	sf_base/views/common_view.xml
#	sf_base/views/menu_view.xml
#	sf_bf_connect/__init__.py
#	sf_bf_connect/__manifest__.py
#	sf_bf_connect/controllers/__init__.py
#	sf_bf_connect/controllers/controllers.py
#	sf_bf_connect/models/__init__.py
#	sf_bf_connect/models/http.py
#	sf_bf_connect/models/models.py
#	sf_bf_connect/models/process_status.py
#	sf_bf_connect/views/res_partner_view.xml
#	sf_dlm/__manifest__.py
#	sf_dlm/data/product_data.xml
#	sf_dlm/models/__init__.py
#	sf_dlm/models/product_supplierinfo.py
#	sf_dlm/views/product_template_view.xml
#	sf_machine_connect/__init__.py
#	sf_machine_connect/__manifest__.py
#	sf_machine_connect/models/__init__.py
#	sf_machine_connect/models/ftp_client.py
#	sf_machine_connect/models/ftp_operate.py
#	sf_machine_connect/models/py2opcua.py
#	sf_machine_connect/security/ir.model.access.csv
#	sf_machine_connect/views/SfWorkOrderBarcodes.xml
#	sf_machine_connect/views/WorkCenterBarcodes.xml
#	sf_machine_connect/views/compensation.xml
#	sf_machine_connect/views/default_delivery.xml
#	sf_machine_connect/views/delivery_record.xml
#	sf_machine_connect/views/ftp_button.xml
#	sf_machine_connect/views/machine_info_present.xml
#	sf_machine_connect/views/machine_monitor.xml
#	sf_machine_connect/wizard/__init__.py
#	sf_machine_connect/wizard/action_up.py
#	sf_manufacturing/__init__.py
#	sf_manufacturing/__manifest__.py
#	sf_manufacturing/models/__init__.py
#	sf_manufacturing/models/model_type.py
#	sf_manufacturing/models/mrp_maintenance.py
#	sf_manufacturing/models/mrp_production.py
#	sf_manufacturing/models/mrp_routing_workcenter.py
#	sf_manufacturing/models/mrp_workcenter.py
#	sf_manufacturing/models/mrp_workorder.py
#	sf_manufacturing/models/res_user.py
#	sf_manufacturing/models/stock.py
#	sf_manufacturing/security/group_security.xml
#	sf_manufacturing/security/ir.model.access.csv
#	sf_manufacturing/views/model_type_view.xml
#	sf_manufacturing/views/mrp_routing_workcenter_view.xml
#	sf_manufacturing/views/mrp_workcenter_views.xml
#	sf_manufacturing/views/mrp_workorder_view.xml
#	sf_mrs_connect/__init__.py
#	sf_mrs_connect/__manifest__.py
#	sf_mrs_connect/controllers/controllers.py
#	sf_mrs_connect/data/ir_cron_data.xml
#	sf_mrs_connect/models/__init__.py
#	sf_mrs_connect/models/ftp_operate.py
#	sf_mrs_connect/models/res_config_setting.py
#	sf_mrs_connect/models/sync_common.py
#	sf_mrs_connect/views/res_config_settings_views.xml
#	sf_sale/__init__.py
#	sf_sale/__manifest__.py
#	sf_sale/models/__init__.py
#	sf_sale/models/sale_order.py
#	sf_sale/views/sale_order_view.xml
#	yizuo_login_background_and_styles/__manifest__.py
#	yizuo_login_background_and_styles/controllers/main.py
#	yizuo_login_background_and_styles/models/login_image.py
#	yizuo_login_background_and_styles/models/res_config_settings.py
 2024-05-18 22:39:05 +08:00
yuxianghui
016a279453 1、解决 坯料外协不生成外协出库单 的bug；2、添加工件装夹岗对sf.functional.cutting.tool.entity模型的查询权限 2024-05-10 16:42:54 +08:00
jinling.yang
d964a9feb1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化模型上色路径 2024-05-08 11:20:07 +08:00
jinling.yang
d5a1a82c72 1.优化分配工厂时材料型号获取方式为采购和外协时未有供应商返回提示 
2.修复质量标准去掉审核按钮显示
 2024-03-15 16:59:51 +08:00
jinling.yang
5737d7b0bc 优化代码格式 2023-11-24 10:27:21 +08:00
jinling.yang
f36c2ac096 产品优化 2023-11-16 17:35:04 +08:00
jinling.yang
dbfd75b139 修复单一制造 2023-11-09 16:30:05 +08:00
jinling.yang
3a1acb0f5a 整合所有模块依赖 2023-11-08 17:13:18 +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
05227b9022 刀具产品模板根据型号展示不同字段和值 2023-06-29 18:53:11 +08:00
jinling.yang
37b834b3cf Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化 
# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py
 2023-06-29 11:15:40 +08:00
jinling.yang
eab6f0ceee 刀具产品页面刀具物料及型号字段修改 2023-06-28 18:32:45 +08:00
jinling.yang
6068a55b79 新增sf的刀具模板的相关刀具物料字段 2023-06-13 17:30:35 +08:00
qihao.gong@jikimo.com
0077d97cfa master-sf1.0 2023-05-06 16:03:00 +08:00
jinling.yang
b942696c69 1.销售模块的销售页面的订单行展示模型 
2.表面工艺及类别菜单的排序
 2023-04-24 17:09:16 +08:00
jinling.yang
2acdbca2b1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协 
# Conflicts:
#	sf_dlm/__manifest__.py
#	sf_dlm/models/product_template.py
#	sf_manufacturing/models/mrp_production.py
 2023-04-21 15:40:03 +08:00
jinling.yang
82dcfb5018 优化及调试表面工艺外协出入库单，‘胚料’修改为‘坯料’ 2023-04-20 19:39:12 +08:00
jinling.yang
a5c707bf43 判断外协工序是否连续有多个外协工序为同一个供应商（产品为表面工艺服务的供应商）, 2023-04-14 17:54:20 +08:00
qihao.gong@jikimo.com
d28525526a 合并企业版代码(未测试，先提交到测试分支) 2023-04-14 17:42:23 +08:00
jinling.yang
6ff307f364 1.优化sf的产品页面展示：新增服务产品的工艺参数字段，当产品类别为服务时，该字段出现出现，材料和型号隐藏；加工参数里的表面工艺参数字段的值显示为表面工艺+可选参数 
2.修复sf的表面工艺工单及完成后的询价单
 2023-04-03 17:42:31 +08:00
jinling.yang
93c9287717 修改表面工艺外协字段类型 2023-03-28 21:26:02 +08:00
jinling.yang
bf010e2cca 去掉警告及开发表面工艺相关需求 2023-03-27 21:04:33 +08:00
jinling.yang
8e41e772ff 产品创建时上传3D模型 2023-03-10 10:53:05 +08:00
jinling.yang
a812c603ea 代码规范整理，产品页面模型和胚料的模型类型字段做显示 2023-02-09 15:26:08 +08:00
jinling.yang
11065139d3 bom组件的公斤数量修复，产品页面的模型根据类型隐藏 2023-02-06 18:11:03 +08:00
gqh
59cb6e5def 优化工单界面，新增物料page，修复工单按钮bug，隐藏权限字段 2023-02-02 14:59:39 +08:00
jinling.yang
e8d923df03 bfm分配工厂: 
1.销售页面：客户的值为业务平台，
2.没有原材料，事务回滚
3.去掉注释和没用到的代码
 2023-02-01 18:27:29 +08:00
jinling.yang
e2ae08c33f 制造和销售里的产品的筛选器，胚料的生成新增是否为业务平台新建字段，匹配bom修改为只能匹配手动建的bom 2023-01-31 10:32:14 +08:00
jinling.yang
733e33adfd 新增胚料的模型类型 2023-01-30 18:11:29 +08:00
jinling.yang
271a5d4224 1.模型类型增加跟修改各字段 
2.智能工厂成品名称优化
3.智能工厂产品根据产品类型增加默认筛选条件的优化（在筛选器内根据产品类型增加筛选条件）
4.智能工厂胚料名称的优化
5.自加工产品的制造订单优化
 2023-01-29 17:48:45 +08:00
gqh
bdae9d9f95 恢复代码 2023-01-29 15:42:33 +08:00
gqh
9c473e6f32 优化sf 2023-01-23 20:21:00 +08:00
jinling.yang
5492d4f2fa 修复工作中心绑定机床和胚料外协供应商是否外包未勾选bug修复 2023-01-13 16:43:30 +08:00
gqh
8e51654f17 合并sf代码 2023-01-11 14:51:59 +08:00
gqh
eb162cb416 合并工单优化 2023-01-11 11:13:52 +08:00
jinling.yang
01cf30b03f 优化涉及到的接口 2023-01-11 11:05:06 +08:00
jinling.yang
d66687297d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单文件优化 
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
 2023-01-10 09:27:14 +08:00
gqh
311c7c723a sf1.0 2023-01-09 23:04:53 +08:00
gqh
d0497aa043 工单优化 2023-01-09 20:40:27 +08:00
jinling.yang
b7723f82d0 优化sf获取cnc程序和ftp 2023-01-09 19:54:02 +08:00
jinling.yang
a3e39d4fac 产品和制造订单新增模型和occ查看模型模块 2022-12-30 10:00:17 +08:00
jinling.yang
5fcb17d048 胚料bug修复，销售订单明细行路线修复，编程单下发优化 2022-12-27 17:28:47 +08:00
jinling.yang
a4be58098e 创建胚料的bug修复 2022-12-26 10:25:16 +08:00
jinling.yang
dd5c387585 解决代码冲突 2022-12-12 16:59:42 +08:00
gqh
257ed593c9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 
# Conflicts:
#	sf_dlm/data/product_data.xml
#	sf_dlm/models/product_template.py
#	sf_manufacturing/models/mrp_workorder.py
#	sf_mrs_connect/controllers/controllers.py
 2022-12-12 14:52:48 +08:00
gqh
e0a0b3d411 优化odoo16工单视图展示问题 2022-12-12 14:46:54 +08:00
jinling.yang
5e2d75b23e 修改胚料部分 2022-12-09 17:23:07 +08:00
jinling.yang
b498637154 修改cnc编程单 2022-11-25 10:56:37 +08:00
jinling.yang
11a360222e cnc获取 2022-11-22 21:18:15 +08:00
jinling.yang
3cbd1140bb mrs为名的更改为sf 2022-11-22 10:20:18 +08:00