jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,343 Commits 134 Branches 31 Tags
6fc735063aa990b021b66bb5a8c412a78718db63
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
qihao.gong@jikimo.com 6fc735063a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_manufacturing/models/stock.py
2023-11-20 15:41:50 +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/制造代码优化
2023-11-16 15:14:04 +08:00
mrp_mps
新增主生产计划模块
2023-08-15 10:36:04 +08:00
mrp_workorder
消息发送界面的样式bug修改
2023-08-18 11:01:30 +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/修改机床参数bug
2023-11-20 15:41:50 +08:00
sf_bf_connect
优化代码结构
2023-11-20 13:23:37 +08:00
sf_dlm
产品优化
2023-11-16 17:35:04 +08:00
sf_dlm_management
产品优化
2023-11-16 17:35:04 +08:00
sf_global_search
增加平板扫码功能
2023-04-24 16:00:08 +08:00
sf_machine_connect
测试优化代码后的代码扫描效果，优化部分代码审查问题
2023-11-20 10:48:43 +08:00
sf_maintenance
根据odoo规则修改py文件中得import顺序
2023-11-20 14:59:06 +08:00
sf_manufacturing
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2023-11-20 15:41:50 +08:00
sf_manufacturing_translation/translation_Po
sf优化绑定托盘，工单form显示开始按钮 加工时间
2023-02-01 17:53:32 +08:00
sf_mrs_connect
根据odoo规则修改py文件中得import顺序
2023-11-20 14:59:06 +08:00
sf_plan
优化wrong-import-order问题
2023-11-20 12:42:48 +08:00
sf_plan_management
测试优化代码后的代码扫描效果，优化部分代码审查问题
2023-11-20 10:48:43 +08:00
sf_quality
优化代码结构
2023-11-20 13:23:37 +08:00
sf_sale
放开依赖
2023-11-20 15:39:07 +08:00
sf_tool_management
优化代码结构
2023-11-20 13:23:37 +08:00
sf_warehouse
优化代码结构
2023-11-20 13:23:37 +08:00
sf_wxwork_approval
优化代码结构
2023-11-20 13:23:37 +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
修改订单排程功能为通用方法，同时增加动态判断计划时间是否与获取cnc程序的时间冲突功能，如果冲突，时间自动延后1h;优化gantt显示
2023-11-14 12:21:08 +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.优化生成销售订单和产品的接口：bfm分配工厂时将“结算方式”和“支付方式”传到该接口内的生成报价订单方法里
2023-09-14 18:04:04 +08:00
yizuo_login_background_and_styles
修复密码错误bug
2023-01-31 11:30:13 +08:00
zpl_print
自建模块日志警告信息处理
2023-08-28 17:31:41 +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
更换cs数据库
2023-11-09 11:34:20 +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

Description
No description provided
Readme 186 MiB
Languages
Python 53%
JavaScript 30%
SCSS 8.1%
HTML 5.1%
CSS 1.9%
Other 1.9%