jinling.yang
|
321125adf6
|
还原代码
|
2024-11-25 16:18:41 +08:00 |
|
jinling.yang
|
c0d520a47f
|
Merge branch 'feature/优化外协采购和出入库单（工艺退回调整）' into develop
|
2024-11-21 17:23:57 +08:00 |
|
胡尧
|
cc1455b22c
|
修改制造订单中子MO子为子MO
|
2024-11-21 10:21:18 +08:00 |
|
胡尧
|
269be36d86
|
隐藏制造订单待生产按钮，人工线下加工状态下的功能刀具
|
2024-11-21 09:48:26 +08:00 |
|
jinling.yang
|
23da273af1
|
修复bug和优化制造订单报废
|
2024-11-20 16:08:27 +08:00 |
|
jinling.yang
|
e634e9726f
|
优化工艺设计显示
|
2024-11-19 17:56:21 +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
|
8add4b5ad1
|
优化制造订单
|
2024-11-15 17:31:28 +08:00 |
|
胡尧
|
9410ca82db
|
解决冲突
|
2024-11-15 15:30:35 +08:00 |
|
胡尧
|
73c986cd50
|
增加制造类型字段，增加依赖
|
2024-11-15 15:29:04 +08:00 |
|
liaodanlong
|
4787cb451d
|
Merge branch 'refs/heads/develop' into feature/delivery_status
# Conflicts:
# sf_manufacturing/__manifest__.py
|
2024-11-15 10:37:13 +08:00 |
|
liaodanlong
|
811a79c7c1
|
交期状态修改
|
2024-11-15 10:33:47 +08:00 |
|
胡尧
|
f6f9d14f0a
|
给坯料模板增加按订单补给
|
2024-11-15 09:12:34 +08:00 |
|
jinling.yang
|
018d51e25f
|
批量处理工艺调整
|
2024-11-14 18:02:24 +08:00 |
|
胡尧
|
5dc5c814c8
|
增加加工类型
|
2024-11-14 16:52:58 +08:00 |
|
胡尧
|
6e17bb933f
|
增加是否线下加工日志
|
2024-11-14 16:36:02 +08:00 |
|
胡尧
|
a75269b3a3
|
增加制造类型
|
2024-11-14 15:14:57 +08:00 |
|
胡尧
|
daba7d5155
|
将数据初始化由产品辩题改为为模板
|
2024-11-14 15:02:11 +08:00 |
|
liaodanlong
|
e38407c0a5
|
交期状态开发
|
2024-11-13 10:37:19 +08:00 |
|
jinling.yang
|
ff072a32bb
|
添加退回调整
|
2024-11-12 17:53:17 +08:00 |
|
jinling.yang
|
8bbc65ef88
|
新增退回调整
|
2024-11-12 11:43:40 +08:00 |
|
jinling.yang
|
026bf17a68
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整
|
2024-11-12 09:12:37 +08:00 |
|
jinling.yang
|
359fd40ed3
|
添加工艺退回调整
|
2024-11-11 17:55:05 +08:00 |
|
胡尧
|
cd9f485fc0
|
增加零件名称
|
2024-11-11 16:38:28 +08:00 |
|
胡尧
|
d68a9249c6
|
解决冲突
|
2024-11-11 16:32:54 +08:00 |
|
胡尧
|
eebb143778
|
多供货方式选择
|
2024-11-11 16:26:45 +08:00 |
|
jinling.yang
|
e7b18233f0
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作
|
2024-11-11 14:51:11 +08:00 |
|
jinling.yang
|
741f2ad8b2
|
还原代码
|
2024-11-11 14:50:38 +08:00 |
|
胡尧
|
1b87a81a5a
|
多供货方式选择
|
2024-11-11 11:06:56 +08:00 |
|
jinling.yang
|
38c4aba45c
|
根据工序生成工单
|
2024-11-08 18:01:23 +08:00 |
|
guanhuan
|
3b686a8272
|
新增零件名称
|
2024-11-08 16:56:00 +08:00 |
|
jinling.yang
|
d419efa3c3
|
优化工艺确认
|
2024-11-07 17:59:28 +08:00 |
|
jinling.yang
|
fa30e0c1da
|
添加工艺设计
|
2024-11-06 17:44:13 +08:00 |
|
jinling.yang
|
aa9bdfe372
|
添加工艺设计
|
2024-11-06 10:40:11 +08:00 |
|
guanhuan
|
d64a814251
|
制造订单零件图纸,质检标准显示
|
2024-10-24 11:33:10 +08:00 |
|
liaodanlong
|
f62c70d354
|
Merge branch 'refs/heads/develop' into feature/销售和排程添加消息推送
|
2024-10-21 13:57:24 +08:00 |
|
liaodanlong
|
22c9de86f6
|
制造订单添加订单交期字段信息
|
2024-10-21 13:56:34 +08:00 |
|
guanhuan
|
b132771c92
|
辅助文件上传
|
2024-10-18 14:32:20 +08:00 |
|
guanhuan
|
cf34ac5bbc
|
辅助文件上传
|
2024-10-17 16:31:13 +08:00 |
|
杨金灵
|
284c66ad86
|
Merge branch refs/heads/develop into refs/heads/feature/销售订单和工单逾期消息推送
|
2024-10-15 09:17:21 +08:00 |
|
jinling.yang
|
351815ad91
|
优化销售订单+工单逾期预警和已1逾期代码
|
2024-10-10 17:36:35 +08:00 |
|
hujiaying
|
a1b9f2dd3b
|
产品看板新增品牌字段，如果产品没有品牌字段则不展示品牌字段
|
2024-10-09 16:21:14 +08:00 |
|
mgw
|
5269d09d0e
|
去掉工单明细处删除按钮；已完成工单取24小时内
|
2024-09-23 12:08:02 +08:00 |
|
jinling.yang
|
821a7a63be
|
优化工单
|
2024-08-28 17:30:46 +08:00 |
|
jinling.yang
|
b40a87df88
|
修复报废
|
2024-08-27 11:24:04 +08:00 |
|
jinling.yang
|
e662490cb5
|
修复报废
|
2024-08-26 17:31:14 +08:00 |
|
jinling.yang
|
d13961ff5f
|
修复报废-拣货单（sfp）
|
2024-08-22 10:52:19 +08:00 |
|
jinling.yang
|
6761851407
|
还原代码
|
2024-08-20 14:38:42 +08:00 |
|
jinling.yang
|
3c8dac799d
|
修复报废
|
2024-08-16 17:28:21 +08:00 |
|
jinling.yang
|
cccc2f8493
|
优化报废
|
2024-08-12 17:30:53 +08:00 |
|