mgw
|
258e3bdb9f
|
一般设置页增加重新获取检测文件配置项目
|
2024-09-19 09:03:07 +08:00 |
|
mgw
|
1719e0394e
|
去掉run_time返回
|
2024-09-12 16:33:55 +08:00 |
|
mgw
|
eae902ee92
|
调整设备运行时长
|
2024-09-12 15:36:30 +08:00 |
|
mgw
|
e0bad6ed40
|
优化当班计划量，完成量数据
|
2024-09-12 11:08:24 +08:00 |
|
mgw
|
95e49c7b0f
|
优化打印输出
|
2024-09-12 09:17:52 +08:00 |
|
mgw
|
908e4a3df6
|
调整通过数量取值
|
2024-09-11 18:07:21 +08:00 |
|
mgw
|
763d64a1ca
|
增加设备运行时长效率接口
|
2024-09-11 14:57:42 +08:00 |
|
mgw
|
96eeb1cab7
|
调整检测量、合格量
|
2024-09-11 11:45:14 +08:00 |
|
mgw
|
4394dd023e
|
增加交付准时率
|
2024-09-11 10:11:22 +08:00 |
|
mgw
|
f6a9c97e7f
|
优化产量部分
|
2024-09-11 08:51:01 +08:00 |
|
mgw
|
0ae7424f04
|
获取数据按钮增加调用服务功能
|
2024-09-10 16:12:24 +08:00 |
|
mgw
|
eec79d7d3e
|
优化图片返回为url
|
2024-09-05 10:30:04 +08:00 |
|
mgw
|
1dc55c2770
|
调整不良工单逻辑
|
2024-09-02 09:04:42 +08:00 |
|
mgw
|
2b080c1639
|
优化完成量接口
|
2024-08-27 11:43:56 +08:00 |
|
mgw
|
ade7588a9c
|
修改返回数据顺序
|
2024-08-27 10:23:53 +08:00 |
|
mgw
|
7356e0afb7
|
接口优化
|
2024-08-27 10:19:53 +08:00 |
|
mgw
|
26ad5b5b3f
|
优化运行信息接口、优化次数接口
|
2024-08-27 08:55:01 +08:00 |
|
mgw
|
e1a4784092
|
增加设备oee数据
|
2024-08-26 17:20:46 +08:00 |
|
mgw
|
78d00e9157
|
修复coding问题，增加机床类型返回
|
2024-08-26 13:23:44 +08:00 |
|
mgw
|
296659ebb0
|
增加异常明细
|
2024-08-23 11:44:05 +08:00 |
|
mgw
|
5df3de7dcd
|
增加返工数量等
|
2024-08-23 10:05:17 +08:00 |
|
mgw
|
b26919a40d
|
优化接口，使其易于取值
|
2024-08-21 17:44:22 +08:00 |
|
mgw
|
c86cc27510
|
增加工单相关接口
|
2024-08-21 15:38:05 +08:00 |
|
mgw
|
29c1c7a54d
|
调整日志顺序;增加订单名返回
|
2024-08-16 17:19:54 +08:00 |
|
mgw
|
a07a1ba268
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
|
2024-08-16 16:57:47 +08:00 |
|
mgw
|
f537fbc597
|
运行日志数据接入
|
2024-08-16 16:57:32 +08:00 |
|
mgw
|
271f34a03b
|
增加开动率采集
|
2024-08-15 17:14:07 +08:00 |
|
胡尧
|
5d8f0f83b2
|
增加AGV调度功能，工单页面增加自定义筛选字段
|
2024-08-07 17:44:43 +08:00 |
|
mgw
|
6e50774b23
|
调整机床列表接口位置；增加机床品牌型号返回
|
2024-08-05 16:23:27 +08:00 |
|
mgw
|
95eb6bd18b
|
修改制造订单状态翻译、修改配置字段类型
|
2024-07-30 10:33:03 +08:00 |
|
mgw
|
1b96f420ec
|
增加由dashboard调用的接口
|
2024-07-26 17:22:44 +08:00 |
|
mgw
|
d0be097a9b
|
设备加工参数等页面修改
|
2024-07-24 16:19:29 +08:00 |
|
mgw
|
d3e307d195
|
修复“同一个产品多个制造订单时-只有一张制造订单有组件”
|
2024-07-24 12:17:32 +08:00 |
|
mgw
|
dec85dc92f
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
|
2024-07-24 09:26:35 +08:00 |
|
mgw
|
f4f9591f35
|
设备机床信息tab调整，修复打印返回action问题
|
2024-07-24 09:26:19 +08:00 |
|
yuxianghui
|
25ac346cb7
|
1、cnc编程单tree视图展示刀具状态字段；2、优化制造订单的功能刀具状态字段自动更新方法，同时当工单刀具状态变化时变更缺刀备注信息，添加状态为无效刀的备注字段；3、优化当功能刀具从【刀具房】到【制造前】时进行校验，校验是否为制造订单所缺的刀，如果是则修改cnc编程单刀具状态为正常；4、优化cnc用刀校验：添加对无效刀的处理(无效刀时触发返工流程，并生成检测结果数据)，优化生成的待处理数据的数据结构；
|
2024-07-18 16:33:41 +08:00 |
|
jinling.yang
|
4a648fbd7b
|
1,修复制造订单状态：第一张装夹工单未就绪是，状态需为：待加工;所有工单完成后,状态需为：完成;2.修复多个产品确认制造订单未生产多个编程单问题3.优化工单页面：去掉非必要的字段
|
2024-06-30 11:45:52 +08:00 |
|
yuxianghui
|
5c35a8c38d
|
Merge branch 'feature/添加权限、解决bug' into feature/工单优化-1
|
2024-06-28 14:22:35 +08:00 |
|
yuxianghui
|
3b24f90385
|
1、工单添加按Rfid搜索，隐藏多余的Rfid字段；2、优化程序创建日期；
|
2024-06-28 14:20:57 +08:00 |
|
mgw
|
c8de75ceae
|
修复隐藏项目
|
2024-06-28 09:51:31 +08:00 |
|
mgw
|
f44836705b
|
放出程序下载按钮
|
2024-06-25 16:50:09 +08:00 |
|
yuxianghui
|
665ebaab9e
|
1、重新下发NC程序按键添加权限
|
2024-06-24 17:28:06 +08:00 |
|
jinling.yang
|
0af6d7f4cd
|
优化重新下发程序:装夹预调，cnc加工工单展示
|
2024-06-24 16:48:58 +08:00 |
|
jinling.yang
|
16a00bdb10
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工单(cnc和cmc)涉及多个加工面
|
2024-06-24 10:53:53 +08:00 |
|
jinling.yang
|
66b66a935f
|
优化工单页面和下发编程单接口
|
2024-06-21 17:15:05 +08:00 |
|
jinling.yang
|
67b48814f6
|
优化制造订单和生成工单逻辑
|
2024-06-19 17:35:13 +08:00 |
|
yuxianghui
|
4497fb04c1
|
1、优化 托盘绑定工单逻辑优化 ；2 完成 整体式刀具批次/序列号生成的优化需求； 3、完成 坯料序列号生成规则优化需求1。
|
2024-06-18 17:19:41 +08:00 |
|
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
|
6f2043e7e7
|
1、工单tree视图、from视图添加人工编程字段，及人工编程筛选项；2、序列号模型添加根据Rfid搜索的选项；3、修改零件特采接口，优化MES装刀申请接口、优化机床刀库接口；
|
2024-04-24 18:33:15 +08:00 |
|
jinling.yang
|
424754db1a
|
1.工单查询页面新增工序类型和状态搜索面板
2.销售模块新增delivery依赖
|
2024-02-27 10:37:59 +08:00 |
|