mgw
|
8c08893aa1
|
修复“制造订单详情多了一个没有文案的按钮”
|
2024-08-19 14:25:26 +08:00 |
|
胡尧
|
5ad35de76b
|
修复agv调度bug
|
2024-08-19 11:22:30 +08:00 |
|
jinling.yang
|
3c8dac799d
|
修复报废
|
2024-08-16 17:28:21 +08:00 |
|
胡尧
|
0e4b9e44f8
|
修改下发agv调度任务参数
|
2024-08-16 17:12:34 +08:00 |
|
胡尧
|
a6b7167f3b
|
修改创建调度任务逻辑，不匹配的路线返回错误信息
|
2024-08-16 16:49:30 +08:00 |
|
胡尧
|
c4de966dea
|
装夹工单完成后生成工件配送单同时绑定rfid
|
2024-08-16 16:31:54 +08:00 |
|
yuxianghui
|
03cfc00be5
|
Merge branch 'feature/销售单优化' into feature/销售、刀具模块优化
|
2024-08-16 16:02:19 +08:00 |
|
胡尧
|
e5793638f7
|
屏蔽开始装夹预调绑定rfid时，不绑定工件配送的rfid
|
2024-08-16 15:21:08 +08:00 |
|
胡尧
|
e92905fe32
|
修改agv小车相关接口
|
2024-08-16 10:36:01 +08:00 |
|
胡尧
|
1b521ae460
|
解决冲突
|
2024-08-16 09:50:31 +08:00 |
|
胡尧
|
4e0d8f1c88
|
修改AGV调度
|
2024-08-16 09:43:03 +08:00 |
|
胡尧
|
aecf2121a1
|
agv调度开发
|
2024-08-15 17:41:25 +08:00 |
|
jinling.yang
|
e2d7576a5e
|
优化报废
|
2024-08-15 17:31:37 +08:00 |
|
yuxianghui
|
366e816268
|
1、优化货位变更接口、优化同步库存信息接口；2、隐藏已取消状态的销售订单的【确认接单】和【取消】按钮；3、处理功能刀具从线边刀库到刀具房没有生成移动历史问题；
|
2024-08-15 16:45:39 +08:00 |
|
胡尧
|
1532184008
|
Merge branch 'feature/agv_dispatch' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/agv_dispatch
|
2024-08-15 15:02:16 +08:00 |
|
胡尧
|
9f180e307d
|
agv调度开发
|
2024-08-15 15:02:13 +08:00 |
|
hy
|
f0a4cf1d0f
|
弹窗取消聚焦
|
2024-08-15 15:01:10 +08:00 |
|
胡尧
|
6c734eead4
|
agv调度开发
|
2024-08-15 11:34:38 +08:00 |
|
胡尧
|
f7e4ce416a
|
AGV任务调度开发
|
2024-08-14 17:34:50 +08:00 |
|
jinling.yang
|
cccc2f8493
|
优化报废
|
2024-08-12 17:30:53 +08:00 |
|
胡尧
|
0b85f29262
|
修改agv调度
|
2024-08-12 11:08:04 +08:00 |
|
胡尧
|
9dbea66b73
|
修改AGV调度系统
|
2024-08-09 17:32:46 +08:00 |
|
jinling.yang
|
9a7ac4dfa6
|
优化制造订单报废向导
|
2024-08-09 17:26:57 +08:00 |
|
yuxianghui
|
e6ca4c27ac
|
1、库位变更接口、库位信息接口优化；2、功能刀具预警模型优化；
|
2024-08-09 17:19:03 +08:00 |
|
jinling.yang
|
a8560a0684
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版报废
|
2024-08-09 15:45:11 +08:00 |
|
jinling.yang
|
a9b7f99944
|
修复表面工艺外协
|
2024-08-09 15:39:58 +08:00 |
|
jinling.yang
|
34e858ffe4
|
添加表面工艺服务产品验证
|
2024-08-09 11:31:30 +08:00 |
|
jinling.yang
|
41efe81119
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺外协
|
2024-08-09 10:43:34 +08:00 |
|
jinling.yang
|
7cab8cd287
|
调拨单新增表面工艺参数字段
|
2024-08-09 10:42:59 +08:00 |
|
jinling.yang
|
5f9c5961a5
|
报废
|
2024-08-09 10:39:48 +08:00 |
|
胡尧
|
a79500d0ad
|
增加agv调度系统
|
2024-08-08 17:47:03 +08:00 |
|
jinling.yang
|
4399700c3d
|
优化报废向导
|
2024-08-08 17:24:41 +08:00 |
|
jinling.yang
|
112efccb7c
|
修复表面工艺外协采购
|
2024-08-08 16:21:15 +08:00 |
|
jinling.yang
|
45b9177da4
|
优化工单
|
2024-08-08 16:09:00 +08:00 |
|
jinling.yang
|
745658eff2
|
1.制造订单添加报废状态，
2.返工操作制造订单添加过滤条件：状态为报废
3.cnc工单完成检测结果添加报废
|
2024-08-08 15:40:29 +08:00 |
|
jinling.yang
|
f58fb2ea13
|
Merge branch 'feature/优化表面工艺' into develop
|
2024-08-08 15:08:08 +08:00 |
|
jinling.yang
|
563023fa3c
|
中控接口身份验证放开
|
2024-08-08 15:07:22 +08:00 |
|
jinling.yang
|
aaa19b96fd
|
还原注释代码
|
2024-08-08 14:57:55 +08:00 |
|
胡尧
|
5d8f0f83b2
|
增加AGV调度功能，工单页面增加自定义筛选字段
|
2024-08-07 17:44:43 +08:00 |
|
jinling.yang
|
1547a6064f
|
优化表面工艺
|
2024-08-07 17:30:29 +08:00 |
|
yuxianghui
|
d469c09f15
|
Merge branch 'feature/制造订单优化' into feature/销售单优化
|
2024-08-07 17:11:57 +08:00 |
|
廖丹龙
|
8ec5e05739
|
Accept Merge Request #1213: (feature/tax_sync -> develop)
Merge Request: bfm 加工订单税信息同步
Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1213
|
2024-08-06 09:09:37 +08:00 |
|
jinling.yang
|
5393ef686a
|
优化表面工艺
|
2024-08-05 17:28:48 +08:00 |
|
yuxianghui
|
070890e3b6
|
解决 SF，根据制造订单生成的采购单坯料入库时到原材料库BUG
|
2024-08-05 16:26:54 +08:00 |
|
jinling.yang
|
ed0d57c364
|
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/models/mrp_workorder.py
|
2024-08-02 14:41:42 +08:00 |
|
yuxianghui
|
cec426920b
|
Merge branch 'feature/优化工单状态' into feature/bug优化
|
2024-08-02 11:19:45 +08:00 |
|
jinling.yang
|
c0202330f8
|
去掉工单输出
|
2024-08-01 16:40:46 +08:00 |
|
jinling.yang
|
36dc8070fa
|
注释及还原代码
|
2024-08-01 15:18:57 +08:00 |
|
yuxianghui
|
a5da18bbc7
|
1、修改夹具重量单位为kg
|
2024-08-01 11:34:20 +08:00 |
|
liaodanlong
|
051273017d
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync
|
2024-08-01 10:45:09 +08:00 |
|