jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,798 Commits 134 Branches 0 Tags
a088ee9ed5a05e9dadb15dc2200b7fef22d4e9fe
Commit Graph

73 Commits

Author SHA1 Message Date
jinling.yang
a088ee9ed5 1.制造模块内配置下的所有模型增加管理员（admin）权限 
2.工单上的工件配送优化验证及对应的页面上新增工件配送按钮
 2024-01-29 19:43:57 +08:00
jinling.yang
cf2aaa38fe 1.修复材料型号同步报验证问题2.优化工单的工件派送3.计划里新增生产线的优化 2024-01-26 17:46:53 +08:00
jinling.yang
37161e2e20 1.修改工单的托盘序列号，托盘名称，托盘品牌，托盘类型，托盘型号字段类型，且页面对应字段改为只读 
2.装夹预调工单新增扫条形码，扫码时对该工单进行自动开始并将条码里对应的托盘产品信息回填到托盘序列号，托盘名称，托盘品牌，托盘类型，托盘型号字段上，点击完成时对前置三元定位检测参数进行验证
3.研究打印序列号（多个）
 2024-01-25 17:51:57 +08:00
jinling.yang
926caeca97 工件配送文字修改 2024-01-24 14:54:07 +08:00
jinling.yang
82f54b5d83 制造订单页面新增生产线和计划开始加工时间字段 2024-01-24 14:24:27 +08:00
jinling.yang
8f379a2635 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹预调工单任务 
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
 2024-01-23 17:42:38 +08:00
yuxianghui
136d0f5156 新增工件配送模型及其tree视图，search视图，添加自动计算配送时长功能； 2024-01-23 15:29:07 +08:00
马广威
72f5496905 Accept Merge Request #780: (feature/制造代码优化 -> develop) 
Merge Request: 增加刀具管理权限控制，刀具组权限控制，隐藏工单上原生按钮，修复只读权限后修改记录无权限问题等

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/780?initial=true
 2024-01-22 15:40:23 +08:00
mgw
2dfd3c9128 增加刀具管理权限控制，刀具组权限控制，隐藏工单上原生按钮，修复只读权限后修改记录无权限问题等 2024-01-19 11:49:57 +08:00
qihao.gong@jikimo.com
2b7243f69c 合并cnc加工和后置检测工单，新增工单开始结束接口 2024-01-17 17:26:24 +08:00
qihao.gong@jikimo.com
1a896a730e 拉取最新代码 2024-01-09 14:17:38 +08:00
qihao.gong@jikimo.com
86366cc6cb 修改工单完成后，自动完成制造订单，完工产品就绪状态 2024-01-09 10:31:43 +08:00
mgw
98c9f3098b 工单详情处增加实际开始时间、实际结束时间，是否合格、加工人、检测人、实际加工机台等字段信息 2023-12-21 10:53:13 +08:00
jinling.yang
3a1acb0f5a 整合所有模块依赖 2023-11-08 17:13:18 +08:00
mgw
7cbaf7373a 冗余菜单处理完成 2023-09-12 11:12:00 +08:00
qihao.gong@jikimo.com
08ac2978a1 移除托盘对象 并清除所有关联关系 2023-08-17 16:33:40 +08:00
jinling.yang
47b2e8c709 1.同步的模型的页面不可增删改 
2.工单的物料里新增长宽高字段
 2023-07-27 15:45:45 +08:00
jinling.yang
36bb77ccb0 工单的完成按钮代码还原 2023-07-13 17:17:48 +08:00
jinling.yang
5beb7b3417 优化装夹工单，新增工件装夹page，名字为组件的page名称改为物料，去掉单独的工件装夹功能 2023-07-13 16:57:48 +08:00
jinling.yang
7743c9658c 工单菜单优化 2023-07-10 17:33:17 +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
2acdbca2b1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协 
# Conflicts:
#	sf_dlm/__manifest__.py
#	sf_dlm/models/product_template.py
#	sf_manufacturing/models/mrp_production.py
 2023-04-21 15:40:03 +08:00
