jinling.yang
|
c0d520a47f
|
Merge branch 'feature/优化外协采购和出入库单（工艺退回调整）' into develop
|
2024-11-21 17:23:57 +08:00 |
|
jinling.yang
|
d4ff4be32e
|
还原注释代码
|
2024-11-21 17:19:41 +08:00 |
|
jinling.yang
|
310d8b33df
|
优化制造订单报废
|
2024-11-21 17:12:50 +08:00 |
|
mgw
|
1d53f47488
|
线切割、人工线下加工生成工单异常处理
|
2024-11-21 15:36:16 +08:00 |
|
jinling.yang
|
60cc49238c
|
Merge branch 'feature/返工优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整）
|
2024-11-21 11:46:54 +08:00 |
|
jinling.yang
|
b415278997
|
优化坯料的制造订单
|
2024-11-21 11:45:48 +08:00 |
|
yuxianghui
|
1d66c1dbea
|
工单状态优化
|
2024-11-21 11:25:00 +08:00 |
|
jinling.yang
|
085d26669f
|
Merge branch 'feature/返工优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整）
|
2024-11-21 10:44:51 +08:00 |
|
yuxianghui
|
ded0d06f86
|
工单状态方法优化
|
2024-11-21 10:43:22 +08:00 |
|
jinling.yang
|
fe4346b802
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整）
|
2024-11-20 16:08:54 +08:00 |
|
jinling.yang
|
23da273af1
|
修复bug和优化制造订单报废
|
2024-11-20 16:08:27 +08:00 |
|
liaodanlong
|
c5ac62060d
|
Merge branch 'refs/heads/develop' into feature/delivery_status
# Conflicts:
# sf_manufacturing/models/mrp_production.py
|
2024-11-20 15:23:07 +08:00 |
|
liaodanlong
|
e8d07abe05
|
人工线下加工工单的计划时间计算优化需求
|
2024-11-19 14:18:44 +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
|
8add4b5ad1
|
优化制造订单
|
2024-11-15 17:31:28 +08:00 |
|
liaodanlong
|
811a79c7c1
|
交期状态修改
|
2024-11-15 10:33:47 +08:00 |
|
jinling.yang
|
018d51e25f
|
批量处理工艺调整
|
2024-11-14 18:02:24 +08:00 |
|
jinling.yang
|
33a1837274
|
优化工单
|
2024-11-13 17:59:47 +08:00 |
|
liaodanlong
|
9a9bfd198b
|
交期状态
|
2024-11-13 14:46:58 +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
|
359fd40ed3
|
添加工艺退回调整
|
2024-11-11 17:55:05 +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
|
38c4aba45c
|
根据工序生成工单
|
2024-11-08 18:01:23 +08:00 |
|
guanhuan
|
3b686a8272
|
新增零件名称
|
2024-11-08 16:56:00 +08:00 |
|
jinling.yang
|
aa9bdfe372
|
添加工艺设计
|
2024-11-06 10:40:11 +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 |
|
jinling.yang
|
30e8d04b70
|
添加销售订单是否完成并恢复正常时效定时器
|
2024-10-24 16:50:27 +08:00 |
|
mgw
|
39f99d6ce7
|
处理工单的组件不存在时报错的问题
|
2024-10-24 16:04:38 +08:00 |
|
yuxianghui
|
bf9d848f10
|
1、工单状态优化
|
2024-10-23 17:04:35 +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 |
|
mgw
|
f324453351
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2024-10-10 11:36:35 +08:00 |
|
mgw
|
d0f5aca707
|
调整24h开机时长为0的问题；去掉x偏差角度的控制
|
2024-10-10 11:36:18 +08:00 |
|
胡尧
|
b74bc62804
|
处理下发AGV小车任务报错的问题
|
2024-10-10 10:49:16 +08:00 |
|
胡尧
|
e4c845a9f6
|
解决空料架配送不能正常下发AGV任务的问题
|
2024-10-09 14:08:38 +08:00 |
|
胡尧
|
d239509299
|
解决空料架配送不能正常下发AGV任务的问题
|
2024-10-09 13:53:49 +08:00 |
|
mgw
|
e9ab4270a9
|
调整记录匹配条件；优化排程单状态变化
|
2024-09-23 14:29:52 +08:00 |
|
mgw
|
7d877a0cbb
|
处理提示词制造订单重复问题；处理获取数据按钮显隐问题
|
2024-09-20 11:45:23 +08:00 |
|
jinling.yang
|
63ac4f2b44
|
返工工单添加标签字段
|
2024-09-19 17:23:01 +08:00 |
|
mgw
|
fa2eb7b3cf
|
增加是否获取文件判断
|
2024-09-19 10:07:26 +08:00 |
|
mgw
|
27da7639b2
|
增加扫码点击按钮功能
|
2024-09-19 09:04:05 +08:00 |
|
胡尧
|
213b76a280
|
Accept Merge Request #1312: (feature/流程用扫码完成 -> develop)
Merge Request: 解除装夹工单页面进入时失去焦点
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1312
|
2024-09-18 15:15:10 +08:00 |
|
胡尧
|
c675e1d67c
|
解除装夹工单页面进入时失去焦点
|
2024-09-18 15:13:20 +08:00 |
|
yuxianghui
|
ef453dbc1e
|
工单状态优化
|
2024-09-18 11:53:46 +08:00 |
|