yuxianghui
|
3df2306e1b
|
Merge branch 'feature/客供料入库单优化_1' into feature/sf视图展示界面优化
|
2024-11-11 14:55:23 +08:00 |
|
guanhuan
|
3b686a8272
|
新增零件名称
|
2024-11-08 16:56:00 +08:00 |
|
yuxianghui
|
330726007d
|
1、添加只有客供料入库单才能看见收货人/联系地址/电话号码等字段;
|
2024-11-07 16:26:48 +08:00 |
|
yuxianghui
|
211d74d9ff
|
处理 客供料入库单优化 需求
|
2024-11-06 17:24:10 +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 |
|
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 |
|
胡尧
|
f0cb047e8c
|
Accept Merge Request #1387: (release/release_2.4 -> develop)
Merge Request: 解决空料架配送的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1387
|
2024-10-10 11:06:01 +08:00 |
|
hujiaying
|
a1b9f2dd3b
|
产品看板新增品牌字段，如果产品没有品牌字段则不展示品牌字段
|
2024-10-09 16:21:14 +08:00 |
|
胡尧
|
d239509299
|
解决空料架配送不能正常下发AGV任务的问题
|
2024-10-09 13:53:49 +08:00 |
|
mgw
|
5269d09d0e
|
去掉工单明细处删除按钮；已完成工单取24小时内
|
2024-09-23 12:08:02 +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
|
47ad2410cf
|
调整agv参数位置
|
2024-09-19 10:16:09 +08:00 |
|
mgw
|
27da7639b2
|
增加扫码点击按钮功能
|
2024-09-19 09:04:05 +08:00 |
|
mgw
|
eefbd5939b
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能
|
2024-09-13 10:38:23 +08:00 |
|
胡嘉莹
|
c741587341
|
Accept Merge Request #1299: (feature/update_production_line -> 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/1299?initial=true
|
2024-09-13 10:21:11 +08:00 |
|
hujiaying
|
6ad2fa80f1
|
修改销售，采购，制造，仓库产品设置产品类型为默认分组
|
2024-09-13 10:15:26 +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 |
|
胡尧
|
ed20249988
|
Accept Merge Request #1286: (feature/流程用扫码完成 -> develop)
Merge Request: 扫码触发页面按钮，解除装夹起始站点根据下产线终点站点自动赋值
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1286
|
2024-09-09 17:31:25 +08:00 |
|
hujiaying
|
37493a4688
|
sf计划排程计算排程时间日排程的制造订单总数量不能超过产线日产能数量，计算排程时间制造订单每小时排程不能超过产线小时产能
|
2024-09-09 14:08:39 +08:00 |
|
胡尧
|
388929f207
|
扫码触发按键功能
|
2024-09-05 17:59:55 +08:00 |
|
hujiaying
|
5f218e69d4
|
计划排程考虑CNC生产线日产能的优化需求,新增可用机台数量，单台小时产能，日有效工作时长计算规则
|
2024-09-05 17:39:09 +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 |
|
jinling.yang
|
821a7a63be
|
优化工单
|
2024-08-28 17:30:46 +08:00 |
|
liaodanlong
|
e49362e2e3
|
Merge branch 'refs/heads/develop' into feature/tax_sync
|
2024-08-27 14:04:13 +08:00 |
|
liaodanlong
|
d5b5231873
|
多面加工工单排程优化
|
2024-08-27 14:03:41 +08:00 |
|