jikimo_sf

Go to file

qihao.gong@jikimo.com e6c77e7b35 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

# Conflicts:
#	sf_manufacturing/models/product_template.py

2024-01-09 10:38:40 +08:00

.idea

修改.gitignore文件，注释忽略lib文件夹部分

2023-07-14 12:26:21 +08:00

code_backend_theme

0626提交

2023-06-26 17:35:55 +08:00

fixed_header_list

Merge branch 'develop' into feature/修改看板样式

2023-07-06 14:41:17 +08:00

jikimo_frontend

修改sf表格样式

2024-01-08 16:28:49 +08:00

mrp_mps

新增主生产计划模块

2023-08-15 10:36:04 +08:00

mrp_workorder

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改

2023-12-06 15:37:38 +08:00

password_security

维保计划视图优化

2023-07-14 17:27:11 +08:00

quality

新增质量团队和控制点的审核按钮

2023-12-07 10:50:36 +08:00

quality_control

新增质量团队和控制点的审核按钮

2023-12-07 10:50:36 +08:00

sf_base

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

2024-01-09 10:38:40 +08:00

sf_bf_connect

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限去掉继承

2023-12-11 14:47:34 +08:00

sf_dlm

销售1.新增进度状态字段，选项为：待排程、待加工、待发货、待收货、已收货，

2023-12-21 17:45:29 +08:00

sf_dlm_management

还原代码

2024-01-08 15:52:33 +08:00

sf_global_search

增加平板扫码功能

2023-04-24 16:00:08 +08:00

sf_machine_connect

修改工单完成后，自动完成制造订单，完工产品就绪状态

2024-01-09 10:31:43 +08:00

sf_maintenance

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

2024-01-08 15:56:44 +08:00

sf_manufacturing

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

2024-01-09 10:38:40 +08:00

sf_manufacturing_translation/translation_Po

sf优化绑定托盘，工单form显示开始按钮加工时间

2023-02-01 17:53:32 +08:00

sf_mrs_connect

优化刀具模版和刀具标准库

2024-01-08 15:44:16 +08:00

sf_plan

修改制造订单的状态字段以及与排程单的交互逻辑，优化一些翻译

2024-01-08 19:02:59 +08:00

sf_plan_management

修改制造订单的状态字段以及与排程单的交互逻辑，优化一些翻译

2024-01-08 19:02:59 +08:00

sf_quality

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化

2024-01-04 08:54:12 +08:00

sf_sale

修改确认按钮名称

2024-01-09 09:40:56 +08:00

sf_tool_management

Merge remote-tracking branch 'origin/feature/产品添加夹具型号信息' into feature/功能刀具新增字段

2024-01-09 10:33:16 +08:00

sf_warehouse

优化设备、库存权限相关问题

2024-01-05 08:53:39 +08:00

sf_wxwork_approval

1.新增销售和计划权限组2.优化代码格式

2023-11-21 16:10:05 +08:00

spiffy_theme_backend

修改表格样式css的选择器

2023-07-19 14:49:42 +08:00

stock_barcode

no message

2023-08-03 17:32:43 +08:00

web_copy_confirm

解决冲突

2023-06-12 14:35:14 +08:00

web_enterprise

测试背景图片在线上展示

2023-09-26 14:54:13 +08:00

web_environment_ribbon

解决冲突

2023-06-12 14:35:14 +08:00

web_gantt

甘特图增加滚轮事件，点击事件

2023-12-06 15:39:07 +08:00

web_grid

合并企业版代码(未测试，先提交到测试分支)

2023-04-14 17:42:23 +08:00

web_map

合并企业版代码(未测试，先提交到测试分支)

2023-04-14 17:42:23 +08:00

web_mobile

合并企业版代码(未测试，先提交到测试分支)

2023-04-14 17:42:23 +08:00

web_refresher

解决冲突

2023-06-12 14:35:14 +08:00

web_sheet_full_width

解决冲突

2023-06-12 14:35:14 +08:00

web_widget_model_viewer

Accept Merge Request #697 : (feature/制造代码优化 -> develop)

2023-11-27 21:33:35 +08:00

yizuo_login_background_and_styles

修改coding代码扫描警告

2023-11-27 17:08:11 +08:00

zpl_print

修改coding代码扫描警告

2023-11-27 17:08:11 +08:00

__init__.py

3d模型

2023-03-03 18:17:48 +08:00

.gitignore

修改.gitignore文件，注释忽略lib文件夹部分

2023-07-14 12:26:21 +08:00

Dockerfile

测试devops

2023-03-15 16:30:29 +08:00

odoo.conf

修复配置文件问题

2023-12-26 09:39:52 +08:00

README.md

Initial Commit

2022-09-09 16:12:13 +08:00

requirements.txt

新增cpca模块

2023-04-25 16:22:09 +08:00

README.md

#jikimo_sf