jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,240 Commits 134 Branches 0 Tags
ee3c0d702d3ac3863119e8beea5577101f674791
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
马广威 ee3c0d702d Accept Merge Request #916: (feature/制造代码优化 -> develop) 
Merge Request: 修复员工模块js问题、能力特征哭js问题、设备处问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/916?initial=true
2024-03-25 16:19:22 +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/制造代码优化
2024-03-25 16:18:42 +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
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-03-20 17:33:58 +08:00
sf_bf_connect
1.优化分配工厂时材料型号获取方式为采购和外协时未有供应商返回提示
2024-03-15 16:59:51 +08:00
sf_dlm
1.优化分配工厂时材料型号获取方式为采购和外协时未有供应商返回提示
2024-03-15 16:59:51 +08:00
sf_dlm_management
修复部分bug
2024-03-14 15:45:40 +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
修复员工模块js问题、能力特征哭js问题、设备处问题
2024-03-25 16:17:19 +08:00
sf_manufacturing
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-03-20 17:33:58 +08:00
sf_manufacturing_translation/translation_Po
sf优化绑定托盘，工单form显示开始按钮 加工时间
2023-02-01 17:53:32 +08:00
sf_mrs_connect
1、解决功能刀具组装时，已使用刀具物料还能再选到的问题；2、解决功能刀具组装完成后的功能刀具注册到cloud没有编码的问题；3、刀具物料添加未入库状态；
2024-03-19 10:26:55 +08:00
sf_plan
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
2024-03-18 14:43:27 +08:00
sf_plan_management
优化质量模块翻译
2024-02-28 09:43:44 +08:00
sf_quality
1.优化分配工厂时材料型号获取方式为采购和外协时未有供应商返回提示
2024-03-15 16:59:51 +08:00
sf_sale
修复部分bug
2024-03-14 15:45:40 +08:00
sf_tool_management
1、新增夹具物料搜索模型，完成tree视图和form视图；2、新增夹具物料序列号、夹具物料搜索模型注册到cloud的接口，优化刀具物料序列号注册接口及流程；3、删除刀具物料搜索模型的无关字段；
2024-03-20 16:34:11 +08:00
sf_warehouse
调整打印机模型结构
2024-03-20 17:32:17 +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
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
2024-03-14 14:24:26 +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