jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,457 Commits 134 Branches 31 Tags
490aa3fe041368a5161d0cf26e7190d5ecc33e13
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
龚启豪 490aa3fe04 Accept Merge Request #707: (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/707
2023-12-06 14:52:35 +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-29 09:39:11 +08:00
mrp_mps
新增主生产计划模块
2023-08-15 10:36:04 +08:00
mrp_workorder
处理coding报错
2023-11-29 17:34:15 +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 refs/heads/develop into refs/heads/feature/修改机床参数bug
2023-12-06 11:35:01 +08:00
sf_bf_connect
Accept Merge Request #697: (feature/制造代码优化 -> develop)
2023-11-27 21:33:35 +08:00
sf_dlm
优化代码格式
2023-11-24 10:27:21 +08:00
sf_dlm_management
1.同步刀具标准库接口修改刀片形状，柄部类型，刀尖特征，压紧方式
2023-11-28 17:08:56 +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
机床注册按钮根据权限组区分
2023-12-04 17:28:54 +08:00
sf_manufacturing
Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug
2023-12-06 11:35:01 +08:00
sf_manufacturing_translation/translation_Po
sf优化绑定托盘，工单form显示开始按钮 加工时间
2023-02-01 17:53:32 +08:00
sf_mrs_connect
1.同步刀具标准库接口修改刀片形状，柄部类型，刀尖特征，压紧方式
2023-11-28 17:08:56 +08:00
sf_plan
计划模块增加跟踪消息组件，form视图增加归档取消归档按钮，增加归档未归档的筛选项目
2023-11-23 10:21:42 +08:00
sf_plan_management
完成计划权限，优化警告错误
2023-11-29 20:58:12 +08:00
sf_quality
优化警告问题
2023-11-27 21:30:45 +08:00
sf_sale
Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug
2023-12-06 11:35:01 +08:00
sf_tool_management
1、机床换刀申请新增确认换刀时，依次检索线边刀库、刀具房是否有满足条件的功能刀具，如果有就返回刀具信息，没有就发起组装申请；2、刀具安全库存模型详情页新增可修改的最低库存量、最高库存量、批次补货量字段；
2023-12-05 17:37:47 +08:00
sf_warehouse
Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug
2023-12-06 11:35:01 +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
修改订单排程功能为通用方法，同时增加动态判断计划时间是否与获取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
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
更换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%