jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
478 Commits 134 Branches 0 Tags
42123405197c5c7a0dd72f59a76c7c55f84be04c
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
马广威 4212340519 Accept Merge Request #218: (feature/刀具管理同步优化，增加字段 -> develop) 
Merge Request: 解决代码冲突问题


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/218?initial=true
2023-06-29 17:43:44 +08:00
.idea
解决冲突
2023-06-12 14:35:14 +08:00
mrp_maintenance
设备维保
2023-06-25 17:37:55 +08:00
mrp_workorder
合并企业版模块
2023-04-21 11:24:52 +08:00
quality
解决冲突
2023-06-12 14:35:14 +08:00
sf_base
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能
2023-06-29 17:14:48 +08:00
sf_bf_connect
刀具产品页面刀具物料及型号字段修改
2023-06-28 18:32:45 +08:00
sf_dlm
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化
2023-06-29 11:15:40 +08:00
sf_global_search
增加平板扫码功能
2023-04-24 16:00:08 +08:00
sf_machine_connect
修复进度不更新到bfm的问题，在sf的设置处增加bfm环境选择（正式、测试、开发）
2023-05-23 10:41:10 +08:00
sf_maintenance
处理设备与设备维保标准的关联关系方法，新增设备故障报警日志页面
2023-06-27 17:32:24 +08:00
sf_manufacturing
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能
2023-06-29 17:14:48 +08:00
sf_manufacturing_translation/translation_Po
sf优化绑定托盘，工单form显示开始按钮 加工时间
2023-02-01 17:53:32 +08:00
sf_mrs_connect
解决代码冲突问题
2023-06-29 17:43:16 +08:00
sf_sale
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单行新增模型展示
2023-05-15 17:02:01 +08:00
sf_tool_management
优化了功能刀具自动申请装刀功能的数据显示问题
2023-06-29 16:54:18 +08:00
sf_wxwork_approval
Merge branch refs/heads/develop into refs/heads/feature/企业微信审批接入
2023-06-02 17:07:01 +08:00
web_copy_confirm
解决冲突
2023-06-12 14:35:14 +08:00
web_enterprise
合并企业版代码(未测试，先提交到测试分支)
2023-04-14 17:42:23 +08:00
web_environment_ribbon
解决冲突
2023-06-12 14:35:14 +08:00
web_gantt
合并企业版代码(未测试，先提交到测试分支)
2023-04-14 17:42:23 +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
产品新增3d模型展示
2023-03-06 17:02:21 +08:00
yizuo_login_background_and_styles
修复密码错误bug
2023-01-31 11:30:13 +08:00
zpl_print
一键打印功能
2023-02-28 17:32:24 +08:00
__init__.py
3d模型
2023-03-03 18:17:48 +08:00
.gitignore
Initial Commit
2022-09-09 16:12:13 +08:00
Dockerfile
测试devops
2023-03-15 16:30:29 +08:00
odoo.conf
出入库单新增验证及单个外协表面工艺Bug修复
2023-05-17 14:18:23 +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