jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,459 Commits 134 Branches 31 Tags
def9bd2c6ea63379736546dbe9426f8b378f49b1
Commit Graph

195 Commits

Author SHA1 Message Date
jinling.yang
5292826c72 新增销售权限 2023-11-22 17:58:41 +08:00
qihao.gong@jikimo.com
b4b5207aea 开发测试制造模块权限，修改设备机床类别的布局以及编码规则 2023-11-22 17:36:50 +08:00
qihao.gong@jikimo.com
e6bb5db0e1 开发sf制造模块权限角色 2023-11-21 17:42:36 +08:00
qihao.gong@jikimo.com
1da7a0195d 根据odoo规则修改py文件中得import顺序 2023-11-20 14:59:06 +08:00
jinling.yang
0b7dc6d09a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） 2023-11-01 17:46:24 +08:00
qihao.gong@jikimo.com
0c788df2f2 修改维保项目多图片展示 2023-11-01 17:33:50 +08:00
jinling.yang
5ffe2ce0e2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） 
# Conflicts:
#	sf_maintenance/views/maintenance_views.xml
 2023-10-30 10:48:13 +08:00
qihao.gong@jikimo.com
b88c6a53ab 长宽高 2023-10-27 09:37:23 +08:00
qihao.gong@jikimo.com
ccb53a61de 修改设备菜单默认展示页面 2023-10-26 17:32:00 +08:00
jinling.yang
65dd8372dd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） 2023-10-25 15:07:52 +08:00
qihao.gong@jikimo.com
4098dda5b8 修改设备日志列表展示 2023-10-24 17:31:42 +08:00
jinling.yang
d83255cc67 优化同步刀具标准库接口（包含全部合并每日） 2023-10-19 17:23:53 +08:00
jinling.yang
14edbd85f4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） 
# Conflicts:
#	sf_base/models/tool_base.py
#	sf_base/models/tool_base_new.py
#	sf_maintenance/views/maintenance_views.xml
#	sf_mrs_connect/models/res_config_setting.py
 2023-10-19 10:53:03 +08:00
jinling.yang
e7df6c14b1 同步刀具标准库 2023-10-19 10:49:54 +08:00
qihao.gong@jikimo.com
a57cdbe2f3 设备其他table增加参数 2023-10-17 15:10:25 +08:00
qihao.gong@jikimo.com
93a6b4ccb4 修改设备table布局 2023-10-16 17:23:04 +08:00
qihao.gong@jikimo.com
f02d1a0ace 修改设备table布局 2023-10-16 17:11:24 +08:00
qihao.gong@jikimo.com
1f090fdd20 修改设备table格式布局 2023-10-13 16:42:16 +08:00
qihao.gong@jikimo.com
01ad3e7d8c 修改机床注册接口 2023-10-13 14:26:38 +08:00
qihao.gong@jikimo.com
3bd5c7efb3 设备过滤能力特征库只关联加工能力 2023-10-12 14:49:25 +08:00
qihao.gong@jikimo.com
53e307cd55 修改设备table的样式 修改关联品牌根据各不同类别展示 2023-10-12 14:10:29 +08:00
qihao.gong@jikimo.com
ecb1f4140e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py
#	sf_mrs_connect/models/sync_common.py
 2023-10-11 14:56:18 +08:00
qihao.gong@jikimo.com
b1d2cd1ceb 设备类别参数根据不同类别必填 设备增加刀具库位table 并自动生成 2023-10-11 14:45:35 +08:00
jinling.yang
6b7b536236 1.优化同步cloud的静态资源库的定时器的代码 
2.新增能力特征库的接口
 2023-10-10 17:19:11 +08:00
qihao.gong@jikimo.com
af05d3ec30 设备增加AGV小车,机械臂,检测设备参数 2023-10-07 17:26:09 +08:00
qihao.gong@jikimo.com
960bea5bb0 设备新增参数 AGV小车table页 2023-09-28 16:20:03 +08:00
qihao.gong@jikimo.com
22a4ccad6b 修改维保生成编码和名称的规则 2023-09-26 17:29:14 +08:00
WEB许何哲\xuhez
1acfefa555 Merge branch 'develop' into feature/sf看板样式统一 2023-09-22 17:34:57 +08:00
WEB许何哲\xuhez
d8363f2637 看板添加字段并调整样式 2023-09-22 17:33:56 +08:00
qihao.gong@jikimo.com
681b769356 设备类别新增选项 2023-09-22 17:01:03 +08:00
qihao.gong@jikimo.com
0de26c4f2f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_maintenance/views/maintenance_views.xml
 2023-09-15 14:27:16 +08:00
qihao.gong@jikimo.com
d78fe872ae BT50 2023-09-15 14:26:04 +08:00
WEB许何哲\xuhez
e3e717ea60 设备清单看板优化 2023-09-15 11:15:40 +08:00
mgw
db5d9863b1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 
# Conflicts:
#	jikimo_frontend/static/src/scss/custom_style.scss
#	sf_manufacturing/views/mrp_workcenter_views.xml
 2023-09-15 10:40:30 +08:00
mgw
2cc03c21ed 优化图文展示样式 2023-09-15 10:37:20 +08:00
jinling.yang
b966bdd8da Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化 2023-09-14 18:04:41 +08:00
jinling.yang
5fa9d1e16e 1.优化生成销售订单和产品的接口：bfm分配工厂时将“结算方式”和“支付方式”传到该接口内的生成报价订单方法里 
2.优化销售和报价查询及详情页面：新增“结算方式”和“支付方式”两个字段;销售的tree列表的“号码”显示改为“订单号”；报价的tree列表的“号码”显示改为“订单号”，创建时间改为“下单时间”
3.优化快速订单：tree列表去掉“表面工艺参数”字段，新增“创建人”和“创建时间”2个字段；详情页面新增“加工时长”字段
 2023-09-14 18:04:04 +08:00
qihao.gong@jikimo.com
5416ecb709 维保计划关联维保项目 2023-09-14 10:55:43 +08:00
qihao.gong@jikimo.com
532e4a4c7a 设备图文展示 2023-09-13 16:52:40 +08:00
qihao.gong@jikimo.com
e3b7d5ad02 设备图文展示 2023-09-13 15:39:27 +08:00
qihao.gong@jikimo.com
9e424600bc 处理机床能力数据 2023-09-13 14:32:32 +08:00
qihao.gong@jikimo.com
32b773c486 设备新增图文展示table 2023-09-01 16:57:04 +08:00
qihao.gong@jikimo.com
e6a68eb1eb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-08-29 15:48:48 +08:00
qihao.gong@jikimo.com
b7f2c4a000 sf修改设备table，品牌图片改成图片 2023-08-29 15:47:58 +08:00
yuxianghui
5ccd754261 所有自建模块日志警告信息处理 2023-08-29 11:06:59 +08:00
yuxianghui
39feda07e5 自建模块日志警告信息处理 2023-08-28 17:31:41 +08:00
qihao.gong@jikimo.com
a9954c1231 维保计划中维保项目可以上传多张图片 2023-08-25 11:10:28 +08:00
qihao.gong@jikimo.com
f31a6d0d43 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_maintenance/views/maintenance_views.xml
 2023-08-24 15:00:41 +08:00
qihao.gong@jikimo.com
3b3847990d 工作重心看板展示设备状态以及图片，设备看板增加负责人 2023-08-24 14:51:03 +08:00
许何哲
a2f5dbd70d Accept Merge Request #341: (feature/必填字段label添加星号 -> develop) 
Merge Request: 修改看板样式

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/341?initial=true
 2023-08-24 09:04:02 +08:00