jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,928 Commits 134 Branches 31 Tags
c8bcd4d0f5c4c03d1f1d36d4d1654278aa1090d7
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
杨金灵 c8bcd4d0f5 Accept Merge Request #1098: (feature/修复编程单下发ftp路径 -> develop) 
Merge Request: 修复编程单下发ftp路径

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1098?initial=true
2024-06-26 11:24:40 +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_auto_backup
增加自动备份模块
2024-04-24 13:58:24 +08:00
jikimo_frontend
设置表单页面label文本不换行
2024-06-05 17:35: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
1.工单,工件配送新增sns及给部分字段添加tracking(跟踪)及优化页面
2024-06-11 16:56:20 +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 refs/heads/develop into refs/heads/release/release_1.8
2024-06-25 09:47:34 +08:00
sf_bf_connect
修复编程单下发ftp路径
2024-06-25 17:54:08 +08:00
sf_dlm
Merge branch 'master' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release1.0
2024-05-18 22:39:05 +08:00
sf_dlm_management
Merge branch refs/heads/develop into refs/heads/hotfix/功能刀具出入库处理
2024-06-17 14:36:00 +08:00
sf_global_search
增加平板扫码功能
2023-04-24 16:00:08 +08:00
sf_machine_connect
放出程序下载按钮
2024-06-25 16:50:09 +08:00
sf_maintenance
1、添加权限；2、设备的设备检修标准字段关闭创建功能；3、解决 销售经理创建报价单选择产品后没有把模型和价格带过去 的bug；4、关闭仓库创建按钮
2024-05-13 11:54:03 +08:00
sf_manufacturing
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复编程单下发ftp路径
2024-06-26 10:17:14 +08:00
sf_manufacturing_translation/translation_Po
master-sf1.0
2023-05-06 16:03:00 +08:00
sf_mrs_connect
修复编程单下发ftp路径
2024-06-26 11:10:54 +08:00
sf_oca
1、采购审批流程中的英文提示信息改为中文提示；当审批完成后隐藏取消审批按键；2、刀具注册接口添加调用接口提示；
2024-05-17 14:56:15 +08:00
sf_plan
取消默认分组展示
2024-06-25 14:22:51 +08:00
sf_plan_management
优化质量模块翻译
2024-02-28 09:43:44 +08:00
sf_quality
1、注释MES装刀指令接口，删除所以该接口的调用；注释质量检测失败时对零件特采接口的调用；2、序列号模型from界面临时添加按钮，解决工厂录入的有些刀柄序列号存在位数少于10的问题（通过SQL在左侧补零）（已隐藏）；
2024-04-25 14:02:51 +08:00
sf_sale
添加注释
2024-06-19 11:23:25 +08:00
sf_tool_management
1、功能刀具清单做编辑控制；2、刀具拆解——报废优化；3、功能刀具出入库添加刀具跳转；
2024-06-24 15:40:51 +08:00
sf_warehouse
取消默认分组展示
2024-06-25 14:22:51 +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
vista_backend_theme
master-sf1.0
2023-05-06 16:03:00 +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
sf_t切换数据库
2024-05-09 10:09:26 +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%