jikimo_sf

Go to file

jinling.yang 97fcf6d91f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

# Conflicts:
#	sf_base/views/base_view.xml

2023-08-17 18:03:12 +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

mrp_mps

新增主生产计划模块

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

mrp_workorder

工单菜单优化

2023-07-10 17:33:17 +08:00

password_security

维保计划视图优化

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

quality

新增翻译问题解决

2023-08-03 11:55:46 +08:00

quality_control

质量模块和库存扫码

2023-07-24 11:42:15 +08:00

sf_base

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

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

sf_bf_connect

修复产品模板中产品类别为刀具和夹具时，根据产品类别为刀具和夹具时，新增的page页面里的字段显示及回显Bug

2023-07-17 16:46:01 +08:00

sf_dlm

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

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

sf_global_search

增加平板扫码功能

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

sf_machine_connect

修复进度不更新到bfm的问题，在sf的设置处增加bfm环境选择（正式、测试、开发）

2023-05-23 10:41:10 +08:00

sf_maintenance

修改机床型号参数缺陷

2023-08-15 17:31:27 +08:00

sf_manufacturing

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

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

sf_manufacturing_translation/translation_Po

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

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

sf_mrs_connect

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

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

sf_plan

坯料排程基本功能完成

2023-08-11 12:18:47 +08:00

sf_plan_management

解决翻译问题

2023-08-14 10:24:39 +08:00

sf_quality

质量模块的改造已完成，本地已测试

2023-08-02 09:31:06 +08:00

sf_sale

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单行新增模型展示

2023-05-15 17:02:01 +08:00

sf_tool_management

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

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

sf_warehouse

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/坯料排程

2023-08-11 12:24:35 +08:00

sf_wxwork_approval

Merge branch refs/heads/develop into refs/heads/feature/企业微信审批接入

2023-06-02 17:07:01 +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-04-14 17:42:23 +08:00

web_environment_ribbon

解决冲突

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

web_gantt

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

2023-04-14 17:42:23 +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

1.夹具物料,联装类型，功能夹具类型的Tree视图去掉删除方法和删除操作;同步的方法里新增active字段

2023-07-26 18:52:27 +08:00

yizuo_login_background_and_styles

修复密码错误bug

2023-01-31 11:30:13 +08:00

zpl_print

样式修改

2023-07-06 14:22:34 +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-07-14 10:45:02 +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