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

359 Commits

Author SHA1 Message Date
WEB许何哲\xuhez
da7184d841 Merge branch 'develop' into feature/tree视图表格样式修改 
# Conflicts:
#	sf_manufacturing/static/src/xml/kanban_change.xml
 2023-08-03 17:34:54 +08:00
WEB许何哲\xuhez
17476fdcf4 工作中心看板视图动态添加标签页 2023-08-03 17:31:11 +08:00
马广威
d0fab40b03 Accept Merge Request #297: (feature/odoo16前端rpc拿取后端生产线数据 -> develop) 
Merge Request: 实现基础的rpc拿取后端生产线数据功能

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/297?initial=true
 2023-08-03 17:25:06 +08:00
mgw
810ef41c05 实现基础的rpc拿取后端生产线数据功能 2023-08-03 17:24:37 +08:00
jinling.yang
1929fb1b57 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/夹具型号和功能夹具反向注册到cloud 2023-08-03 15:58:18 +08:00
mgw
95c57a3ffb 新增翻译问题解决 2023-08-03 11:55:46 +08:00
mgw
3c934e3a4b 制造订单处字段调整完成，翻译优化完成 2023-08-02 18:01:28 +08:00
jinling.yang
5c2e7c80da 1.产品模板优化：增加产品类别的搜索面板 
2.夹具型号注册到cloud：夹具型号的Tree和form视图去掉不可增删改操作，页面新增时编码根据夹具物料回显不同的编码；新增注册按钮及对应的注册接口
3.功能夹具注册到cloud：.功能夹具的Tree和form视图去掉不可增删改操作，页面新增时编码和名称根据功能夹具类型和对应的托盘型号所进行回显
 2023-08-01 17:39:40 +08:00
mgw
501756d4e7 测试制造模块更改后的翻译，本地已生效 2023-08-01 10:16:47 +08:00
jinling.yang
47b2e8c709 1.同步的模型的页面不可增删改 
2.工单的物料里新增长宽高字段
 2023-07-27 15:45:45 +08:00
jinling.yang
72b3e736c0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/Bug修复 2023-07-26 18:39:59 +08:00
jinling.yang
ae2fdad4f1 1.物料page里的库存模型新增物料长宽高三个字段 
2.修复功能夹具同步Bug
3.夹具物料新增不可删除控制
 2023-07-21 17:35:44 +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
mgw
c0d14daf44 修复工作中心计划报错的问题，修改制造模块目录结构 2023-07-17 15:37:23 +08:00
mgw
3b789d040a 修改制造模块依赖 2023-07-14 12:28:23 +08:00
jinling.yang
98d3e61d66 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化夹具产品模板 
# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/__manifest__.py
 2023-07-14 10:05:01 +08:00
qihao.gong@jikimo.com
8f795096c3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划 
# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/views/mrp_workcenter_views.xml
 2023-07-14 09:02:48 +08:00
jinling.yang
36bb77ccb0 工单的完成按钮代码还原 2023-07-13 17:17:48 +08:00
jinling.yang
7a690abe1a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 
# Conflicts:
#	sf_maintenance/__manifest__.py
 2023-07-13 16:58:49 +08:00
jinling.yang
5beb7b3417 优化装夹工单，新增工件装夹page，名字为组件的page名称改为物料，去掉单独的工件装夹功能 2023-07-13 16:57:48 +08:00
yuxianghui
81842dc5ec 将生产线模型从设备模块搬移到了制造模块，新增工作日历设置修改休息日字段则工作日历创建新记录 2023-07-13 16:05:38 +08:00
jinling.yang
7743c9658c 工单菜单优化 2023-07-10 17:33:17 +08:00
qihao.gong@jikimo.com
78fd5a7ac3 修改工作中心与设备关联关系 2023-07-10 10:03:02 +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
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
qihao.gong@jikimo.com
e6060b9bab 修改维保标准维保项目参数为One2many对象 并与设备，维保计划关联，修改原生维保计划方法 根据保养和检修生成不同的维保计划单 2023-07-04 17:30:50 +08:00
jinling.yang
3743c65da9 优化夹具产品模板 2023-06-30 17:35:20 +08:00
mgw
e0315bafc7 修改依赖关系，解决依赖冲突 2023-06-30 15:17:10 +08:00
jinling.yang
05227b9022 刀具产品模板根据型号展示不同字段和值 2023-06-29 18:53:11 +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
jinling.yang
37b834b3cf Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化 
# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py
 2023-06-29 11:15:40 +08:00
jinling.yang
eab6f0ceee 刀具产品页面刀具物料及型号字段修改 2023-06-28 18:32:45 +08:00
jinling.yang
6dc2935741 采购入库若选择的产品是刀具，则优化序列号生成规则 2023-06-16 17:10:31 +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
f2218f7afb 出入库单新增验证及单个外协表面工艺Bug修复 2023-05-17 14:18:23 +08:00
jinling.yang
4e81243adc 出入库单状态修复 2023-05-16 17:32:23 +08:00
jinling.yang
e1a8f68eea Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单行新增模型展示 2023-05-15 17:02:01 +08:00
jinling.yang
cdb5493461 新增出库单验证前置和后置条件，外协工单点击完成时生成询价单 2023-05-12 17:36:59 +08:00
qihao.gong@jikimo.com
438628ce46 解决coding扫描代码报错问题 2023-04-25 14:42:34 +08:00
马广威
307fc6c928 Merge branch develop into feature/增加一键合并下发功能，修正合并下发逻辑 2023-04-24 14:33:44 +08:00
jinling.yang
843e44b441 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-04-21 17:43:29 +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
32d53df8ec 表面工艺外协需求，不包含页面展示外协出入库单 2023-04-21 15:32:55 +08:00
qihao.gong@jikimo.com
b12470b813 合并企业版模块 2023-04-21 11:24:52 +08:00
jinling.yang
82dcfb5018 优化及调试表面工艺外协出入库单，‘胚料’修改为‘坯料’ 2023-04-20 19:39:12 +08:00
jinling.yang
4e2947c107 sf的销售订单生成制造订单的方法,该方法内，需让制造订单和工单的数据入数据库，以便生成表面外协工艺相关的外协出入库单及关联的库存（stock.move）记录的代码可转移至生成工单的该行代码production.workorder_ids = workorders_values前后左右 2023-04-19 18:05:41 +08:00
jinling.yang
a5c707bf43 判断外协工序是否连续有多个外协工序为同一个供应商（产品为表面工艺服务的供应商）, 2023-04-14 17:54:20 +08:00
qihao.gong@jikimo.com
d28525526a 合并企业版代码(未测试，先提交到测试分支) 2023-04-14 17:42:23 +08:00