胡尧
|
54c502dd64
|
处理供应商相同的特殊表面工艺不能删除的问题
|
2024-12-05 16:36:33 +08:00 |
|
胡尧
|
52ab962ace
|
解决删除表面工艺，多增加了采购单的bug
|
2024-12-05 15:09:04 +08:00 |
|
mgw
|
d933416b2d
|
处理“制造订单退回调整删除特殊表面工艺后对应坯料的采购单也变成取消状态了”
|
2024-12-04 11:52:52 +08:00 |
|
jinling.yang
|
a7dc3a1227
|
修复表面外协
|
2024-11-29 10:03:44 +08:00 |
|
jinling.yang
|
805eabd07e
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复外协出入库单
|
2024-11-28 16:01:11 +08:00 |
|
jinling.yang
|
c42c053d66
|
修复表面工艺外协及工艺设计
|
2024-11-28 15:59:17 +08:00 |
|
yuxianghui
|
d741d6ccf5
|
Merge branch 'feature/制造订单状态优化' into feature/工单状态优化_2
|
2024-11-28 15:09:51 +08:00 |
|
jinling.yang
|
a80d498eab
|
修复制造订单-采购单
|
2024-11-28 10:40:48 +08:00 |
|
杨金灵
|
306d5074f2
|
Accept Merge Request #1563: (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/1563
|
2024-11-28 10:03:05 +08:00 |
|
jinling.yang
|
c22b91f9d9
|
优化采购：一个制造订单对应一个采购单
|
2024-11-28 09:59:01 +08:00 |
|
yuxianghui
|
0bea93ea46
|
1、添加返工向导中选择返工工单限制条件
|
2024-11-27 17:54:59 +08:00 |
|
yuxianghui
|
d6c194eaa8
|
处理制造订单状态问题。
|
2024-11-27 16:18:18 +08:00 |
|
yuxianghui
|
a434227807
|
1、工序排序方法优化；2、返工优化
|
2024-11-27 11:01:10 +08:00 |
|
yuxianghui
|
d3b61f320f
|
1、返工优化
|
2024-11-26 18:01:02 +08:00 |
|
jinling.yang
|
6be7c05415
|
优化代码
|
2024-11-26 17:05:45 +08:00 |
|
杨金灵
|
afa5ad36f2
|
Accept Merge Request #1554: (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/1554
|
2024-11-26 16:32:47 +08:00 |
|
jinling.yang
|
e6eb41ad24
|
优化代码
|
2024-11-26 16:15:50 +08:00 |
|
jinling.yang
|
43ee2d1836
|
回滚代码
|
2024-11-26 16:08:30 +08:00 |
|
jinling.yang
|
6edd124556
|
优化
|
2024-11-26 16:01:20 +08:00 |
|
hy
|
304259c653
|
增加列表多选配置
|
2024-11-26 15:22:41 +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
|
3e55bb4717
|
修复制造订单批量调整
|
2024-11-26 10:39:04 +08:00 |
|
yuxianghui
|
7f5f65f07f
|
Merge branch 'feature/客供料入库单优化' into feature/采购优化
|
2024-11-25 09:17:40 +08:00 |
|
yuxianghui
|
3f276f4177
|
1、优化返工按钮；2、优化工单状态；
|
2024-11-22 17:57:18 +08:00 |
|
jinling.yang
|
33b9c48e87
|
优化制造订单报废
|
2024-11-22 17:51:40 +08:00 |
|
jinling.yang
|
b415278997
|
优化坯料的制造订单
|
2024-11-21 11:45:48 +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
|
f8f5286568
|
返工流程优化
|
2024-11-20 17:34:46 +08:00 |
|
jinling.yang
|
23da273af1
|
修复bug和优化制造订单报废
|
2024-11-20 16:08:27 +08:00 |
|
jinling.yang
|
e634e9726f
|
优化工艺设计显示
|
2024-11-19 17:56:21 +08:00 |
|
jinling.yang
|
c73706555f
|
优化外协采购和出入库单（工艺退回调整）
|
2024-11-18 17:40:41 +08:00 |
|
jinling.yang
|
5c5606749a
|
优化制造订单
|
2024-11-15 18:06:32 +08:00 |
|
jinling.yang
|
8add4b5ad1
|
优化制造订单
|
2024-11-15 17:31:28 +08:00 |
|
jinling.yang
|
018d51e25f
|
批量处理工艺调整
|
2024-11-14 18:02:24 +08:00 |
|
jinling.yang
|
33a1837274
|
优化工单
|
2024-11-13 17:59:47 +08:00 |
|
jinling.yang
|
ff072a32bb
|
添加退回调整
|
2024-11-12 17:53:17 +08:00 |
|
jinling.yang
|
38c4aba45c
|
根据工序生成工单
|
2024-11-08 18:01:23 +08:00 |
|
胡尧
|
72c9c9872e
|
Accept Merge Request #1326: (feature/流程用扫码完成 -> develop)
Merge Request: 修复扫码确认后接驳站点被清除的bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1326?initial=true
|
2024-09-20 09:39:21 +08:00 |
|
胡尧
|
2b541fe041
|
修复扫码确认后接驳站点被清除的bug
|
2024-09-20 09:38:32 +08:00 |
|
mgw
|
c4069995e0
|
解除装夹处，扫码同步打印成品条码
|
2024-09-19 14:38:24 +08:00 |
|
胡尧
|
402a323673
|
修改扫码判断起点接驳站逻辑
|
2024-09-19 08:49:23 +08:00 |
|
胡尧
|
cc3289c834
|
将工件配送页面起点接驳站修改为当前接驳站
|
2024-09-14 13:49:46 +08:00 |
|
胡尧
|
b188c8adfe
|
修改异常提示
|
2024-09-11 09:14:00 +08:00 |
|
胡尧
|
d000aa095f
|
对于测试用例进行修改
|
2024-09-10 17:49:52 +08:00 |
|
胡尧
|
8945801db8
|
解决冲突
|
2024-09-10 16:16:30 +08:00 |
|
胡尧
|
40f327ea17
|
修改工件拆卸
|
2024-09-10 16:13:57 +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 |
|
胡尧
|
2d5ef0aae4
|
解除装夹起点从下产线agv调度任务关联带出
|
2024-09-06 15:34:30 +08:00 |
|
胡尧
|
388929f207
|
扫码触发按键功能
|
2024-09-05 17:59:55 +08:00 |
|