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 |
|
胡尧
|
975ced08cb
|
增加成品工序模板（人工线下加工）
|
2024-11-12 14:00:27 +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 |
|
杨金灵
|
a12eb12678
|
Accept Merge Request #1495: (feature/修复表面工艺工单完成入库操作 -> develop)
Merge Request: 制造订单根据工艺设计生成工单
Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1495
|
2024-11-11 15:41:36 +08:00 |
|
yuxianghui
|
3df2306e1b
|
Merge branch 'feature/客供料入库单优化_1' into feature/sf视图展示界面优化
|
2024-11-11 14:55:23 +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 |
|
yuxianghui
|
330726007d
|
1、添加只有客供料入库单才能看见收货人/联系地址/电话号码等字段;
|
2024-11-07 16:26:48 +08:00 |
|
jinling.yang
|
01df55ef35
|
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-11-06 17:54:29 +08:00 |
|
jinling.yang
|
fa30e0c1da
|
添加工艺设计
|
2024-11-06 17:44:13 +08:00 |
|
yuxianghui
|
211d74d9ff
|
处理 客供料入库单优化 需求
|
2024-11-06 17:24:10 +08:00 |
|
jinling.yang
|
aa9bdfe372
|
添加工艺设计
|
2024-11-06 10:40:11 +08:00 |
|
yuxianghui
|
8ea72198ea
|
1、完成报价单优化需求；2、修改制造订单内装夹工单的‘返工’按钮为’异常反馈‘
|
2024-11-05 17:52:18 +08:00 |
|
mgw
|
3bc33fe2fc
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2024-10-29 14:28:44 +08:00 |
|
mgw
|
c21319a127
|
rfid手动输入推送
|
2024-10-29 14:28:24 +08:00 |
|
管欢
|
00689d76cc
|
Accept Merge Request #1463: (feature/message_update -> develop)
Merge Request: 工单下发url调整,加工精度取值调整,2D加工图纸和质检标准位置调整
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1463
|
2024-10-25 13:38:25 +08:00 |
|
guanhuan
|
86d97ef331
|
2D加工图纸和质检标准位置调整
|
2024-10-25 11:55:43 +08:00 |
|
jinling.yang
|
e51fff4120
|
修复消息提醒时区问题
|
2024-10-25 11:25:37 +08:00 |
|
mgw
|
cab9e08066
|
增加对Enter的判断
|
2024-10-24 15:50:32 +08:00 |
|
mgw
|
598e8fee9c
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2024-10-24 15:32:41 +08:00 |
|
mgw
|
6f3a788101
|
将扫描rfid绑定并开启装夹工单写成widget形式
|
2024-10-24 15:32:15 +08:00 |
|
guanhuan
|
f557cb8d10
|
零件图纸,质检标准显示位置修改
|
2024-10-24 14:55:36 +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
|
4003d6a652
|
Merge branch 'refs/heads/develop' into feature/auxiliary_files_upload
# Conflicts:
# sf_dlm_management/views/product_template_management_view.xml
|
2024-10-21 09:50:09 +08:00 |
|
guanhuan
|
b132771c92
|
辅助文件上传
|
2024-10-18 14:32:20 +08:00 |
|
guanhuan
|
cf34ac5bbc
|
辅助文件上传
|
2024-10-17 16:31:13 +08:00 |
|
yuxianghui
|
1245323b9d
|
1、优化手动获取编程的接口，添加获取编程完成之后进行用刀校验；2、处理 权限问题-工单详情缺少【时间跟踪】tab；3、用刀校验方法添加日志
|
2024-10-17 14:22:09 +08:00 |
|
杨金灵
|
284c66ad86
|
Merge branch refs/heads/develop into refs/heads/feature/销售订单和工单逾期消息推送
|
2024-10-15 09:17:21 +08:00 |
|
jinling.yang
|
8f2d5129b1
|
还原代码
|
2024-10-15 09:06:13 +08:00 |
|
jinling.yang
|
2a067778bc
|
优化质量检测(加工检测)及消息推送
|
2024-10-14 17:53:38 +08:00 |
|