jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,532 Commits 134 Branches 0 Tags
34d0e989d69f5b3e5f705f62666413dc735844be
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
龚启豪 34d0e989d6 Accept Merge Request #726: (feature/修改机床参数bug -> 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/726?initial=true
2023-12-21 17:38:15 +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
生产驾驶舱列表点击【工单】按钮有时候进入的是机台详情界面
2023-11-30 17:03:47 +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
Accept Merge Request #726: (feature/修改机床参数bug -> develop)
2023-12-21 17:38:15 +08:00
sf_bf_connect
修改京东物流寻单据部分逻辑
2023-12-11 14:45:55 +08:00
sf_dlm
优化代码格式
2023-11-24 10:27:21 +08:00
sf_dlm_management
1、新增安装时自动配置刀具房位置，重新配置了刀具组装入库的作业类型，增加名称为刀具组装入库的参考序列配置；2、功能刀具所以的装刀长改为总长度；3、机床换刀申请和刀具组装单弹窗界面做字段必填控制，对新刀隐藏切削相关字段；4、刀具组装单弹窗增加一些字段的数值自动填写和计算；
2023-12-19 17:31:37 +08:00
sf_global_search
增加平板扫码功能
2023-04-24 16:00:08 +08:00
sf_machine_connect
完成计划权限，优化警告错误
2023-11-29 20:58:12 +08:00
sf_maintenance
Accept Merge Request #726: (feature/修改机床参数bug -> develop)
2023-12-21 17:38:15 +08:00
sf_manufacturing
Accept Merge Request #726: (feature/修改机床参数bug -> develop)
2023-12-21 17:38:15 +08:00
sf_manufacturing_translation/translation_Po
sf优化绑定托盘，工单form显示开始按钮 加工时间
2023-02-01 17:53:32 +08:00
sf_mrs_connect
修改机床设备参数，处理同步bug，以及机床设备视图布局
2023-12-15 17:28:42 +08:00
sf_plan
优化权限相关
2023-12-17 10:48:51 +08:00
sf_plan_management
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_quality
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-12-17 10:50:18 +08:00
sf_sale
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2023-12-17 10:50:18 +08:00
sf_tool_management
Merge remote-tracking branch 'origin/feature/换刀申请优化' into feature/功能刀具组装流程bug优化
2023-12-20 15:22:59 +08:00
sf_warehouse
优化权限相关
2023-12-17 10:48:51 +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-07 10:49:55 +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-07 10:49:55 +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
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限去掉继承
2023-12-11 14:47:34 +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