jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,159 Commits 134 Branches 31 Tags
1e81ef917495167fcbc03e923749853fbb8ceffc
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
禹翔辉 1e81ef9174 Accept Merge Request #894: (feature/刀具注册 -> develop) 
Merge Request: 刀具注册，功能刀具组装流程优化

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/894
2024-03-13 09:08:05 +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 refs/heads/develop into refs/heads/feature/前端样式修改
2024-03-08 15:14:07 +08:00
jikimo_hide_options
机企猫 隐藏项目模块修改接入（可隐藏导出、新建等项目）
2024-02-04 15:32: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
修复权限
2024-02-29 15:30:10 +08:00
quality_control
1.修复及优化质检接口2.质量检查新增检测报告和检测结果2个字段
2024-02-28 15:53:46 +08:00
sf_base
Accept Merge Request #892: (feature/修改机床参数bug -> develop)
2024-03-12 09:48:23 +08:00
sf_bf_connect
优化加工订单接口日志
2024-02-29 11:09:20 +08:00
sf_dlm
修复分配工厂创建订单和质检接口
2024-02-29 14:42:10 +08:00
sf_dlm_management
Merge branch 'feature/刀具添加归档功能' into feature/功能优化
2024-03-04 17:13:42 +08:00
sf_global_search
增加平板扫码功能
2023-04-24 16:00:08 +08:00
sf_machine_connect
1.工单查询页面新增工序类型和状态搜索面板
2024-02-27 10:37:59 +08:00
sf_maintenance
维保计划项目可删除
2024-03-11 17:23:43 +08:00
sf_manufacturing
Accept Merge Request #891: (feature/制造代码优化 -> develop)
2024-03-11 11:26:19 +08:00
sf_manufacturing_translation/translation_Po
sf优化绑定托盘，工单form显示开始按钮 加工时间
2023-02-01 17:53:32 +08:00
sf_mrs_connect
删除工序，加工工艺，新增表面工艺可选参数相关视图
2024-03-08 17:32:21 +08:00
sf_plan
修改按钮样式、优化权限
2024-03-07 11:53:57 +08:00
sf_plan_management
优化质量模块翻译
2024-02-28 09:43:44 +08:00
sf_quality
调整必填、增加用户组控制
2024-03-04 10:58:39 +08:00
sf_sale
调整必填、增加用户组控制
2024-03-04 10:58:39 +08:00
sf_tool_management
1、优化刀具物料接口、优化功能刀具安全库存接口、优化功能刀具预警接口；2、优化功能刀具组装流程；3、优化刀具物料序列号同步步骤；
2024-03-12 17:39:21 +08:00
sf_warehouse
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
2024-03-01 11:34:59 +08:00
sf_wxwork_approval
1.新增销售和计划权限组2.优化代码格式
2023-11-21 16:10:05 +08:00
spiffy_theme_backend
机企猫 隐藏项目模块修改接入（可隐藏导出、新建等项目）
2024-02-04 15:32:25 +08:00
stock_barcode
采购入库时，新增打印序列号方法
2024-01-24 17:30:59 +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
处理设备字段类型相关缺陷
2024-03-05 16:50:08 +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

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