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

82 Commits

Author SHA1 Message Date
liaodanlong
962931bc9d 外协流程更改 2025-04-17 14:29:06 +08:00
mgw
c24f539197 取消销售订单时的下游单据清单【大类、单据名称、作业类型】显示错误 2025-02-28 16:04:49 +08:00
mgw
07c07ef37c 完善下游单据问题 2025-02-27 16:00:29 +08:00
mgw
3ac096e9a7 取消接单需求进行中 2025-02-13 17:41:18 +08:00
mgw
4b5661108a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 
# Conflicts:
#	sf_manufacturing/security/ir.model.access.csv
 2025-01-09 16:14:23 +08:00
mgw
fc16c867aa 申请编程需求 2025-01-09 14:07:35 +08:00
yuxianghui
1a384b9902 1、优化制造-工序模块；2、新增工序个性化记录模型，并添加生成初始化值； 2025-01-08 17:24:58 +08:00
liaodanlong
a1bf997d51 采购岗与采购总监岗位添加工单操作权限 2025-01-02 12:49:05 +08:00
guanhuan
01fa7bbe87 批量重新安排 2024-12-12 14:39:10 +08:00
胡尧
6690d3f2cb 权限调整 2024-11-29 14:14:14 +08:00
mgw
22a69df31b 调整计划调度岗对工单的权限 2024-11-29 11:24:27 +08:00
mgw
5eea260618 修复仓储岗角色权限问题 2024-11-28 13:38:14 +08:00
guanhuan
4251e6dec7 修复模型类型详情界面的配置工序不能删除 2024-11-25 16:41:47 +08:00
胡尧
a7ed317b09 修改订单客供料显示，修改内部调拨、生产发料合并单据 2024-11-20 16:53:15 +08:00
jinling.yang
a8e9fe40ac Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整 
# Conflicts:
#	sf_manufacturing/models/mrp_production.py
#	sf_manufacturing/views/mrp_production_addional_change.xml
 2024-11-15 18:08:31 +08:00
jinling.yang
33a1837274 优化工单 2024-11-13 17:59:47 +08:00
胡尧
975ced08cb 增加成品工序模板（人工线下加工） 2024-11-12 14:00:27 +08:00
jinling.yang
38c4aba45c 根据工序生成工单 2024-11-08 18:01:23 +08:00
jinling.yang
fa30e0c1da 添加工艺设计 2024-11-06 17:44:13 +08:00
jinling.yang
80f0454996 工作中心添加质检权限 2024-10-17 15:37:08 +08:00
jinling.yang
d64b480496 检测结果添加质检权限 2024-10-17 15:25:13 +08:00
jinling.yang
d1db917432 修复加工质检 2024-10-17 11:58:54 +08:00
jinling.yang
94b1551de2 加工质检添加权限 2024-10-17 11:01:42 +08:00
胡尧
5ad35de76b 修复agv调度bug 2024-08-19 11:22:30 +08:00
胡尧
9dbea66b73 修改AGV调度系统 2024-08-09 17:32:46 +08:00
胡尧
5d8f0f83b2 增加AGV调度功能，工单页面增加自定义筛选字段 2024-08-07 17:44:43 +08:00
jinling.yang
f0fdeff699 修复cnc工单按钮显示问题 2024-07-24 11:40:16 +08:00
jinling.yang
7163e025d2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版报废 
# Conflicts:
#	sf_manufacturing/security/ir.model.access.csv
 2024-07-17 19:32:21 +08:00
jinling.yang
d8b4797ffe 检测报告添加机床操作岗权限 2024-07-17 15:31:47 +08:00
jinling.yang
b07e7707c7 添加计划调度岗，机床操作岗 2024-07-17 15:30:38 +08:00
jinling.yang
8726f8cac3 添加报废向导；添加重新生成制造订单 2024-07-17 15:20:31 +08:00
jinling.yang
b383a6d229 1.新增加工面模型2.制造订单详情页面的返工操作上的加工面根据产品的加工面板进行过滤 2024-07-08 17:33:04 +08:00
jinling.yang
a7a8e73616 新增返工向导 2024-07-03 17:35:29 +08:00
jinling.yang
66b66a935f 优化工单页面和下发编程单接口 2024-06-21 17:15:05 +08:00
jinling.yang
612906e01d 修改根据多面生成工单逻辑 2024-06-21 16:00:04 +08:00
mgw
0ae0ad2ba8 修复库存岗位验证入库无权限问题 2024-05-18 21:56:43 +08:00
mgw
a4b2d5bb42 修复仓储岗位权限遗留问题 2024-05-18 10:29:02 +08:00
yuxianghui
0f47f7c3b8 1、添加权限；2、设备的设备检修标准字段关闭创建功能；3、解决 销售经理创建报价单选择产品后没有把模型和价格带过去 的bug；4、关闭仓库创建按钮 2024-05-13 11:54:03 +08:00
jinling.yang
3d56e54fb2 优化制造订单的获取cnc程序 2024-05-09 18:29:30 +08:00
jinling.yang
4bea41b8fd 修复快速订单没有权限问题 2024-05-08 15:07:31 +08:00
jinling.yang
2cd666c4ae 优化agv及新增中控日志调用 2024-05-06 11:48:34 +08:00
jinling.yang
9a157125ba 优化agv相关页面及对应接口 2024-04-22 22:30:05 +08:00
jinling.yang
4765e34c09 1.优化表面工艺可选参数 
2.修复质量警报质量总监没有制造订单访问权限
 2024-03-15 10:48:01 +08:00
mgw
59677c0304 修改zpl相关等 2024-03-14 14:22:50 +08:00
mgw
ec54c8e014 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-03-04 09:45:55 +08:00
mgw
b7be5251b8 处理采购订单按钮展示的问题 2024-03-04 09:45:19 +08:00
qihao.gong@jikimo.com
7e4a3251c8 增加必填标识 2024-03-01 15:43:03 +08:00
jinling.yang
0538763059 1.修复及优化质检接口2.质量检查新增检测报告和检测结果2个字段 2024-02-28 15:53:46 +08:00
jinling.yang
abcada8466 新增cmm程序对象及新增cmm接口 2024-02-22 15:55:35 +08:00
jinling.yang
cbd7b561de 产品的加工参数的权限修复 2024-02-19 17:07:42 +08:00