jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
713 Commits 134 Branches 31 Tags
06bb0f77c9a2bd5e85b458778707b86a49eba36c
Commit Graph

153 Commits

Author SHA1 Message Date
jinling.yang
24afa53028 新增功能夹具接口 2023-08-02 17:35:09 +08:00
jinling.yang
5c2e7c80da 1.产品模板优化：增加产品类别的搜索面板 
2.夹具型号注册到cloud：夹具型号的Tree和form视图去掉不可增删改操作，页面新增时编码根据夹具物料回显不同的编码；新增注册按钮及对应的注册接口
3.功能夹具注册到cloud：.功能夹具的Tree和form视图去掉不可增删改操作，页面新增时编码和名称根据功能夹具类型和对应的托盘型号所进行回显
 2023-08-01 17:39:40 +08:00
jinling.yang
7c8e470199 产品新增搜索面板 2023-08-01 15:08:32 +08:00
qihao.gong@jikimo.com
06de46c084 修改设备模块 2023-07-28 15:33:31 +08:00
jinling.yang
47b2e8c709 1.同步的模型的页面不可增删改 
2.工单的物料里新增长宽高字段
 2023-07-27 15:45:45 +08:00
jinling.yang
7ee652d021 1.夹具物料,联装类型，功能夹具类型的Tree视图去掉删除方法和删除操作;同步的方法里新增active字段 
2.品牌模型新增厂家型号字段
3.修复3D模型全屏展示及不显示模型Bug
 2023-07-26 18:52:27 +08:00
jinling.yang
ae2fdad4f1 1.物料page里的库存模型新增物料长宽高三个字段 
2.修复功能夹具同步Bug
3.夹具物料新增不可删除控制
 2023-07-21 17:35:44 +08:00
jinling.yang
9334d5cdc8 夹具相关查询页面去掉创建按钮 2023-07-20 15:19:09 +08:00
mgw
b37656d4fe 修改功能刀具模块继承方式 2023-07-20 09:17:21 +08:00
马广威
1bae5ecb55 Accept Merge Request #270: (feature/修改缺陷 -> develop) 
Merge Request: sf处功能刀具修改及其同步，目录位置调整

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/270?initial=true
 2023-07-19 10:05:04 +08:00
mgw
e44e44df41 sf处功能刀具修改及其同步，目录位置调整 2023-07-19 10:03:53 +08:00
jinling.yang
988f70bf69 1.夹具型号新增搜索面板 
2.夹具查询列表新增创建人和创建时间字段展示
 2023-07-18 16:20:09 +08:00
jinling.yang
9a392eebad 去掉不要的引用 2023-07-17 17:35:55 +08:00
jinling.yang
b1da9ff18b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面展示优化 2023-07-17 16:48:44 +08:00
jinling.yang
f68dce9ee2 修复产品模板中产品类别为刀具和夹具时，根据产品类别为刀具和夹具时，新增的page页面里的字段显示及回显Bug 2023-07-17 16:46:01 +08:00
jinling.yang
5beb7b3417 优化装夹工单，新增工件装夹page，名字为组件的page名称改为物料，去掉单独的工件装夹功能 2023-07-13 16:57:48 +08:00
jinling.yang
a0570cb999 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 2023-07-07 17:38:04 +08:00
yuxianghui
5b5d41559c 优化了工作日历时间输入，新增工作日历设置自动计算时长功能，修改了生产线模型的位置（移至sf_maintenance模块下），优化了部分的产线设备资源设置模型 2023-07-07 14:36:27 +08:00
yuxianghui
123adcfc76 在sf_base下新增生产线模型，优化了计划管理-工作日历设置的手动输入时间和手动输入班次的格式 2023-07-06 17:38:08 +08:00
jinling.yang
1a0fa3fdb0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 2023-07-06 17:33:47 +08:00
jinling.yang
66cd682f7d 优化工件装夹 2023-07-05 17:34:43 +08:00
jinling.yang
e693bd97f3 新增工件组装，工件出库，组装工件功能 2023-07-04 17:32:14 +08:00
jinling.yang
0f7f67aade Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能 2023-06-29 17:14:48 +08:00
mgw
2aae162f73 优化sf字段形式 2023-06-29 09:56:31 +08:00
mgw
7689701ab1 刀具同步优化完成，字段已添加 2023-06-28 20:49:16 +08:00
龚启豪
ec0da8cf76 Merge branch refs/heads/develop into refs/heads/feature/设备维保 2023-06-28 10:39:23 +08:00
mgw
59ae98a21c 优化search筛选框界面显示异常 2023-06-28 10:03:24 +08:00
jinling.yang
aea68f5239 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能 
# Conflicts:
#	sf_base/__manifest__.py
#	sf_base/models/__init__.py
#	sf_mrs_connect/data/ir_cron_data.xml
#	sf_mrs_connect/models/sync_common.py
 2023-06-27 16:40:58 +08:00
