jikimo_sf

Go to file

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

# Conflicts:
#	sf_warehouse/views/view.xml

2024-01-22 14:37:59 +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

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

2024-01-18 09:14:25 +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

零件质检接口修改coding缺陷

2024-01-18 17:26:31 +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.修复产品类别和计量单位去掉审核状态字段2.优化bfm派单至sf的销售订单流程3.工序增加编码字段

2024-01-19 15:45:15 +08:00

sf_dlm_management

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复采购按钮显示及产品字段问题

2024-01-09 12:01:47 +08:00

sf_global_search

增加平板扫码功能

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

sf_machine_connect

拉取最新代码

2024-01-09 14:17:38 +08:00

sf_maintenance

合并cnc加工和后置检测工单，新增工单开始结束接口

2024-01-17 17:26:24 +08:00

sf_manufacturing

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

2024-01-22 14:37:25 +08:00

sf_manufacturing_translation/translation_Po

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

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

sf_mrs_connect

Merge remote-tracking branch 'origin/feature/功能刀具新增字段' into feature/夹具型号同步优化

2024-01-11 14:11:57 +08:00

sf_plan

取消部分审核按钮

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

sf_plan_management

修改标签翻译

2024-01-09 10:11:13 +08:00

sf_quality

1.去掉警告2.销售订单详情显示进度状态字段3.修复采购权限组没有存库模块包括以内的相关菜单的访问权限

2024-01-09 16:54:16 +08:00

sf_sale

取消OCC注释

2024-01-22 14:36:36 +08:00

sf_tool_management

1.修复采购总监审核采购单审核不通过后-还显示【审核】按钮2.新增采购总监审核采购单审核不通过后-还显示【审核】按钮3.产品详情界面的删除按钮要隐藏

2024-01-18 17:39:22 +08:00

sf_warehouse

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

2024-01-22 14:37:25 +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