jinling.yang
a5c707bf43 判断外协工序是否连续有多个外协工序为同一个供应商（产品为表面工艺服务的供应商）, 2023-04-14 17:54:20 +08:00
gqh
9807f515e9 工单展示组件 2023-03-21 13:58:46 +08:00
jinling.yang
dfeeed7b59 制造订单，产品，工单上进行3d模型展示 2023-03-09 17:34:44 +08:00
马广威
dcdb3534dd Accept Merge Request #145: (feature/优化NC下发 -> develop) 
Merge Request: NC下发测试成功，请求合并

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/145?initial=true
 2023-02-27 14:57:30 +08:00
gqh
4ec5f2c1de 验证坯料序列号 2023-02-24 17:23:00 +08:00
mgw
5fbe834528 合并下发已完成，正在增加下发记录对象 2023-02-23 22:11:32 +08:00
mgw
28659bfc95 增加合并下发向导，增加cnc模型的缺省tree视图 2023-02-23 08:52:56 +08:00
gqh
9d59917af9 CNC获取程序工单自动开始 并获取cnc程序到mrs编程单 2023-02-16 17:48:26 +08:00
gqh
f007542c35 合并dev 2023-02-09 14:34:43 +08:00
gqh
2a3b334f73 sf新增修改网站标签功能 2023-02-06 16:10:03 +08:00
龚启豪
cba007b374 Accept Merge Request #131: (feature/优化工单 -> develop) 
Merge Request: 优化工单

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/131
 2023-02-03 17:16:46 +08:00
gqh
19d742d20f 优化工单 2023-02-03 17:14:17 +08:00
mgw
a4bee8bb6b 优化工单界面显示 2023-02-03 17:10:31 +08:00
gqh
59cb6e5def 优化工单界面，新增物料page，修复工单按钮bug，隐藏权限字段 2023-02-02 14:59:39 +08:00
gqh
d032f89272 sf优化绑定托盘，工单form显示开始按钮 加工时间 2023-02-01 17:53:32 +08:00
gqh
5495f2436a 优化工单，英文改为中文展示，解除托盘展示托盘 2023-02-01 14:07:33 +08:00
jinling.yang
7b78e2451a 工单的cnc工单加工面显示bug修复 2023-01-31 12:02:56 +08:00
龚启豪
8312b5fc6b Accept Merge Request #108: (feature/sf优化界面 -> develop) 
Merge Request: 修改登录背景，工作中心显示bug

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/108
 2023-01-31 11:08:04 +08:00
gqh
169bf4a59a 修改登录背景 2023-01-31 11:02:53 +08:00
杨金灵
210ee9d38d Accept Merge Request #107: (feature/修复sf的bug -> develop) 
Merge Request: 页面优化及部分bug修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/107
 2023-01-31 10:37:58 +08:00
gqh
fec18188fa 工作中心看板查看工单取消全屏 2023-01-30 17:56:41 +08:00
jinling.yang
271a5d4224 1.模型类型增加跟修改各字段 
2.智能工厂成品名称优化
3.智能工厂产品根据产品类型增加默认筛选条件的优化（在筛选器内根据产品类型增加筛选条件）
4.智能工厂胚料名称的优化
5.自加工产品的制造订单优化
 2023-01-29 17:48:45 +08:00
gqh
e93906a5f0 工作中心看板默认展示列表 2023-01-29 17:04:50 +08:00
gqh
a26d1ca2ba 三元输入坐标变色 2023-01-29 15:55:46 +08:00
gqh
e0ce0fcfa3 回滚 2023-01-29 15:48:50 +08:00
gqh
9125eedf5a 回滚 2023-01-29 15:48:12 +08:00
gqh
e6883a1f92 回滚 2023-01-29 15:47:46 +08:00
gqh
16623b3292 回滚 2023-01-29 15:47:18 +08:00