jinling.yang
d18b1808d9 新增同步夹具相关的定时器 2023-06-27 16:35:30 +08:00
马广威
8b94696dc3 Accept Merge Request #205: (feature/sf刀具基础信息管理 -> develop) 
Merge Request: sf刀具重构完成，同步方法测试完成


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/205?initial=true
 2023-06-27 16:27:32 +08:00
jinling.yang
87e3f6d04e 新增夹具和功能夹具，及同步mrs的夹具和功能夹具 2023-06-26 18:07:44 +08:00
qihao.gong@jikimo.com
8b227d9ac9 设备维保 2023-06-25 17:37:55 +08:00
mgw
65c8d4a4e9 sf刀具重构完成，同步方法测试完成 2023-06-25 16:44:10 +08:00
禹翔辉
8c9a211295 Accept Merge Request #203: (feature/sf刀具功能分支 -> develop) 
Merge Request: 智能工厂类型备注样式调整

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/203?initial=true
 2023-06-16 11:13:21 +08:00
yuxianghui
062b50d34c 智能工厂类型备注样式调整 2023-06-16 11:01:24 +08:00
qihao.gong@jikimo.com
23aba08c87 处理bug 2023-06-16 10:56:25 +08:00
qihao.gong@jikimo.com
018fecfc59 处理冲突 2023-06-16 10:02:33 +08:00
jinling.yang
8a0d89161b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板 2023-06-15 16:15:28 +08:00
jinling.yang
c7ec8be141 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板 2023-06-15 16:14:50 +08:00
mgw
ba93adfb7b 修复同步bug（刀片类型字段无值） 2023-06-15 15:40:23 +08:00
mgw
b1da7a8fda 型号对象增加搜索视图 2023-06-15 12:20:26 +08:00
jinling.yang
34cc5bf125 新增刀具及刀具型号联动展示相关字段并显示对应信息，不同刀具的页面布局 2023-06-14 19:22:52 +08:00
mgw
f6651ffffb 删除测试模型 2023-06-14 17:36:39 +08:00
mgw
93c5bcebe1 增加刀具物料同步功能 2023-06-14 16:33:53 +08:00
qihao.gong@jikimo.com
c919dac8cb 刀具管理 2023-06-13 17:33:38 +08:00
jinling.yang
6068a55b79 新增sf的刀具模板的相关刀具物料字段 2023-06-13 17:30:35 +08:00
mgw
3d1d5e6ef3 智能工厂刀具物料模型、关联关系及其界面已建立 2023-06-13 14:13:15 +08:00
yuxianghui
3a8c65c8d1 解决sf代码冲突问题 2023-06-13 11:19:06 +08:00
mgw
3d04200ca7 解决冲突 2023-06-12 14:35:14 +08:00
mgw
e0983d0530 解决权限冲突 2023-06-12 14:12:16 +08:00