yuxianghui
|
7025bde56e
|
隐藏手动返工报废入口
|
2024-12-02 13:46:20 +08:00 |
|
jinling.yang
|
a80d498eab
|
修复制造订单-采购单
|
2024-11-28 10:40:48 +08:00 |
|
yuxianghui
|
c215e3dc27
|
Merge branch 'feature/采购优化' into feature/返工优化_5
|
2024-11-26 11:15:56 +08:00 |
|
yuxianghui
|
0a1da79487
|
1、返工向导模型添加新的工单字段；2、工单tree视图添加重新加工分类
|
2024-11-26 11:14:45 +08:00 |
|
jinling.yang
|
cb29baa698
|
还原代码
|
2024-11-25 14:31:02 +08:00 |
|
jinling.yang
|
f01a300aae
|
还原代码
|
2024-11-22 17:56:59 +08:00 |
|
jinling.yang
|
70f8aadd66
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废
|
2024-11-22 09:42:38 +08:00 |
|
jinling.yang
|
dd768e938c
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废
|
2024-11-22 09:41:06 +08:00 |
|
mgw
|
2b3da48e9b
|
调整开料要求展示范围
|
2024-11-22 09:23:36 +08:00 |
|
jinling.yang
|
5cb726bb2d
|
注释代码
|
2024-11-21 17:45:53 +08:00 |
|
jinling.yang
|
c0d520a47f
|
Merge branch 'feature/优化外协采购和出入库单（工艺退回调整）' into develop
|
2024-11-21 17:23:57 +08:00 |
|
杨金灵
|
de11c57800
|
Accept Merge Request #1533: (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/1533
|
2024-11-21 17:23:18 +08:00 |
|
jinling.yang
|
d4ff4be32e
|
还原注释代码
|
2024-11-21 17:19:41 +08:00 |
|
胡尧
|
13d99b1bcc
|
成品的零件图号修改为零件图号
|
2024-11-21 09:49:12 +08:00 |
|
jinling.yang
|
c73706555f
|
优化外协采购和出入库单（工艺退回调整）
|
2024-11-18 17:40:41 +08:00 |
|
jinling.yang
|
a2855f1f08
|
还原代码
|
2024-11-18 11:40:24 +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
|
018d51e25f
|
批量处理工艺调整
|
2024-11-14 18:02:24 +08:00 |
|
liaodanlong
|
e38407c0a5
|
交期状态开发
|
2024-11-13 10:37:19 +08:00 |
|
guanhuan
|
3b686a8272
|
新增零件名称
|
2024-11-08 16:56:00 +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
|
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 |
|
yuxianghui
|
e1af6ba2f5
|
1、完成 工件装夹工单详情页版面优化需求
|
2024-10-14 13:41:52 +08:00 |
|
jinling.yang
|
d8bade64e1
|
优化质量：添加加工质检
|
2024-10-11 17:52:33 +08:00 |
|
jinling.yang
|
351815ad91
|
优化销售订单+工单逾期预警和已1逾期代码
|
2024-10-10 17:36:35 +08:00 |
|
胡尧
|
d239509299
|
解决空料架配送不能正常下发AGV任务的问题
|
2024-10-09 13:53:49 +08:00 |
|
mgw
|
ddfb233452
|
修复按钮固定条件显示问题
|
2024-09-23 08:55:23 +08:00 |
|
mgw
|
7d877a0cbb
|
处理提示词制造订单重复问题；处理获取数据按钮显隐问题
|
2024-09-20 11:45:23 +08:00 |
|
jinling.yang
|
63ac4f2b44
|
返工工单添加标签字段
|
2024-09-19 17:23:01 +08:00 |
|
mgw
|
27da7639b2
|
增加扫码点击按钮功能
|
2024-09-19 09:04:05 +08:00 |
|
mgw
|
0ae7424f04
|
获取数据按钮增加调用服务功能
|
2024-09-10 16:12:24 +08:00 |
|
liaodanlong
|
6711f6f6e6
|
Merge branch 'refs/heads/develop' into feature/tax_sync
|
2024-09-09 17:37:21 +08:00 |
|
胡尧
|
388929f207
|
扫码触发按键功能
|
2024-09-05 17:59:55 +08:00 |
|
liaodanlong
|
64180ca57f
|
Merge branch 'refs/heads/develop' into feature/tax_sync
|
2024-09-02 15:43:25 +08:00 |
|
liaodanlong
|
3624ef4755
|
销售订单价格问题处理
|
2024-08-30 16:30:34 +08:00 |
|